Corrected variabe substiutions

This commit is contained in:
Nikolas S
2021-12-31 04:13:19 +02:00
parent 493692e08c
commit 1eb546572b
4 changed files with 9 additions and 9 deletions

View File

@@ -17,8 +17,8 @@ jobs:
chmod +x tune-worker-processes.sh chmod +x tune-worker-processes.sh
chmod +x env.sh chmod +x env.sh
source env.sh source env.sh
sudo docker build . -t $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine --no-cache sudo docker build . -t $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine --no-cache
docker push $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine docker push $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine
test: test:
executor: machine-executor executor: machine-executor
working_directory: ~/nginx-build working_directory: ~/nginx-build
@@ -27,8 +27,8 @@ jobs:
- run: | - run: |
chmod +x env.sh chmod +x env.sh
source env.sh source env.sh
docker pull $DOCKER_HUB_ID/nginx:"${NGINX_VERSION}"-rtmp-geoip2-alpine docker pull $DOCKER_HUB_ID/nginx:$NGX_VERSION-rtmp-geoip2-alpine
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
workflows: workflows:
build_and_test: build_and_test:

View File

@@ -10,11 +10,11 @@ before_install:
- chmod +x tune-worker-processes.sh - chmod +x tune-worker-processes.sh
- chmod +x env.sh - chmod +x env.sh
- source 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: 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: after_success:
- echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_ID" --password-stdin - 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

View File

@@ -30,7 +30,7 @@ RUN ldconfig || :
# Nginx installation # Nginx installation
ENV NGINX_VERSION ${NGINX_VERSION} ENV NGINX_VERSION 1.21.5
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& CONFIG="\ && CONFIG="\
--prefix=/etc/nginx \ --prefix=/etc/nginx \

2
env.sh Normal file → Executable file
View File

@@ -1 +1 @@
export NGINX_VERSION=1.21.5 export NGX_VERSION=1.21.5