From 78fbf3cb14d0b6038f8236ba3e14b5b442762540 Mon Sep 17 00:00:00 2001
From: Nikolas S <nikolas@admintuts.net>
Date: Thu, 30 Dec 2021 19:52:43 +0200
Subject: [PATCH] Automatic injection of NGINX_VERSION var

---
 .circleci/config.yml | 47 ++++++++++++++++++++------------------------
 .travis.yml          |  7 ++++---
 env.sh               |  1 +
 3 files changed, 26 insertions(+), 29 deletions(-)
 create mode 100644 env.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index de157da..20559c7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,39 +1,34 @@
 version: 2.1
 
+executors:
+  machine-executor:
+    machine:
+      image: ubuntu-2004:202111-02
 jobs:
   build:
-    docker:
-      - image: ubuntu:latest
-        auth:
-          username: $DOCKER_HUB_ID
-          password: $DOCKER_HUB_PASSWORD
-    steps:
-       - checkout
-       - run: |
-          chmod +x docker-entrypoint.sh
-          chmod +x envsubst-on-templates.sh
-          chmod +x tune-worker-processes.sh
-          docker build . -t $DOCKER_HUB_ID/nginx:1.21.4-rtmp-geoip2-alpine --no-cache
-
-  test:
-    docker:
-      - image: ubuntu:latest
-        auth:
-          username: $DOCKER_HUB_ID
-          password: $DOCKER_HUB_PASSWORD
+    executor: machine-executor
+    working_directory: ~/nginx-build
     steps:
       - checkout
       - run: |
-          docker run -t --name webserver --rm  $DOCKER_HUB_ID/nginx:1.21.4-rtmp-geoip2-alpine nginx -v
+          echo "$DOCKER_HUB_PASSWORD" | docker login --username $DOCKER_HUB_ID --password-stdin
+          chmod +x docker-entrypoint.sh
+          chmod +x envsubst-on-templates.sh
+          chmod +x tune-worker-processes.sh
+          source env.sh
+          sudo docker build . -t $DOCKER_HUB_ID/nginx:$NGINX_VERSION-rtmp-geoip2-alpine --no-cache
+  test:
+    executor: machine-executor
+    working_directory: ~/nginx-build
+    steps:
+      - run: |
+          docker run -t --name webserver --rm  $DOCKER_HUB_ID/nginx:$NGINX_VERSION-rtmp-geoip2-alpine nginx -v
   
   deploy:
-    docker:
-      - image: ubuntu:latest
-        auth:
-          username: $DOCKER_HUB_ID
-          password: $DOCKER_HUB_PASSWORD
+    executor: machine-executor
+    working_directory: ~/nginx-build
     steps:
-      - run: docker push $DOCKER_HUB_ID/nginx:1.21.4-rtmp-geoip2-alpine
+      - run: docker push $DOCKER_HUB_ID/nginx:$NGINX_VERSION-rtmp-geoip2-alpine
 
 workflows:
   build_and_test:
diff --git a/.travis.yml b/.travis.yml
index df4977d..fcd83e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,12 @@ before_install:
 - chmod +x docker-entrypoint.sh
 - chmod +x envsubst-on-templates.sh
 - chmod +x tune-worker-processes.sh
-- docker build . -t $DOCKER_HUB_ID/nginx:1.21.4-rtmp-geoip2-alpine --no-cache
+- source env.sh
+- docker build . -t $DOCKER_HUB_ID/nginx:$NGINX_VERSION-rtmp-geoip2-alpine --no-cache
 
 script:
-- docker run -t --name webserver --rm  $DOCKER_HUB_ID/nginx:1.21.4-rtmp-geoip2-alpine nginx -v
+- docker run -t --name webserver --rm  $DOCKER_HUB_ID/nginx:$NGINX_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:1.21.4-rtmp-geoip2-alpine
+- docker push $DOCKER_HUB_ID/nginx:$NGINX_VERSION-rtmp-geoip2-alpine
diff --git a/env.sh b/env.sh
new file mode 100644
index 0000000..489e18d
--- /dev/null
+++ b/env.sh
@@ -0,0 +1 @@
+export NGINX_VERSION=1.21.4
\ No newline at end of file