From 3ddce0c7dff2064dcb47e77253bfa093beb705de Mon Sep 17 00:00:00 2001 From: Odmin Date: Tue, 21 Sep 2021 21:40:53 +0300 Subject: [PATCH] nginx 1.21.3 --- CHANGELOG.md | 1 + linux/ecosystem/nginx/1.21.1/main/.env | 2 -- linux/ecosystem/nginx/1.21.1/php/.env | 2 -- linux/ecosystem/nginx/1.21.1/rtmp-hls/.env | 2 -- linux/ecosystem/nginx/1.21.3/main/.env | 2 ++ .../nginx/{1.21.1 => 1.21.3}/main/Dockerfile | 2 +- .../nginx/{1.21.1 => 1.21.3}/main/Makefile | 0 .../nginx/{1.21.1 => 1.21.3}/main/README.md | 0 .../{1.21.1 => 1.21.3}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../{1.21.1 => 1.21.3}/main/pre/ngninx.pre.tar.gz | Bin linux/ecosystem/nginx/1.21.3/php/.env | 2 ++ .../nginx/{1.21.1 => 1.21.3}/php/Dockerfile | 0 .../ecosystem/nginx/{1.21.1 => 1.21.3}/php/Makefile | 0 .../nginx/{1.21.1 => 1.21.3}/php/README.md | 0 .../nginx/{1.21.1 => 1.21.3}/php/docker-compose.yml | 0 linux/ecosystem/nginx/1.21.3/rtmp-hls/.env | 2 ++ .../nginx/{1.21.1 => 1.21.3}/rtmp-hls/Dockerfile | 0 .../nginx/{1.21.1 => 1.21.3}/rtmp-hls/Makefile | 0 .../nginx/{1.21.1 => 1.21.3}/rtmp-hls/README.md | 0 .../{1.21.1 => 1.21.3}/rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../{1.21.1 => 1.21.3}/rtmp-hls/docker-compose.yml | 0 .../{1.21.1 => 1.21.3}/rtmp-hls/players/dash.html | 0 .../{1.21.1 => 1.21.3}/rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../{1.21.1 => 1.21.3}/rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/ecosystem/nginx/latest/main/.env | 2 +- linux/ecosystem/nginx/latest/php/.env | 2 +- linux/ecosystem/nginx/latest/rtmp-hls/.env | 2 +- linux/ecosystem/nginx/links.txt | 2 +- 38 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 linux/ecosystem/nginx/1.21.1/main/.env delete mode 100644 linux/ecosystem/nginx/1.21.1/php/.env delete mode 100644 linux/ecosystem/nginx/1.21.1/rtmp-hls/.env create mode 100644 linux/ecosystem/nginx/1.21.3/main/.env rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/main/Dockerfile (99%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/main/README.md (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/main/pre/ngninx.pre.tar.gz (100%) create mode 100644 linux/ecosystem/nginx/1.21.3/php/.env rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/php/README.md (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/php/docker-compose.yml (100%) create mode 100644 linux/ecosystem/nginx/1.21.3/rtmp-hls/.env rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.21.1 => 1.21.3}/rtmp-hls/sources.list.d/sources.stretch.list (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c4e883cd..735ec6494 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * added `java 16` support to base images. * moved images to `advanced` and `ecosystem` folders. * migrated from `country code` to `httpredir` (more stable) official `debian` mirror. + * `nginx 1.21.3`. * `august` * splited `tc-agents` with `nodejs` * fixed `PostgreSQL` images diff --git a/linux/ecosystem/nginx/1.21.1/main/.env b/linux/ecosystem/nginx/1.21.1/main/.env deleted file mode 100644 index eab5d9214..000000000 --- a/linux/ecosystem/nginx/1.21.1/main/.env +++ /dev/null @@ -1,2 +0,0 @@ -NGINX_VERSION=1.21.1 -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz diff --git a/linux/ecosystem/nginx/1.21.1/php/.env b/linux/ecosystem/nginx/1.21.1/php/.env deleted file mode 100644 index eab5d9214..000000000 --- a/linux/ecosystem/nginx/1.21.1/php/.env +++ /dev/null @@ -1,2 +0,0 @@ -NGINX_VERSION=1.21.1 -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/.env b/linux/ecosystem/nginx/1.21.1/rtmp-hls/.env deleted file mode 100644 index eab5d9214..000000000 --- a/linux/ecosystem/nginx/1.21.1/rtmp-hls/.env +++ /dev/null @@ -1,2 +0,0 @@ -NGINX_VERSION=1.21.1 -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz diff --git a/linux/ecosystem/nginx/1.21.3/main/.env b/linux/ecosystem/nginx/1.21.3/main/.env new file mode 100644 index 000000000..f85e95b3d --- /dev/null +++ b/linux/ecosystem/nginx/1.21.3/main/.env @@ -0,0 +1,2 @@ +NGINX_VERSION=1.21.3 +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz diff --git a/linux/ecosystem/nginx/1.21.1/main/Dockerfile b/linux/ecosystem/nginx/1.21.3/main/Dockerfile similarity index 99% rename from linux/ecosystem/nginx/1.21.1/main/Dockerfile rename to linux/ecosystem/nginx/1.21.3/main/Dockerfile index aef90bcb1..7db814ccc 100644 --- a/linux/ecosystem/nginx/1.21.1/main/Dockerfile +++ b/linux/ecosystem/nginx/1.21.3/main/Dockerfile @@ -47,7 +47,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 /lib/x86_64-linux-gnu/libcrypto.so.1 && \ + ln -s /lib/x86_64-linux-gnu/libcrypto.so.1.1 /lib/x86_64-linux-gnu/libcrypto.so.1 && \ dpkg --force-all -i ${EXPORT_DIR}/*.deb ################################################################## diff --git a/linux/ecosystem/nginx/1.21.1/main/Makefile b/linux/ecosystem/nginx/1.21.3/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.1/main/Makefile rename to linux/ecosystem/nginx/1.21.3/main/Makefile diff --git a/linux/ecosystem/nginx/1.21.1/main/README.md b/linux/ecosystem/nginx/1.21.3/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.1/main/README.md rename to linux/ecosystem/nginx/1.21.3/main/README.md diff --git a/linux/ecosystem/nginx/1.21.1/main/docker-compose.yml b/linux/ecosystem/nginx/1.21.3/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.1/main/docker-compose.yml rename to linux/ecosystem/nginx/1.21.3/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21.1/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.21.3/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.1/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.21.3/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.21.1/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.21.3/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.1/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.21.3/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.21.1/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.21.3/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.1/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.21.3/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.21.1/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.21.3/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.21.1/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.21.3/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.21.3/php/.env b/linux/ecosystem/nginx/1.21.3/php/.env new file mode 100644 index 000000000..f85e95b3d --- /dev/null +++ b/linux/ecosystem/nginx/1.21.3/php/.env @@ -0,0 +1,2 @@ +NGINX_VERSION=1.21.3 +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz diff --git a/linux/ecosystem/nginx/1.21.1/php/Dockerfile b/linux/ecosystem/nginx/1.21.3/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.21.1/php/Dockerfile rename to linux/ecosystem/nginx/1.21.3/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.21.1/php/Makefile b/linux/ecosystem/nginx/1.21.3/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.1/php/Makefile rename to linux/ecosystem/nginx/1.21.3/php/Makefile diff --git a/linux/ecosystem/nginx/1.21.1/php/README.md b/linux/ecosystem/nginx/1.21.3/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.1/php/README.md rename to linux/ecosystem/nginx/1.21.3/php/README.md diff --git a/linux/ecosystem/nginx/1.21.1/php/docker-compose.yml b/linux/ecosystem/nginx/1.21.3/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.1/php/docker-compose.yml rename to linux/ecosystem/nginx/1.21.3/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/.env b/linux/ecosystem/nginx/1.21.3/rtmp-hls/.env new file mode 100644 index 000000000..f85e95b3d --- /dev/null +++ b/linux/ecosystem/nginx/1.21.3/rtmp-hls/.env @@ -0,0 +1,2 @@ +NGINX_VERSION=1.21.3 +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.21.3/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.21.3/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/README.md b/linux/ecosystem/nginx/1.21.3/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.21.3/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.21.1/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.21.1/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/latest/main/.env b/linux/ecosystem/nginx/latest/main/.env index a012fc251..00230635f 100644 --- a/linux/ecosystem/nginx/latest/main/.env +++ b/linux/ecosystem/nginx/latest/main/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz diff --git a/linux/ecosystem/nginx/latest/php/.env b/linux/ecosystem/nginx/latest/php/.env index a012fc251..00230635f 100644 --- a/linux/ecosystem/nginx/latest/php/.env +++ b/linux/ecosystem/nginx/latest/php/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz diff --git a/linux/ecosystem/nginx/latest/rtmp-hls/.env b/linux/ecosystem/nginx/latest/rtmp-hls/.env index a012fc251..00230635f 100644 --- a/linux/ecosystem/nginx/latest/rtmp-hls/.env +++ b/linux/ecosystem/nginx/latest/rtmp-hls/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.3.tar.gz diff --git a/linux/ecosystem/nginx/links.txt b/linux/ecosystem/nginx/links.txt index 3e5fd14e0..8a524e2ee 100644 --- a/linux/ecosystem/nginx/links.txt +++ b/linux/ecosystem/nginx/links.txt @@ -538,4 +538,4 @@ http://nginx.org/download/nginx-1.19.9.tar.gz http://nginx.org/download/nginx-1.19.10.tar.gz http://nginx.org/download/nginx-1.20.0.tar.gz http://nginx.org/download/nginx-1.20.1.tar.gz -http://nginx.org/download/nginx-1.21.0.tar.gz \ No newline at end of file +http://nginx.org/download/nginx-1.21.3.tar.gz \ No newline at end of file