Currency: upgrade docker to v24.0.6 (#168)

* upgrade docker to v24.0.6 * remove docker-runc * fix download url
ibm-functions · Oct 17, 2023 · 4172d97 · 4172d97
1 parent fc0d7ea
commit 4172d97
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/core/controller/Dockerfile b/core/controller/Dockerfile
@@ -28,7 +28,7 @@ ENV SWAGGER_UI_DOWNLOAD_SHA256=3d7ef5ddc59e10f132fe99771498f0f1ba7a2cbfb9585f986
 # If you change the docker version here, it has implications on invoker runc support.
 # Docker server version and the invoker docker version must be the same to enable runc usage.
 # If this cannot be guaranteed, set `invoker_use_runc: false` in the ansible env.
-ENV DOCKER_VERSION=18.06.3-ce
+ENV DOCKER_VERSION=24.0.6
 
 RUN apt update &&\
     # Upgrade installed packages to get latest security fixes if the base image does not contain them already.
@@ -40,10 +40,8 @@ RUN apt update &&\
 # Install docker client
 RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \
     tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
-    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \
     rm -f docker-${DOCKER_VERSION}.tgz && \
-    chmod +x /usr/bin/docker && \
-    chmod +x /usr/bin/docker-runc
+    chmod +x /usr/bin/docker
 ##################################################################################################
 
 # Install swagger-ui

diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile
@@ -19,7 +19,7 @@ FROM scala
 
 ENV UID=1001 \
     NOT_ROOT_USER=owuser
-    ENV DOCKER_VERSION=18.06.3-ce
+    ENV DOCKER_VERSION=24.0.6
 # If you change the docker version here, it has implications on invoker runc support.
 # Docker server version and the invoker docker version must be the same to enable runc usage.
 # If this cannot be guaranteed, set `invoker_use_runc: false` in the ansible env.
@@ -34,10 +34,8 @@ RUN apt update &&\
 # Install docker client
 RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \
     tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
-    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \
     rm -f docker-${DOCKER_VERSION}.tgz && \
-    chmod +x /usr/bin/docker && \
-    chmod +x /usr/bin/docker-runc
+    chmod +x /usr/bin/docker
 
 ADD build/distributions/invoker.tar ./
 

diff --git a/core/standalone/Dockerfile b/core/standalone/Dockerfile
@@ -16,7 +16,7 @@
 #
 FROM scala
 ARG OPENWHISK_JAR
-ENV DOCKER_VERSION=18.06.3-ce
+ENV DOCKER_VERSION=24.0.6
 ENV WSK_VERSION=1.0.0
 ADD init /
 ADD stop waitready /bin/

diff --git a/tools/ow-utils/Dockerfile b/tools/ow-utils/Dockerfile
@@ -17,7 +17,7 @@
 
 FROM ibm-semeru-runtimes:open-8u382-b05-jdk-focal
 
-ENV DOCKER_VERSION 1.12.0
+ENV DOCKER_VERSION 24.0.6
 ENV KUBECTL_VERSION v1.16.3
 ENV WHISK_CLI_VERSION latest
 ENV WHISKDEPLOY_CLI_VERSION latest
@@ -47,7 +47,8 @@ RUN pip install cryptography==2.5 && \
     pip install docker
 
 # Install docker client
-RUN wget --no-verbose https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz && \
+
+RUN wget --no-verbose https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \
   tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
   rm -f docker-${DOCKER_VERSION}.tgz && \
   chmod +x /usr/bin/docker