From 9b39447c6a3bb08585e6f775d6b8ffe7eb8da17d Mon Sep 17 00:00:00 2001
From: Samuel Galson <samgalson@gmail.com>
Date: Mon, 8 Jan 2018 14:30:09 +0000
Subject: [PATCH] decouple image name and docker user
---
.gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7601e30ba..57dc115ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
variables:
+ IMAGE_ORG: xpub
IMAGE_NAME: xpub
BASE_DOMAIN: gateway.xpub.semioticsquares.com
CONFIGURATION_REPOSITORY: https://gitlab.coko.foundation/pubsweet/infra.git
@@ -18,11 +19,11 @@ build:
- docker version
- docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
- echo "Ignore warning! Cannot perform an interactive login from a non TTY device"
- - docker build -t $DOCKERHUB_USERNAME/$IMAGE_NAME:$CI_COMMIT_SHA .
- - docker push $DOCKERHUB_USERNAME/$IMAGE_NAME:$CI_COMMIT_SHA
+ - docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .
+ - docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
lint:
- image: $DOCKERHUB_USERNAME/$IMAGE_NAME:$CI_COMMIT_SHA
+ image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
stage: test
variables:
GIT_STRATEGY: none
@@ -31,7 +32,7 @@ lint:
- npm run lint
test:
- image: $DOCKERHUB_USERNAME/$IMAGE_NAME:$CI_COMMIT_SHA
+ image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
stage: test
variables:
GIT_STRATEGY: none
--
GitLab