From 2fd3aed1a43dbdbaafe7898178af60952624ddbb Mon Sep 17 00:00:00 2001 From: Obada Haddad Date: Thu, 19 Sep 2024 09:45:00 +0200 Subject: [PATCH 1/4] Poetry error tentative fix --- Dockerfile | 2 +- Dockerfile.compute_worker | 2 +- Dockerfile.compute_worker_gpu | 2 +- Dockerfile.flower | 2 +- pyproject.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index eed648e54..6368cef53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y gcc build-essential && rm -rf /var/lib/ ENV PYTHONUNBUFFERED 1 -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3 # Poetry location so future commands (below) work ENV PATH $PATH:/root/.local/bin # Want poetry to use system python of docker container diff --git a/Dockerfile.compute_worker b/Dockerfile.compute_worker index 7829899f9..6e6b626bf 100644 --- a/Dockerfile.compute_worker +++ b/Dockerfile.compute_worker @@ -7,7 +7,7 @@ ENV PYTHONUNBUFFERED 1 RUN apt-get update && curl -fsSL https://get.docker.com | sh -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3 # Poetry location so future commands (below) work ENV PATH $PATH:/root/.local/bin # Want poetry to use system python of docker container diff --git a/Dockerfile.compute_worker_gpu b/Dockerfile.compute_worker_gpu index e4c2546fc..6bf96f3c5 100644 --- a/Dockerfile.compute_worker_gpu +++ b/Dockerfile.compute_worker_gpu @@ -19,7 +19,7 @@ RUN apt-get install -y nvidia-container-toolkit # BB - not convinced we need this ENV USE_GPU 1 -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3 # Poetry location so future commands (below) work ENV PATH $PATH:/root/.local/bin # Want poetry to use system python of docker container diff --git a/Dockerfile.flower b/Dockerfile.flower index 59e84d6ed..30d482a8e 100644 --- a/Dockerfile.flower +++ b/Dockerfile.flower @@ -9,7 +9,7 @@ ENV PYTHONUNBUFFERED=1 PYTHONHASHSEED=random PYTHONDONTWRITEBYTECODE=1 RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates # # Install the required packages -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3 # Poetry location so future commands (below) work ENV PATH $PATH:/root/.local/bin # Want poetry to use system python of docker container diff --git a/pyproject.toml b/pyproject.toml index 39538b909..6a38ee991 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ readme = "README.md" package-mode = false [tool.poetry.dependencies] -python = "3.9.19" +python = "3.9.20" django = "2.2.17" django-oauth-toolkit = "1.0.0" django-cors-middleware = "1.5.0" From 7c9c37e6e4c365fb1a2340f020e666ef46a36b52 Mon Sep 17 00:00:00 2001 From: Obada Haddad Date: Thu, 19 Sep 2024 10:25:24 +0200 Subject: [PATCH 2/4] RabbitMQ static image in Dockerfile.rabbitmq to fix a recent bug --- Dockerfile.rabbitmq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.rabbitmq b/Dockerfile.rabbitmq index fc0b411e8..106c81022 100644 --- a/Dockerfile.rabbitmq +++ b/Dockerfile.rabbitmq @@ -1,3 +1,3 @@ -FROM rabbitmq:management +FROM rabbitmq:3.13.7-management ARG WORKER_CONNECTION_TIMEOUT RUN echo "consumer_timeout = $WORKER_CONNECTION_TIMEOUT" >> /etc/rabbitmq/conf.d/10-defaults.conf From 31cf2f37b7ba823a5109b5d0334a8aea96e1c273 Mon Sep 17 00:00:00 2001 From: Obada Haddad Date: Thu, 26 Sep 2024 16:54:21 +0200 Subject: [PATCH 3/4] Reverted RabbitMQ image change --- Dockerfile.rabbitmq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.rabbitmq b/Dockerfile.rabbitmq index 106c81022..fc0b411e8 100644 --- a/Dockerfile.rabbitmq +++ b/Dockerfile.rabbitmq @@ -1,3 +1,3 @@ -FROM rabbitmq:3.13.7-management +FROM rabbitmq:management ARG WORKER_CONNECTION_TIMEOUT RUN echo "consumer_timeout = $WORKER_CONNECTION_TIMEOUT" >> /etc/rabbitmq/conf.d/10-defaults.conf From 9b578a73eef30663e95a6f839c49770ab967d5ea Mon Sep 17 00:00:00 2001 From: didayolo Date: Tue, 1 Oct 2024 18:06:44 +0200 Subject: [PATCH 4/4] Fix Rabbit version --- Dockerfile.rabbitmq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.rabbitmq b/Dockerfile.rabbitmq index fc0b411e8..106c81022 100644 --- a/Dockerfile.rabbitmq +++ b/Dockerfile.rabbitmq @@ -1,3 +1,3 @@ -FROM rabbitmq:management +FROM rabbitmq:3.13.7-management ARG WORKER_CONNECTION_TIMEOUT RUN echo "consumer_timeout = $WORKER_CONNECTION_TIMEOUT" >> /etc/rabbitmq/conf.d/10-defaults.conf