Merge branch 'master' into 'renovate/docker-23.x'

# Conflicts:
#   .gitlab-ci.yml
This commit is contained in:
2023-02-11 20:50:10 +00:00

View File

@@ -11,9 +11,9 @@ stages:
- push_dockerhub - push_dockerhub
.docker_base: .docker_base:
image: docker:23.0.0-dind-rootless image: docker:20.10.23-dind-rootless
services: services:
- name: docker:23.0.0-dind-rootless - name: docker:20.10.23-dind-rootless
command: ["--tls=false"] command: ["--tls=false"]
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2