From 369d1eb91c48072c0ffb902a72ee7f65d1a0a995 Mon Sep 17 00:00:00 2001
From: Andrew Kapuscinski <akapusci@nrao.edu>
Date: Wed, 3 Feb 2021 16:36:09 -0700
Subject: [PATCH] -ops added CAPO_PATH variable to Dockerfile.base
---
.gitlab-ci.yml | 7 ++++---
Dockerfile.base | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c947f1fa..cbd379452 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,8 @@ include:
build base image:
stage: build-base
script:
- - docker build -t ${REGISTRY_URL}/ops/base:${PROJECT_NAME} -f Dockerfile.base . ; \
+ - docker build -t ${REGISTRY_URL}/ops/base:${PROJECT_NAME} -f Dockerfile.base .
+ - docker tag ${REGISTRY_URL}/ops/base:${PROJECT_NAME} ${REGISTRY_URL}/ops/base:${CI_COMMIT_SHORT_SHA}
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)-ops/'
changes:
@@ -43,11 +44,11 @@ push base image:
script:
- echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
- docker push ${REGISTRY_URL}/ops/base:${PROJECT_NAME}
+ - docker push ${REGISTRY_URL}/ops/base:${CI_COMMIT_SHORT_SHA}
rules:
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)-ops/'
+ - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE =~ /\A(?i)-ops/'
changes:
- Dockerfile.base
- when: always
# Build Stages
build dev workflow:
diff --git a/Dockerfile.base b/Dockerfile.base
index cb7c93c19..5c5e1c513 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -12,6 +12,7 @@ RUN apt-get update \
# - CAPO_PROFILE will be overridden for Dev, Test, and Prod
ENV PIP_NO_CACHE_DIR false
ENV CAPO_PROFILE docker
+ENV CAPO_PATH /root/.capo
# Set up Capo
WORKDIR /root/.capo
--
GitLab