Skip to content

Commit 9bb4eaf

Browse files
Merge pull request #233 from chintanjoshi-apphelix-2u/fix-xqueue-build
fix: breaking xqueue image builds
2 parents 9f77eab + 6c5c393 commit 9bb4eaf

3 files changed

Lines changed: 21 additions & 0 deletions

File tree

docker/build/xqueue/ansible_overrides.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ XQUEUE_MYSQL_HOST: "edx.devstack.mysql57"
55
XQUEUE_SETTINGS: "devstack"
66
xqueue_gunicorn_port: 18040
77
xqueue_gunicorn_host: 0.0.0.0
8+
xqueue_image_building: true
89
devstack: true

playbooks/roles/xqueue/defaults/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,5 @@ xqueue_release_specific_debian_pkgs:
207207
xqueue_use_python3: false
208208
# flag to run xqueue on python3.11
209209
xqueue_use_python311: true
210+
# flag for docker builds
211+
xqueue_image_building: false

playbooks/roles/xqueue/tasks/main.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,24 @@
1717
- install
1818
- install:system-requirements
1919

20+
# following task is only needed for docker builds
21+
- name: install pip for python3.11 for docker image
22+
shell: |
23+
curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11
24+
when: xqueue_use_python311 and xqueue_image_building
25+
tags:
26+
- install
27+
- install:system-requirements
28+
29+
# following task is only needed for docker builds
30+
- name: install virtualenv for docker image
31+
shell: |
32+
python3.11 -m pip install virtualenv
33+
when: xqueue_use_python311 and xqueue_image_building
34+
tags:
35+
- install
36+
- install:system-requirements
37+
2038
- name: install python3
2139
apt:
2240
name: "{{ item }}"

0 commit comments

Comments
 (0)