From 79d6afafb3704c600cda52fb6ffa56d53dbde4fb Mon Sep 17 00:00:00 2001
From: Matthew Defenderfer <mdefende@uab.edu>
Date: Fri, 25 Oct 2024 14:33:49 -0500
Subject: [PATCH] move around which job is downloading the secure files and
which isn;t
---
.gitlab-ci.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf61fc5..423d015 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,20 +7,17 @@ stages:
- pre-build
- build
+variables:
+ SECURE_FILES_DOWNLOAD_PATH: '.secure'
+
get-credentials:
stage: pre-build
image: ubuntu:jammy
- variables:
- SECURE_FILES_DOWNLOAD_PATH: '.secure'
before_script:
- apt-get update && apt-get upgrade -y && apt-get install curl -y
script:
- echo "Copying secure file with FeBio login ..."
- curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
- - export USERNAME=$(grep 'username:' ${SECURE_FILES_DOWNLOAD_PATH}/febio_login.txt | cut -d ':' -f2 | tr -d ' ')
- - export PASSWORD=$(grep 'password:' ${SECURE_FILES_DOWNLOAD_PATH}/febio_login.txt | cut -d ':' -f2 | tr -d ' ')
- - echo "Extracted username $USERNAME"
- - echo "Extracted password $PASSWORD"
docker-build:
stage: build
@@ -30,6 +27,8 @@ docker-build:
dependencies:
- get-credentials
script:
+ - export USERNAME=$(grep 'username:' ${SECURE_FILES_DOWNLOAD_PATH}/febio_login.txt | cut -d ':' -f2 | tr -d ' ')
+ - export PASSWORD=$(grep 'password:' ${SECURE_FILES_DOWNLOAD_PATH}/febio_login.txt | cut -d ':' -f2 | tr -d ' ')
- docker pull $CI_REGISTRY_IMAGE:latest || true
- docker build --build-arg BUILDKIT_INLINE_CACHE=1 --build-arg USERNAME=${USERNAME} --build-arg PASSWORD=${PASSWORD} --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
--
GitLab