From 1eb546572ba12d3bdfda4a2e548da8bb4674119a Mon Sep 17 00:00:00 2001
From: Nikolas S <nikolas@admintuts.net>
Date: Fri, 31 Dec 2021 04:13:19 +0200
Subject: [PATCH] Corrected variabe substiutions

---
 .circleci/config.yml | 8 ++++----
 .travis.yml          | 6 +++---
 Dockerfile           | 2 +-
 env.sh               | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 env.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 742cd9f..9d83544 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,8 +17,8 @@ jobs:
           chmod +x tune-worker-processes.sh
           chmod +x env.sh
           source env.sh
-          sudo docker build . -t $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine --no-cache
-          docker push $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine
+          sudo docker build . -t $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine --no-cache
+          docker push $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine
   test:
     executor: machine-executor
     working_directory: ~/nginx-build
@@ -27,8 +27,8 @@ jobs:
       - run: |
           chmod +x env.sh
           source env.sh
-          docker pull $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine
-          docker run -t --name webserver --rm  $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine nginx -v
+          docker pull $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine
+          docker run -t --name webserver --rm  $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine nginx -v
 
 workflows:
   build_and_test:
diff --git a/.travis.yml b/.travis.yml
index c4b8011..b1bc752 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,11 @@ before_install:
 - chmod +x tune-worker-processes.sh
 - chmod +x env.sh
 - source env.sh
-- docker build . -t $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine --no-cache
+- docker build . -t $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine --no-cache
 
 script:
-- docker run -t --name webserver --rm  $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine nginx -v
+- docker run -t --name webserver --rm  $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine nginx -v
 
 after_success:
 - echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_ID" --password-stdin
-- docker push $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine
+- docker push $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine
diff --git a/Dockerfile b/Dockerfile
index fa602da..cae021a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ RUN ldconfig || :
 
 # Nginx installation 
 
-ENV NGINX_VERSION ${NGINX_VERSION}
+ENV NGINX_VERSION 1.21.5
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 && CONFIG="\
     --prefix=/etc/nginx \
diff --git a/env.sh b/env.sh
old mode 100644
new mode 100755
index 88aa0ed..58e6807
--- a/env.sh
+++ b/env.sh
@@ -1 +1 @@
-export NGINX_VERSION=1.21.5
\ No newline at end of file
+export NGX_VERSION=1.21.5
\ No newline at end of file