From ad143dbd768bbae93c8f391d41febc2286564d02 Mon Sep 17 00:00:00 2001
From: Travis Rivers <trivers@contractor.usgs.gov>
Date: Fri, 14 Aug 2020 18:46:44 -0600
Subject: [PATCH] custom func config and pipeline variable updates
---
.gitlab-ci.yml | 4 ++++
scripts/custom.funcs.sh | 5 +----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de03d6c93..e0b451ea6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,6 +96,8 @@ variables:
tags:
- deploy
- swarm
+ variables:
+ APP_NAME: geomag-algorithms
.mage:
variables:
@@ -148,3 +150,5 @@ Deploy Mage01:
- .deploy
- .staging
- .mage
+ variables:
+ APP_NAME: geomag-algorithms
diff --git a/scripts/custom.funcs.sh b/scripts/custom.funcs.sh
index 2cdd66ba7..c09190d26 100644
--- a/scripts/custom.funcs.sh
+++ b/scripts/custom.funcs.sh
@@ -11,7 +11,6 @@ preStackDeployHook () {
##
writeYmlFile () {
local ymlFileName="${APP_NAME}.yml";
- local configName="assets-$(date +%H%M%S)-$$";
cat <<-EO_YML > ${ymlFileName}
version: "3.5"
@@ -32,14 +31,12 @@ services:
order: start-first
parallelism: 3
ports:
- - 8000:8000
+ - 8000
environment:
- BASE_HREF=${BASE_HREF}
- DATA_HOST=${DATA_HOST}
- DATA_PORT=${DATA_PORT}
- DATA_TYPE=${DATA_TYPE}
- SITE_URL=${SITE_URL}
- configs:
- - source: ${configName}
EO_YML
}
--
GitLab