From 6c5c3935380f9a9af16737d34d99ad6e3c6e146c Mon Sep 17 00:00:00 2001
From: Chintan Joshi <cjoshi-apphelix@2u.com>
Date: Mon, 11 Aug 2025 08:29:12 +0000
Subject: [PATCH] fix: breaking xqueue image builds

---
 docker/build/xqueue/ansible_overrides.yml |  1 +
 playbooks/roles/xqueue/defaults/main.yml  |  2 ++
 playbooks/roles/xqueue/tasks/main.yml     | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/docker/build/xqueue/ansible_overrides.yml b/docker/build/xqueue/ansible_overrides.yml
index feaadc18e..1d84ae5e3 100644
--- a/docker/build/xqueue/ansible_overrides.yml
+++ b/docker/build/xqueue/ansible_overrides.yml
@@ -5,4 +5,5 @@ XQUEUE_MYSQL_HOST: "edx.devstack.mysql57"
 XQUEUE_SETTINGS: "devstack"
 xqueue_gunicorn_port: 18040
 xqueue_gunicorn_host: 0.0.0.0
+xqueue_image_building: true
 devstack: true
diff --git a/playbooks/roles/xqueue/defaults/main.yml b/playbooks/roles/xqueue/defaults/main.yml
index 06bbeea73..c49b6ed27 100644
--- a/playbooks/roles/xqueue/defaults/main.yml
+++ b/playbooks/roles/xqueue/defaults/main.yml
@@ -207,3 +207,5 @@ xqueue_release_specific_debian_pkgs:
 xqueue_use_python3: false
 # flag to run xqueue on python3.11
 xqueue_use_python311: true
+# flag for docker builds
+xqueue_image_building: false
diff --git a/playbooks/roles/xqueue/tasks/main.yml b/playbooks/roles/xqueue/tasks/main.yml
index 202e18941..2330d9548 100644
--- a/playbooks/roles/xqueue/tasks/main.yml
+++ b/playbooks/roles/xqueue/tasks/main.yml
@@ -17,6 +17,24 @@
     - install
     - install:system-requirements
 
+# following task is only needed for docker builds 
+- name: install pip for python3.11 for docker image
+  shell: |
+    curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11
+  when: xqueue_use_python311 and xqueue_image_building
+  tags:
+    - install
+    - install:system-requirements
+
+# following task is only needed for docker builds
+- name: install virtualenv for docker image
+  shell: |
+    python3.11 -m pip install virtualenv
+  when: xqueue_use_python311 and xqueue_image_building
+  tags:
+    - install
+    - install:system-requirements
+
 - name: install python3
   apt:
     name: "{{ item }}"