From c3b641b53c0da607e9507bec093162426d0e3bc2 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 23 Feb 2019 21:18:01 -0800
Subject: [PATCH] Build for Stretch
---
.gitlab-ci.yml | 32 ++++++++++++++++++++++++++++----
scripts/build.sh | 2 +-
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f0d820..f8f791a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,51 @@
-image: containers.ethitter.com:443/docker/images/debian:jessie
-
stages:
- test_pre_build
- build
- test
- deploy
+# General tests
test_build_script:
stage: test_pre_build
image: koalaman/shellcheck-alpine:latest
script:
- shellcheck ./scripts/build.sh
-test_build_nginx:
+# Stretch
+test_build_nginx_stretch:
+ stage: build
+ image: containers.ethitter.com:443/docker/images/debian:stretch-dev
+ script:
+ - chmod +x ./scripts/build.sh
+ - ./scripts/build.sh
+ except:
+ - master
+
+build_nginx_stretch:
+ stage: build
+ image: containers.ethitter.com:443/docker/images/debian:stretch-dev
+ script:
+ - chmod +x ./scripts/build.sh
+ - ./scripts/build.sh
+ artifacts:
+ paths:
+ - artifacts
+ only:
+ - master
+
+# Jessie
+test_build_nginx_jessie:
stage: build
+ image: containers.ethitter.com:443/docker/images/debian:jessie
script:
- chmod +x ./scripts/build.sh
- ./scripts/build.sh
except:
- master
-build_nginx:
+build_nginx_jessie:
stage: build
+ image: containers.ethitter.com:443/docker/images/debian:jessie
script:
- chmod +x ./scripts/build.sh
- ./scripts/build.sh
diff --git a/scripts/build.sh b/scripts/build.sh
index 13305df..ea3678c 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -17,7 +17,7 @@ echo ""
NGINX_ARTIFACT_PATH="$OG_DIR/artifacts"
export NGINX_ARTIFACT_PATH
-NGINX_BUILT_BINARY_PATH="$NGINX_ARTIFACT_PATH/nginx_${NGINX_TAG}_${OPENSSL_TAG}"
+NGINX_BUILT_BINARY_PATH="${NGINX_ARTIFACT_PATH}/nginx_$(lsb_release -sc)_${NGINX_TAG}_${OPENSSL_TAG}"
export NGINX_BUILT_BINARY_PATH
mkdir -p "$NGINX_ARTIFACT_PATH"
--
GitLab