From 6b5396b504ff4f3b01d6a773a3e80199dbcdf70d Mon Sep 17 00:00:00 2001
From: Brittany Faciane <bfaciane@nrao.edu>
Date: Thu, 11 May 2023 11:01:45 -0400
Subject: [PATCH] No Story: Revert package registry back to marconi.
---
.gitlab-ci.yml | 5 ++---
ci/cleanup.template.yml | 4 ++--
ci/push.template.yml | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39b78e085..7b28bebc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,6 @@ variables:
POSTGRES_DB: archive
POSTGRES_USER: "archive"
POSTGRES_PASSWORD: "docker"
- BASE_REGISTRY_URL: "brooks.aoc.nrao.edu:5000/ssa-docker/workspaces"
image: docker:19.03.12
@@ -49,8 +48,8 @@ pull db image:
interruptible: true
stage: pull-db
script:
- - echo "$REGISTRY_URL_PASS" | docker login --username "$REGISTRY_URL_USER" --password-stdin $BASE_REGISTRY_URL
- - docker pull ${BASE_REGISTRY_URL}/db:workspaces
+ - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
+ - docker pull ${REGISTRY_URL}/db:workspaces
###############################################
# Build Pexes
diff --git a/ci/cleanup.template.yml b/ci/cleanup.template.yml
index bd74045ab..a4b2f388b 100644
--- a/ci/cleanup.template.yml
+++ b/ci/cleanup.template.yml
@@ -1,11 +1,11 @@
# Cleanup Images Template
.cleanup:
script:
- - NAME="${BASE_REGISTRY_URL}/${SERVICE_NAME}"
+ - NAME="${REGISTRY_URL}/${SERVICE_NAME}"
- |
printf "%s\n" "- Removing Images -" \
"${NAME}:${IMAGE_TAG}"
- - docker image rm --force "${BASE_REGISTRY_URL}/${SERVICE_NAME}:${IMAGE_TAG}"
+ - docker image rm --force "${REGISTRY_URL}/${SERVICE_NAME}:${IMAGE_TAG}"
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
variables:
diff --git a/ci/push.template.yml b/ci/push.template.yml
index 3119fc165..74751d3b8 100644
--- a/ci/push.template.yml
+++ b/ci/push.template.yml
@@ -1,8 +1,8 @@
# Push Images Template
.push:
script:
- - echo "$REGISTRY_URL_PASS" | docker login --username "$REGISTRY_URL_USER" --password-stdin $BASE_REGISTRY_URL
- - NAME="${BASE_REGISTRY_URL}/${SERVICE_NAME}"
+ - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
+ - NAME="${$REGISTRY_URL}/${SERVICE_NAME}"
- docker push ${NAME}:${IMAGE_TAG}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
--
GitLab