diff options
| author | feld <feld@feld.me> | 2020-01-14 21:36:52 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-01-14 21:36:52 +0000 |
| commit | 77412d5dd24a384f9be7d6bc6b1538415c584802 (patch) | |
| tree | 2218dae596caff4eaddab451402743f352697646 | |
| parent | b4532277b1448b9108585bfdc2fc61918fc4fb6c (diff) | |
| parent | a58a0a7b1b85f900c52c63fc9a4c55a84431d0b0 (diff) | |
| download | pleroma-77412d5dd24a384f9be7d6bc6b1538415c584802.tar.gz | |
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2105
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b47bfb598..2b2601082 100644 --- 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 |