Updated Docker images to 20.10.21

.gitlab-ci.yml

@@ -70,7 +70,7 @@ lint_python_scripts:
 
 .build_docker_image:
   extends: .docker_image_builder_job
-  image: docker:20.10.10
+  image: docker:20.10.21
   variables:
     BUILD_TARGET: ""
   before_script:
@@ -100,7 +100,7 @@ lint_python_scripts:
 
 build_docker_dind_image:
   stage: pre-build
-  image: docker:20.10.10
+  image: docker:20.10.21
   variables:
     DOCKER_BUILDKIT: 1
     DOCKER_DRIVER: overlay2
@@ -115,7 +115,7 @@ build_docker_dind_image:
       exists:
         - Dockerfile.docker-dind
   services:
-    - docker:20.10.10-dind
+    - docker:20.10.21-dind
   tags:
     - public-runner-docker
 

Dockerfile.docker-builder

-FROM docker:20.10.10 AS docker-builder
+FROM docker:20.10.21 AS docker-builder
 
 COPY scripts/bash/*.sh /usr/local/bin
 RUN apk add --no-cache bash git ca-certificates curl
\ No newline at end of file

Dockerfile.docker-dind

 # To workaround a gitlab healthcheck bug, expose just single port. 
 # See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29130#note_1028331564 and
 # https://gitlab.com/search?search=Service+docker+dind+probably+didn%27t+start+properly&nav_source=navbar&project_id=250833&group_id=9970&scope=issues&sort=updated_desc
-FROM docker:20.10.10-dind as upstream
+FROM docker:20.10.21-dind as upstream
 
 FROM scratch
 

README.md

@@ -26,7 +26,7 @@ The former is an XSL transformation file, which can be used to transform checkst
 The latter is a Compose file for setting up a simple Docker-in-Docker container. To connect to that container with a Docker CLI one use command like:
 
 ```bash
-docker run -it --rm --network docker -e DOCKER_TLS_CERTDIR=/certs -v docker-certs-client:/certs/client:ro --name docker-cli docker:20.10.10
+docker run -it --rm --network docker -e DOCKER_TLS_CERTDIR=/certs -v docker-certs-client:/certs/client:ro --name docker-cli docker:20.10.21
 ```
 
 The iportant bit is connecting to the right network (`--network docker`) and mounting the TLS certificates (`-e DOCKER_TLS_CERTDIR=/certs -v docker-certs-client:/certs/client:ro`). Other parameters can be changed to suit your purposes.

misc/docker-compose.dind.yml

 version: '3.9'
 services:
   docker:
-    image: docker:20.10.10-dind
+    image: docker:20.10.21-dind
     privileged: true
     environment:
       - DOCKER_TLS_CERTDIR=/certs