Upgrade to 19.03-3.26

eea · May 20, 2021 · 47726c3 · 47726c3
1 parent 58c2259
commit 47726c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 19.03-3.26 (2021-05-20)
+
+- Upgrade to swarm-client 3.26
+- Upgrade to docker-compose 1.29.2
+
 ## 19.03-3.25 (2021-03-17)
 
 - Upgrade to swarm-client 3.25

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 FROM eeacms/jenkins-slave:3.26
 
 ENV DOCKER_VERSION=5:19.03.15 \
-    DOCKER_COMPOSE_VERSION=1.28.5 \
-    DOCKER_COMPOSE_MD5=8a50dee378793d19c8e0b634a74a8660 \
+    DOCKER_COMPOSE_VERSION=1.29.2 \
+    DOCKER_COMPOSE_MD5=8f68ae5d2334eecb0ee50b809b5cec58 \
     CLAIR_SCANNER_VERSION=v12 \
     RANCHER_CLI_VERSION=v0.6.14
 

diff --git a/Readme.md b/Readme.md
@@ -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)
+- [`:19.03-3.26` (*Dockerfile*)](https://github.com/eea/eea.docker.jenkins.slave/blob/19.03-3.26/Dockerfile)
 - [`:19.03-3.25` (*Dockerfile*)](https://github.com/eea/eea.docker.jenkins.slave/blob/19.03-3.25/Dockerfile)
 - [`:17.12-3.22` (*Dockerfile*)](https://github.com/eea/eea.docker.jenkins.slave-dind/blob/17.12-3.22/Dockerfile) - Docker 17.12.1-ce, Docker-Compose 1.25.4, Swarm Client 3.22
 - [`:19.03-3.23` (*Dockerfile*)](https://github.com/eea/eea.docker.jenkins.slave-dind/blob/19.03-3.23/Dockerfile) - Docker 19.03.13-ce, Docker-Compose 1.27.4, Swarm Client 3.23