Rebuild Python images and update docker-compose (#1273)

gitpod-io · Jan 20, 2024 · 7e92b52 · 7e92b52
1 parent f11f574
commit 7e92b52
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/chunks/lang-python/Dockerfile b/chunks/lang-python/Dockerfile
@@ -5,7 +5,7 @@ ARG PYTHON_VERSION
 
 USER gitpod
 # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
-ENV TRIGGER_REBUILD=1
+ENV TRIGGER_REBUILD=2
 
 ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 ENV PIPENV_VENV_IN_PROJECT=true

diff --git a/chunks/tool-docker/Dockerfile b/chunks/tool-docker/Dockerfile
@@ -13,7 +13,7 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor
     && apt update \
     && install-packages docker-ce docker-ce-cli containerd.io docker-buildx-plugin
 
-RUN curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-$(uname -m) \
+RUN curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-$(uname -m) \
     && chmod +x /usr/local/bin/docker-compose && mkdir -p /usr/local/lib/docker/cli-plugins && \
     ln -s /usr/local/bin/docker-compose /usr/local/lib/docker/cli-plugins/docker-compose
 

diff --git a/tests/tool-docker.yaml b/tests/tool-docker.yaml
@@ -8,7 +8,7 @@
   command: [docker-compose --version]
   assert:
   - status == 0
-  - stdout.indexOf("2.23.3") != -1
+  - stdout.indexOf("2.24.1") != -1
 - desc: containerd should be installed
   command: [containerd, config, dump]
   assert: