From 55032b29af3aa912071d96431cd84b8f8e7057aa Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sat, 16 Nov 2019 22:04:38 +0100
Subject: [PATCH] [Docker] Strip build: lines from docker-compose input to
force pull.
---
.gitlab-ci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27c2075cc..575c38302 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,20 +30,18 @@ deploy_demo-master:
- echo "$SSH_KNOWN_HOSTS" >~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
script:
- - ssh root@demo-master.biscuit-sis.org
+ - grep -v "build:" docker-compose.yml | ssh root@demo-master.biscuit-sis.org
env BISCUIT_IMAGE_TAG=${CI_COMMIT_REF_NAME}
docker-compose
-p biscuit-${CI_ENVIRONMENT_SLUG}
-f /dev/stdin
pull
- <docker-compose.yml
- - ssh root@demo-master.biscuit-sis.org
+ - grep -v "build:" docker-compose.yml | ssh root@demo-master.biscuit-sis.org
env BISCUIT_IMAGE_TAG=${CI_COMMIT_REF_NAME}
NGIINX_HTTP_PORT=80
docker-compose
-p biscuit-${CI_ENVIRONMENT_SLUG}
-f /dev/stdin
up -d
- <docker-compose.yml
only:
- master
--
GitLab