crappyrules/mistborn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bash gitlab-ci

Browse Source
This commit is contained in:
Steven Foerster
2020-12-19 11:01:29 -05:00
parent a6a641679d
commit a70feca44c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+1 -1
View File
@@ -18,6 +18,6 @@ docker_build:
stage: test stage: test
script: script:
- apk add docker-compose - apk add docker-compose
- scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD" - bash scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
- docker-compose -f base.yml build - docker-compose -f base.yml build
scripts/env/setup.sh
Vendored
+1 -1
View File
@@ -41,7 +41,7 @@ echo "MISTBORN_BIND_IP=10.2.3.1" | sudo tee -a ${VAR_FILE}
GIT_BRANCH=$(git -C /opt/mistborn symbolic-ref --short HEAD || echo "master") GIT_BRANCH=$(git -C /opt/mistborn symbolic-ref --short HEAD || echo "master")
MISTBORN_TAG="${MISTBORN_MAJOR_VERSION}.${MISTBORN_MINOR_VERSION}" MISTBORN_TAG="${MISTBORN_MAJOR_VERSION}.${MISTBORN_MINOR_VERSION}"
if [ ! -z "$MISTBORN_TEST_CONTAINER" ]; then if [ ! -z "$MISTBORN_TEST_CONTAINER" ]; then
MISTBORN_TAG="test" MISTBORN_TAG="$MISTBORN_TEST_CONTAINER"
else if [ "$GIT_BRANCH" == "master" ]; then else if [ "$GIT_BRANCH" == "master" ]; then
MISTBORN_TAG="latest" MISTBORN_TAG="latest"
fi fi