From f6d37ad800d48b403cdef52977a2b51ef6b8f8d2 Mon Sep 17 00:00:00 2001
From: Jure Triglav <juretriglav@gmail.com>
Date: Fri, 19 Mar 2021 04:36:02 +0100
Subject: [PATCH] ci: use production Dockerfile for deploy build
---
.gitlab-ci.elife.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.elife.yml b/.gitlab-ci.elife.yml
index 45970db5cf..4634399ea6 100644
--- a/.gitlab-ci.elife.yml
+++ b/.gitlab-ci.elife.yml
@@ -19,7 +19,7 @@ build:
- if [ -z "$DOCKERHUB_USERNAME_ELIFE" ] || [ -z "$DOCKERHUB_PASSWORD_ELIFE" ]; then echo "Not pushing" && exit 0; fi
- docker login -u $DOCKERHUB_USERNAME_ELIFE -p $DOCKERHUB_PASSWORD_ELIFE
- docker pull $IMAGE_ORG/$IMAGE_NAME:latest || true
- - docker build --file ./Dockerfile-ci --cache-from $CI_REGISTRY_IMAGE:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .
+ - docker build --file ./Dockerfile-production --cache-from $CI_REGISTRY_IMAGE:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .
- docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
- docker push $IMAGE_ORG/$IMAGE_NAME:latest
@@ -41,8 +41,8 @@ deploy:
script:
- |
ssh ubuntu@$ELIFE_SERVER_IP "sudo docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD &&
- sudo docker pull $IMAGE_ORG/$IMAGE_NAME:latest &&
- sudo supervisorctl stop kotahi &&
+ sudo docker pull $IMAGE_ORG/$IMAGE_NAME:latest &&
+ sudo supervisorctl stop kotahi &&
cd /home/ubuntu/kotahi &&
sudo docker-compose down &&
sudo supervisorctl start kotahi"
--
GitLab