Merge branch 'features/docker-updates' into 'develop'

Features/docker updates

See merge request pleroma/pleroma!2105
This commit is contained in:
feld 2020-01-14 21:36:52 +00:00
commit 77412d5dd2

View file

@ -271,6 +271,7 @@ docker:
stage: docker stage: docker
image: docker:latest image: docker:latest
cache: {} cache: {}
dependencies: []
variables: &docker-variables variables: &docker-variables
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_HOST: unix:///var/run/docker.sock DOCKER_HOST: unix:///var/run/docker.sock
@ -298,6 +299,7 @@ docker-stable:
stage: docker stage: docker
image: docker:latest image: docker:latest
cache: {} cache: {}
dependencies: []
variables: *docker-variables variables: *docker-variables
before_script: *before-docker before_script: *before-docker
allow_failure: true allow_failure: true