From 68dd8ec251b4d18100f3cd73a0b87fec0a2680d7 Mon Sep 17 00:00:00 2001
From: Joshua David Akers <akers@vt.edu>
Date: Mon, 5 Jun 2023 09:18:12 -0400
Subject: [PATCH] [PLATFORM-1734] fix paths of images
---
.gitlab-ci.yml | 6 ++++--
Dockerfile | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7545953..0dde356 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,8 +12,10 @@ before_script:
build-except-master:
stage: build
+ variables:
+ BUILD_ARGS: --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}
script:
- - docker build -t $CONTAINER_TEST_IMAGE .
+ - docker build $BUILD_ARGS -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE
tags:
- dvlp
@@ -38,4 +40,4 @@ release-image:
- master
tags:
- dvlp
- - infrastructure
\ No newline at end of file
+ - infrastructure
diff --git a/Dockerfile b/Dockerfile
index 2425fc9..d18debb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}bitnami/kubectl:1.25 AS kubectl
+FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/bitnami/kubectl:1.25 AS kubectl
-FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}amazon/aws-cli:2.11.21
+FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/amazon/aws-cli:2.11.21
ENTRYPOINT []
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl
--
GitLab