Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Currency: upgrade docker to v24.0.6 #168

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Currency: upgrade docker to v24.0.6 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fa47f7
upgrade docker to v24.0.6
marc-schwind Oct 16, 2023
4a37c0b
remove docker-runc
marc-schwind Oct 16, 2023
a1802bf
fix download url
marc-schwind Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions core/controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions core/invoker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 ./

Expand Down
2 changes: 1 addition & 1 deletion core/standalone/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
5 changes: 3 additions & 2 deletions tools/ow-utils/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading