From 9c278f68263e0829889126981aab77a76c42af99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20H=C3=B6ffner?= <info@sebastian-hoeffner.de>
Date: Tue, 30 Oct 2018 11:37:52 +0100
Subject: [PATCH] Using two different docker-compose files, one using the local
build context and one to deploy using the container registry.
---
Jenkinsfile | 2 +-
docker-compose.deploy.yml | 7 +++++++
docker-compose.yml | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 docker-compose.deploy.yml
diff --git a/Jenkinsfile b/Jenkinsfile
index 4481e99..f7c3e0a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
stage('deploy') {
steps {
- sh 'docker-compose --project-name litmus up --detach --renew-anon-volumes --force-recreate'
+ sh 'docker-compose -f docker-compose.deploy.yaml --project-name litmus up --detach --renew-anon-volumes --force-recreate'
}
when {
branch 'master'
diff --git a/docker-compose.deploy.yml b/docker-compose.deploy.yml
new file mode 100644
index 0000000..3eb6c7a
--- /dev/null
+++ b/docker-compose.deploy.yml
@@ -0,0 +1,7 @@
+version: "3.2"
+
+
+services:
+
+ openccg:
+ image: web-openccg:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 3eb6c7a..b9cd8ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,4 +4,4 @@ version: "3.2"
services:
openccg:
- image: web-openccg:latest
+ build: .
--
GitLab