commit: 77412d5dd24a384f9be7d6bc6b1538415c584802
parent: b4532277b1448b9108585bfdc2fc61918fc4fb6c
Author: feld <feld@feld.me>
Date: Tue, 14 Jan 2020 21:36:52 +0000
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2105
Diffstat:
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -271,6 +271,7 @@ docker:
stage: docker
image: docker:latest
cache: {}
+ dependencies: []
variables: &docker-variables
DOCKER_DRIVER: overlay2
DOCKER_HOST: unix:///var/run/docker.sock
@@ -298,6 +299,7 @@ docker-stable:
stage: docker
image: docker:latest
cache: {}
+ dependencies: []
variables: *docker-variables
before_script: *before-docker
allow_failure: true