alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent b4532277b1 a58a0a7b1b
commit 77412d5dd2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
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