From 101b36edf91fd1b343d5d57b71ca1dc17a564f62 Mon Sep 17 00:00:00 2001
From: Samuel Galson <samgalson@gmail.com>
Date: Mon, 8 Jan 2018 16:58:49 +0000
Subject: [PATCH] use image_org instead of docker_username
---
templates/xpub-collabra-deployment.yaml | 4 ++--
templates/xpub-ui-deployment.yaml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/templates/xpub-collabra-deployment.yaml b/templates/xpub-collabra-deployment.yaml
index 654c1e6..535ce9e 100644
--- a/templates/xpub-collabra-deployment.yaml
+++ b/templates/xpub-collabra-deployment.yaml
@@ -23,7 +23,7 @@ spec:
spec:
initContainers:
- name: seed-${CI_ENVIRONMENT_SLUG}
- image: ${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${CI_COMMIT_SHA}
+ image: ${IMAGE_ORG}/${IMAGE_NAME}:${CI_COMMIT_SHA}
imagePullPolicy: Always
workingDir: /home/xpub/packages/${PACKAGE_NAME}
volumeMounts:
@@ -40,7 +40,7 @@ spec:
command: ["/bin/bash", "/init-scripts/createdb.sh"]
containers:
- name: ${CI_ENVIRONMENT_SLUG}
- image: ${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${CI_COMMIT_SHA}
+ image: ${IMAGE_ORG}/${IMAGE_NAME}:${CI_COMMIT_SHA}
imagePullPolicy: Always
workingDir: /home/xpub/packages/${PACKAGE_NAME}
env:
diff --git a/templates/xpub-ui-deployment.yaml b/templates/xpub-ui-deployment.yaml
index 7ec027b..c92429b 100644
--- a/templates/xpub-ui-deployment.yaml
+++ b/templates/xpub-ui-deployment.yaml
@@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: ${CI_ENVIRONMENT_SLUG}
- image: ${DOCKERHUB_USERNAME}/${IMAGE_NAME}:${CI_COMMIT_SHA}
+ image: ${IMAGE_ORG}/${IMAGE_NAME}:${CI_COMMIT_SHA}
workingDir: /home/xpub/packages/xpub-ui/styleguide
command: ["python", "-m", "SimpleHTTPServer", "3000"]
imagePullPolicy: Always
--
GitLab