Skip to content

Commit

Permalink
Upgrade to latest docker
Browse files Browse the repository at this point in the history
  • Loading branch information
valentinab25 committed Aug 16, 2024
1 parent 22aa347 commit 88b02bd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 27.1-3.47 (2024-08-16)

- Upgrade to docker 27.1.2
- Upgrade to docker-compose 2.29.1

## 20.10-3.47 (2024-08-15)

- Upgrade to swarm-client 3.47
Expand Down
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM eeacms/jenkins-slave:3.47

ENV DOCKER_VERSION=5:20.10.24 \
DOCKER_COMPOSE_VERSION=1.29.2 \
DOCKER_COMPOSE_MD5=8f68ae5d2334eecb0ee50b809b5cec58 \
CLAIR_SCANNER_VERSION=v12 \
ENV DOCKER_VERSION=5:27.1.2 \
DOCKER_COMPOSE_VERSION=v2.29.1 \
DOCKER_COMPOSE_MD5=bb1c341cf694485ca9d80472e2f6e649 \
RANCHER_CLI_VERSION=v0.6.14 \
KUBE_VERSION=1.21.14 \
HELM_VERSION=3.6.3 \
BUILDX_VERSION=v0.10.4
BUILDX_VERSION=v0.10.4 \
DOCKER_API_VERSION=1.40

RUN apt-get update \
&& apt-get install -y --no-install-recommends gpg-agent apt-transport-https ca-certificates software-properties-common acl \
Expand All @@ -26,8 +26,6 @@ RUN apt-get update \
&& echo "$DOCKER_COMPOSE_MD5 /bin/docker-compose" | md5sum -c - \
&& chmod +x /bin/docker-compose \
&& pip install j2cli \
&& curl -L -o /usr/bin/clair-scanner https://github.com/arminc/clair-scanner/releases/download/$CLAIR_SCANNER_VERSION/clair-scanner_linux_amd64 \
&& chmod 777 /usr/bin/clair-scanner \
&& curl -L -o rancher-linux-amd64-${RANCHER_CLI_VERSION}.tar.gz https://releases.rancher.com/cli/${RANCHER_CLI_VERSION}/rancher-linux-amd64-${RANCHER_CLI_VERSION}.tar.gz \
&& tar -xzvf rancher-linux-amd64-${RANCHER_CLI_VERSION}.tar.gz \
&& mv rancher-${RANCHER_CLI_VERSION}/rancher /usr/bin/rancher \
Expand Down
1 change: 1 addition & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This image is generic, thus you can obviously re-use it within your non-related
## Supported tags and respective Dockerfile links

- [`:latest` (*Dockerfile*)](https://github.com/eea/eea.docker.jenkins.slave-dind/blob/master/Dockerfile)
- [`:27.1-3.47` (*Dockerfile*)](https://github.com/eea/eea.docker.jenkins.slave/blob/27.1-3.47/Dockerfile)
- [`:20.10-3.47` (*Dockerfile*)](https://github.com/eea/eea.docker.jenkins.slave/blob/20.10-3.47/Dockerfile)

See [older versions](https://github.com/eea/eea.docker.jenkins.slave-dind/releases)
Expand Down

0 comments on commit 88b02bd

Please sign in to comment.