diff --git a/linux/nginx/1.21.0/main/.env b/linux/nginx/1.21.0/main/.env new file mode 100644 index 000000000..7576029f8 --- /dev/null +++ b/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 diff --git a/linux/nginx/main/Dockerfile b/linux/nginx/1.21.0/main/Dockerfile similarity index 97% rename from linux/nginx/main/Dockerfile rename to linux/nginx/1.21.0/main/Dockerfile index a4132ddcb..86ee20947 100644 --- a/linux/nginx/main/Dockerfile +++ b/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 && \ diff --git a/linux/nginx/1.21.0/main/Makefile b/linux/nginx/1.21.0/main/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/nginx/1.21.0/main/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/nginx/main/README.md b/linux/nginx/1.21.0/main/README.md similarity index 100% rename from linux/nginx/main/README.md rename to linux/nginx/1.21.0/main/README.md diff --git a/linux/nginx/1.21.0/main/docker-compose.yml b/linux/nginx/1.21.0/main/docker-compose.yml new file mode 100644 index 000000000..4d5d761fb --- /dev/null +++ b/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} \ No newline at end of file diff --git a/linux/nginx/main/pre/ip2location-description-pak b/linux/nginx/1.21.0/main/pre/ip2location-description-pak similarity index 100% rename from linux/nginx/main/pre/ip2location-description-pak rename to linux/nginx/1.21.0/main/pre/ip2location-description-pak diff --git a/linux/nginx/main/pre/luajit2-description-pak b/linux/nginx/1.21.0/main/pre/luajit2-description-pak similarity index 100% rename from linux/nginx/main/pre/luajit2-description-pak rename to linux/nginx/1.21.0/main/pre/luajit2-description-pak diff --git a/linux/nginx/main/pre/nginx-description-pak b/linux/nginx/1.21.0/main/pre/nginx-description-pak similarity index 100% rename from linux/nginx/main/pre/nginx-description-pak rename to linux/nginx/1.21.0/main/pre/nginx-description-pak diff --git a/linux/nginx/main/pre/ngninx.pre.tar.gz b/linux/nginx/1.21.0/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/nginx/main/pre/ngninx.pre.tar.gz rename to linux/nginx/1.21.0/main/pre/ngninx.pre.tar.gz diff --git a/linux/nginx/1.21.0/php/.env b/linux/nginx/1.21.0/php/.env new file mode 100644 index 000000000..7576029f8 --- /dev/null +++ b/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 diff --git a/linux/nginx/php/Dockerfile b/linux/nginx/1.21.0/php/Dockerfile similarity index 99% rename from linux/nginx/php/Dockerfile rename to linux/nginx/1.21.0/php/Dockerfile index 5b270dd89..e26506627 100644 --- a/linux/nginx/php/Dockerfile +++ b/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 diff --git a/linux/nginx/1.21.0/php/Makefile b/linux/nginx/1.21.0/php/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/nginx/1.21.0/php/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/nginx/php/README.md b/linux/nginx/1.21.0/php/README.md similarity index 100% rename from linux/nginx/php/README.md rename to linux/nginx/1.21.0/php/README.md diff --git a/linux/nginx/1.21.0/php/docker-compose.yml b/linux/nginx/1.21.0/php/docker-compose.yml new file mode 100644 index 000000000..0968ca6c1 --- /dev/null +++ b/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} \ No newline at end of file diff --git a/linux/nginx/1.21.0/rtmp-hls/.env b/linux/nginx/1.21.0/rtmp-hls/.env new file mode 100644 index 000000000..7576029f8 --- /dev/null +++ b/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 diff --git a/linux/nginx/rtmp-hls/Dockerfile b/linux/nginx/1.21.0/rtmp-hls/Dockerfile similarity index 99% rename from linux/nginx/rtmp-hls/Dockerfile rename to linux/nginx/1.21.0/rtmp-hls/Dockerfile index e986263e2..e20d6fe35 100644 --- a/linux/nginx/rtmp-hls/Dockerfile +++ b/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 diff --git a/linux/nginx/1.21.0/rtmp-hls/Makefile b/linux/nginx/1.21.0/rtmp-hls/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/nginx/1.21.0/rtmp-hls/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/nginx/rtmp-hls/README.md b/linux/nginx/1.21.0/rtmp-hls/README.md similarity index 100% rename from linux/nginx/rtmp-hls/README.md rename to linux/nginx/1.21.0/rtmp-hls/README.md diff --git a/linux/nginx/rtmp-hls/conf/nginx.conf b/linux/nginx/1.21.0/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/nginx/rtmp-hls/conf/nginx.conf rename to linux/nginx/1.21.0/rtmp-hls/conf/nginx.conf diff --git a/linux/nginx/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/nginx/1.21.0/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/nginx/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/nginx/1.21.0/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/nginx/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/nginx/1.21.0/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/nginx/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/nginx/1.21.0/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/nginx/1.21.0/rtmp-hls/docker-compose.yml b/linux/nginx/1.21.0/rtmp-hls/docker-compose.yml new file mode 100644 index 000000000..3c46aedbd --- /dev/null +++ b/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} \ No newline at end of file diff --git a/linux/nginx/rtmp-hls/players/dash.html b/linux/nginx/1.21.0/rtmp-hls/players/dash.html similarity index 100% rename from linux/nginx/rtmp-hls/players/dash.html rename to linux/nginx/1.21.0/rtmp-hls/players/dash.html diff --git a/linux/nginx/rtmp-hls/players/hls.html b/linux/nginx/1.21.0/rtmp-hls/players/hls.html similarity index 100% rename from linux/nginx/rtmp-hls/players/hls.html rename to linux/nginx/1.21.0/rtmp-hls/players/hls.html diff --git a/linux/nginx/rtmp-hls/players/hls_hlsjs.html b/linux/nginx/1.21.0/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/nginx/rtmp-hls/players/hls_hlsjs.html rename to linux/nginx/1.21.0/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/nginx/rtmp-hls/players/rtmp.html b/linux/nginx/1.21.0/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/nginx/rtmp-hls/players/rtmp.html rename to linux/nginx/1.21.0/rtmp-hls/players/rtmp.html diff --git a/linux/nginx/rtmp-hls/players/rtmp_hls.html b/linux/nginx/1.21.0/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/nginx/rtmp-hls/players/rtmp_hls.html rename to linux/nginx/1.21.0/rtmp-hls/players/rtmp_hls.html diff --git a/linux/nginx/rtmp-hls/sources.list.d/sources.buster.list b/linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/nginx/rtmp-hls/sources.list.d/sources.buster.list rename to linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/nginx/rtmp-hls/sources.list.d/sources.sid.list b/linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/nginx/rtmp-hls/sources.list.d/sources.sid.list rename to linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/nginx/rtmp-hls/sources.list.d/sources.stretch.list b/linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/nginx/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/nginx/main/Makefile b/linux/nginx/main/Makefile deleted file mode 100644 index f2a6e0a32..000000000 --- a/linux/nginx/main/Makefile +++ /dev/null @@ -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 diff --git a/linux/nginx/php/Makefile b/linux/nginx/php/Makefile deleted file mode 100644 index ebf972813..000000000 --- a/linux/nginx/php/Makefile +++ /dev/null @@ -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 diff --git a/linux/nginx/rtmp-hls/Makefile b/linux/nginx/rtmp-hls/Makefile deleted file mode 100644 index 6a0ebdef8..000000000 --- a/linux/nginx/rtmp-hls/Makefile +++ /dev/null @@ -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