From 3fa47f778cc5cec492fcc22f10832ee83daf8da9 Mon Sep 17 00:00:00 2001 From: Marc Schwind Date: Mon, 16 Oct 2023 13:36:12 +0200 Subject: [PATCH 1/3] upgrade docker to v24.0.6 --- core/controller/Dockerfile | 2 +- core/invoker/Dockerfile | 2 +- tools/ow-utils/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/controller/Dockerfile b/core/controller/Dockerfile index cff07ed0f7d..aca5947fc17 100644 --- 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. diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile index d154cce9a35..a603e1b7084 100644 --- 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. diff --git a/tools/ow-utils/Dockerfile b/tools/ow-utils/Dockerfile index e5daae3379b..31a0dda74a6 100644 --- 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 From 4a37c0bf3e79c86e73fa2b76c9364891ac6e9302 Mon Sep 17 00:00:00 2001 From: Marc Schwind Date: Mon, 16 Oct 2023 14:03:22 +0200 Subject: [PATCH 2/3] remove docker-runc --- core/controller/Dockerfile | 4 +--- core/invoker/Dockerfile | 4 +--- core/standalone/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/controller/Dockerfile b/core/controller/Dockerfile index aca5947fc17..4602a87e9b2 100644 --- a/core/controller/Dockerfile +++ b/core/controller/Dockerfile @@ -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 index a603e1b7084..b812bf9140a 100644 --- a/core/invoker/Dockerfile +++ b/core/invoker/Dockerfile @@ -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 index 6b0138323e4..56af7327f3c 100644 --- 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/ From a1802bf66e74446f6bfaef08b05538eddea2c8ce Mon Sep 17 00:00:00 2001 From: Marc Schwind Date: Mon, 16 Oct 2023 14:29:21 +0200 Subject: [PATCH 3/3] fix download url --- tools/ow-utils/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/ow-utils/Dockerfile b/tools/ow-utils/Dockerfile index 31a0dda74a6..d5ab183830e 100644 --- a/tools/ow-utils/Dockerfile +++ b/tools/ow-utils/Dockerfile @@ -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