From 17fa3bb8575978814804ef0fde59aaf58bed1b26 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Mon, 27 May 2019 18:00:44 -0700
Subject: [PATCH] Fix bad variable reference
---
.gitlab-ci.yml | 6 ++++--
source/Makefile | 6 +-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae5e391..5f75893 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,10 @@ image: containers.ethitter.com:443/docker/images/debian:stretch
before_script:
- apt-get update
- apt-get -y --no-install-recommends install devscripts lintian fakeroot
- - echo $CI_BUILDS_DIR
- - echo $CI_PROJECT_DIR
+ - echo $NGINX_VERSION
+ - echo $NGINX_BINARY
+ # Relies on latest binary build artifact from https://git.ethitter.com/debian/nginx-build.
+ - curl -o source/fakeroot/usr/sbin/nginx "${NGINX_BINARY}"
after_script:
- ls -la $CI_BUILDS_DIR
diff --git a/source/Makefile b/source/Makefile
index dee87c2..0ae581b 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -1,8 +1,4 @@
-# Relies on latest binary build artifact from https://git.ethitter.com/debian/nginx-build.
-get_binary:
- curl -o fakeroot/usr/sbin/nginx "${NGINX_BINARY}"
-
-install: get_binary
+install:
install fakeroot/etc/default/nginx /etc/default/nginx
install fakeroot/etc/init.d/nginx /etc/init.d/nginx
install fakeroot/etc/logrotate.d/nginx /etc/logrotate.d/nginx
--
GitLab