nginx - new format

linux/nginx/1.21.0/main/.env

@@ -0,0 +1,2 @@
+NGINX_VERSION=1.21.0
+NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz

linux/nginx/1.21.0/main/Dockerfile

@@ -11,8 +11,8 @@ ARG SRC_DIR=${BUILDS_DIR}/src
 ARG EXPORT_DIR=${BUILDS_DIR}/export
 ARG PRE_DIR=${BUILDS_DIR}/pre
 ARG NGINX_SRC_DIR=${SRC_DIR}/nginx
-ARG NGINX_VERSION=1.20.0
-ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
+ARG NGINX_VERSION
+ARG NGINX_DOWNLOAD_URL
 ARG LUAJIT_INC=/usr/local/include/luajit-2.1
 ARG LUAJIT_LIB=/usr/local/lib
 
@@ -39,6 +39,7 @@ RUN cd ${SRC_DIR} && \
     ln -s /usr/local/lib/libIP2Location.so /lib/libIP2Location.so && \
     ln -s /usr/local/lib/libIP2Location.so.1 /lib/libIP2Location.so.1 && \
     ln -s /usr/local/lib/libIP2Location.so.2 /lib/libIP2Location.so.2 && \
+	ln -s /lib/x86_64-linux-gnu/libcrypto.so.1.1 ln -s /lib/x86_64-linux-gnu/libcrypto.so.1 && \
     dpkg --force-all -i ${EXPORT_DIR}/*.deb
 
 ##################################################################
@@ -148,7 +149,7 @@ RUN cd ${NGINX_SRC_DIR} && \
     --add-dynamic-module=http-geoip2 \
     --add-dynamic-module=spnego-http-auth-nginx-module \
     --add-dynamic-module=http-auth-ldap \
-    --add-dynamic-module=nginx-audio-track-for-hls-module \
+#    --add-dynamic-module=nginx-audio-track-for-hls-module \
     --add-dynamic-module=ip2location-nginx \
     --add-dynamic-module=nginx-vod-module \
 #    --add-dynamic-module=nginx-module-vts \
@@ -207,6 +208,7 @@ RUN apt-get update && \
     ln -s /usr/local/lib/libIP2Location.so.3 /lib/libIP2Location.so.3 && \
     ln -s /usr/local/lib/libIP2Location.so.4 /lib/libIP2Location.so.4 && \
     ln -s /usr/local/lib/libIP2Location.so.5 /lib/libIP2Location.so.5 && \
+	ln -s /lib/x86_64-linux-gnu/libcrypto.so.1.1 ln -s /lib/x86_64-linux-gnu/libcrypto.so.1 && \
     ln -sf /dev/stdout /var/log/nginx/access.log && \
     ln -sf /dev/stderr /var/log/nginx/error.log && \
     ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \

linux/nginx/1.21.0/main/Makefile

@@ -0,0 +1,5 @@
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push

linux/nginx/1.21.0/main/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/nginx:${NGINX_VERSION}"
+    build:
+      context: .
+      args:
+        NGINX_VERSION: ${NGINX_VERSION}
+        NGINX_DOWNLOAD_URL: ${NGINX_DOWNLOAD_URL}

linux/nginx/1.21.0/php/.env

@@ -0,0 +1,2 @@
+NGINX_VERSION=1.21.0
+NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz

linux/nginx/1.21.0/php/Dockerfile

@@ -83,7 +83,7 @@ RUN pecl install smbclient && \
 ##################################################################
 
 
-FROM epicmorg/nginx:latest
+FROM epicmorg/nginx:${NGINX_VERSION}
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 

linux/nginx/1.21.0/php/Makefile

@@ -0,0 +1,5 @@
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push

linux/nginx/1.21.0/php/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/nginx:${NGINX_VERSION}-php"
+    build:
+      context: .
+      args:
+        NGINX_VERSION: ${NGINX_VERSION}
+        NGINX_DOWNLOAD_URL: ${NGINX_DOWNLOAD_URL}

linux/nginx/1.21.0/rtmp-hls/.env

@@ -0,0 +1,2 @@
+NGINX_VERSION=1.21.0
+NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz

linux/nginx/1.21.0/rtmp-hls/Dockerfile

@@ -1,4 +1,4 @@
-FROM epicmorg/nginx
+FROM epicmorg/nginx:${NGINX_VERSION}
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 

linux/nginx/1.21.0/rtmp-hls/Makefile

@@ -0,0 +1,5 @@
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push

linux/nginx/1.21.0/rtmp-hls/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/nginx:${NGINX_VERSION}-rtmp-hls"
+    build:
+      context: .
+      args:
+        NGINX_VERSION: ${NGINX_VERSION}
+        NGINX_DOWNLOAD_URL: ${NGINX_DOWNLOAD_URL}

linux/nginx/main/Makefile

@@ -1,8 +0,0 @@
-all: nginx
-
-nginx:
-	docker build --compress -t epicmorg/nginx:latest .
-	docker push epicmorg/nginx:latest
-
-	docker tag epicmorg/nginx:latest epicmorg/balancer:latest
-	docker push epicmorg/balancer:latest

linux/nginx/php/Makefile

@@ -1,8 +0,0 @@
-all: nginx
-
-nginx:
-	docker build --compress -t epicmorg/nginx:php .
-	docker push epicmorg/nginx:php
-
-	docker tag epicmorg/nginx:php epicmorg/balancer:php
-	docker push epicmorg/balancer:php

linux/nginx/rtmp-hls/Makefile

@@ -1,8 +0,0 @@
-all: nginx
-
-nginx:
-	docker build --compress -t epicmorg/nginx:rtmp-hls .
-	docker push epicmorg/nginx:rtmp-hls
-
-	docker tag epicmorg/nginx:rtmp-hls epicmorg/balancer:rtmp-hls
-	docker push epicmorg/balancer:rtmp-hls