Skip to content

Commit a4f56a0

Browse files
Worker: Downgrade the new worker from 3.12 to 3.9.21 due to dependency conflicts (#4640)
* Add missing dependencies for the worker python 3.12 * Remove django autofixtures * Downgrade to version 3.9.21 in worker from 3.12 due to dependency conflicts
1 parent e7a788b commit a4f56a0

File tree

20 files changed

+44
-55
lines changed

20 files changed

+44
-55
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
script:
4040
# Build steps
4141
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin || travis_terminate 1; fi
42-
- docker-compose --profile worker_py3_7 --profile worker_py3_8 --profile worker_py3_12 --profile statsd build || travis_terminate 1;
42+
- docker-compose --profile worker_py3_7 --profile worker_py3_8 --profile worker_py3_9 --profile statsd build || travis_terminate 1;
4343

4444
# Frontend Tests
4545
- docker-compose run nodejs bash -c "gulp dev && karma start --single-run && gulp staging" || travis_terminate 1;

docker-compose-production.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ services:
5353
env_file:
5454
- docker/prod/docker_production.env
5555

56-
worker_py3_12:
57-
image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-production-worker-py3.12:${COMMIT_ID}
56+
worker_py3_9:
57+
image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-production-worker-py3.9:${COMMIT_ID}
5858
build:
5959
context: ./
60-
dockerfile: docker/prod/worker_py3_12/Dockerfile
60+
dockerfile: docker/prod/worker_py3_9/Dockerfile
6161
env_file:
6262
- docker/prod/docker_production.env
6363

docker-compose-staging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ services:
5353
env_file:
5454
- docker/prod/docker_staging.env
5555

56-
worker_py3_12:
57-
image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-staging-worker-py3.12:${COMMIT_ID}
56+
worker_py3_9:
57+
image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-staging-worker-py3.9:${COMMIT_ID}
5858
build:
5959
context: ./
60-
dockerfile: docker/prod/worker_py3_12/Dockerfile
60+
dockerfile: docker/prod/worker_py3_9/Dockerfile
6161
env_file:
6262
- docker/prod/docker_staging.env
6363

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ services:
5353
profiles:
5454
- worker_py3_8 # Only built when this profile is specified
5555

56-
worker_py3_12:
56+
worker_py3_9:
5757
env_file:
5858
- docker/dev/docker.env
5959
build:
6060
context: ./
61-
dockerfile: docker/dev/worker_py3_12/Dockerfile
61+
dockerfile: docker/dev/worker_py3_9/Dockerfile
6262
depends_on:
6363
- django
6464
volumes:
6565
- .:/code
6666
profiles:
67-
- worker_py3_12 # Only built when this profile is specified
67+
- worker_py3_9 # Only built when this profile is specified
6868

6969
nodejs:
7070
hostname: nodejs

docker/dev/django/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ RUN mkdir /code
88
WORKDIR /code
99

1010
ADD requirements/* /code/
11-
RUN pip install --no-cache-dir --no-compile --progress-bar off -r django.txt
1211
RUN pip install --no-cache-dir --no-compile --progress-bar off -r dev.txt
1312

1413
ADD . /code/

docker/dev/worker_py3_7/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ WORKDIR /code
1212
ADD requirements/* /code/
1313

1414
RUN pip install -U cffi service_identity cython==0.29 setuptools==57.5.0
15-
RUN pip install -r django.txt
1615
RUN pip install -r dev.txt
1716
RUN pip install -r worker_py3_7.txt
1817

docker/dev/worker_py3_8/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ RUN mkdir /code
66
WORKDIR /code
77

88
ADD requirements/* /code/
9-
RUN pip install -r django.txt
109
RUN pip install -r dev.txt
1110

1211
RUN apt-get update && \

docker/dev/worker_py3_12/Dockerfile renamed to docker/dev/worker_py3_9/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12.3
1+
FROM python:3.9.21
22

33
ENV PYTHONUNBUFFERED 1
44

@@ -20,7 +20,7 @@ WORKDIR /code
2020
ADD requirements/* /code/
2121

2222
RUN pip install -r dev.txt
23-
RUN pip install -r worker_py3_12.txt
23+
RUN pip install -r worker_py3_9.txt
2424

2525
ADD . /code
2626

docker/prod/worker_py3_7/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ WORKDIR /code
1313
ADD requirements/* /code/
1414

1515
RUN pip install -U cffi service_identity cython==0.29 numpy==1.18.1
16-
RUN pip install -r django.txt
1716
RUN pip install -r prod.txt
1817
RUN pip install -r worker_py3_7.txt
1918

docker/prod/worker_py3_8/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ENV PYTHONUNBUFFERED 1
55
RUN mkdir /code
66
WORKDIR /code
77
ADD requirements/* /code/
8-
RUN pip install -r django.txt
98
RUN pip install -r prod.txt
109

1110
ADD . /code

0 commit comments

Comments
 (0)