From a57b1229f2cf129c8f9533906ca68b760617e893 Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 13 Jul 2021 14:01:54 +0300 Subject: [PATCH] edge+ migrated to bullseye --- linux/epicmorg/edge/main/sources.sid.list | 7 ------- linux/epicmorg/prod/main/Dockerfile | 2 +- linux/nginx/1.21.0/main/.env | 2 -- linux/nginx/1.21.0/php/.env | 2 -- linux/nginx/1.21.0/rtmp-hls/.env | 2 -- linux/nginx/1.21.1/main/.env | 2 ++ linux/nginx/{1.21.0 => 1.21.1}/main/Dockerfile | 0 linux/nginx/{1.21.0 => 1.21.1}/main/Makefile | 0 linux/nginx/{1.21.0 => 1.21.1}/main/README.md | 0 .../{1.21.0 => 1.21.1}/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.0 => 1.21.1}/main/pre/ngninx.pre.tar.gz | Bin linux/nginx/1.21.1/php/.env | 2 ++ linux/nginx/{1.21.0 => 1.21.1}/php/Dockerfile | 0 linux/nginx/{1.21.0 => 1.21.1}/php/Makefile | 0 linux/nginx/{1.21.0 => 1.21.1}/php/README.md | 0 .../nginx/{1.21.0 => 1.21.1}/php/docker-compose.yml | 0 linux/nginx/1.21.1/rtmp-hls/.env | 2 ++ linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/Dockerfile | 0 linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/Makefile | 0 linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/README.md | 0 .../{1.21.0 => 1.21.1}/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.0 => 1.21.1}/rtmp-hls/docker-compose.yml | 0 .../{1.21.0 => 1.21.1}/rtmp-hls/players/dash.html | 0 .../{1.21.0 => 1.21.1}/rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../{1.21.0 => 1.21.1}/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/nginx/latest/main/.env | 2 +- linux/nginx/latest/php/.env | 2 +- linux/nginx/latest/rtmp-hls/.env | 2 +- 38 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 linux/epicmorg/edge/main/sources.sid.list delete mode 100644 linux/nginx/1.21.0/main/.env delete mode 100644 linux/nginx/1.21.0/php/.env delete mode 100644 linux/nginx/1.21.0/rtmp-hls/.env create mode 100644 linux/nginx/1.21.1/main/.env rename linux/nginx/{1.21.0 => 1.21.1}/main/Dockerfile (100%) rename linux/nginx/{1.21.0 => 1.21.1}/main/Makefile (100%) rename linux/nginx/{1.21.0 => 1.21.1}/main/README.md (100%) rename linux/nginx/{1.21.0 => 1.21.1}/main/docker-compose.yml (100%) rename linux/nginx/{1.21.0 => 1.21.1}/main/pre/ip2location-description-pak (100%) rename linux/nginx/{1.21.0 => 1.21.1}/main/pre/luajit2-description-pak (100%) rename linux/nginx/{1.21.0 => 1.21.1}/main/pre/nginx-description-pak (100%) rename linux/nginx/{1.21.0 => 1.21.1}/main/pre/ngninx.pre.tar.gz (100%) create mode 100644 linux/nginx/1.21.1/php/.env rename linux/nginx/{1.21.0 => 1.21.1}/php/Dockerfile (100%) rename linux/nginx/{1.21.0 => 1.21.1}/php/Makefile (100%) rename linux/nginx/{1.21.0 => 1.21.1}/php/README.md (100%) rename linux/nginx/{1.21.0 => 1.21.1}/php/docker-compose.yml (100%) create mode 100644 linux/nginx/1.21.1/rtmp-hls/.env rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/Dockerfile (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/Makefile (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/README.md (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/conf/nginx.conf (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/docker-compose.yml (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/players/dash.html (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/players/hls.html (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/players/rtmp.html (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/nginx/{1.21.0 => 1.21.1}/rtmp-hls/sources.list.d/sources.stretch.list (100%) diff --git a/linux/epicmorg/edge/main/sources.sid.list b/linux/epicmorg/edge/main/sources.sid.list deleted file mode 100644 index d3d573cdc..000000000 --- a/linux/epicmorg/edge/main/sources.sid.list +++ /dev/null @@ -1,7 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free diff --git a/linux/epicmorg/prod/main/Dockerfile b/linux/epicmorg/prod/main/Dockerfile index 60b650f00..db8e4b4a1 100644 --- a/linux/epicmorg/prod/main/Dockerfile +++ b/linux/epicmorg/prod/main/Dockerfile @@ -15,7 +15,7 @@ RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done ################################################################## # perforce client binary ################################################################## -ARG P4_VERSION=r20.1 +ARG P4_VERSION=r21.1 ARG P4_DOWNLOAD_URL=http://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 ################################################################## diff --git a/linux/nginx/1.21.0/main/.env b/linux/nginx/1.21.0/main/.env deleted file mode 100644 index fec228d1d..000000000 --- a/linux/nginx/1.21.0/main/.env +++ /dev/null @@ -1,2 +0,0 @@ -NGINX_VERSION=1.21.0 -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.0.tar.gz diff --git a/linux/nginx/1.21.0/php/.env b/linux/nginx/1.21.0/php/.env deleted file mode 100644 index fec228d1d..000000000 --- a/linux/nginx/1.21.0/php/.env +++ /dev/null @@ -1,2 +0,0 @@ -NGINX_VERSION=1.21.0 -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.0.tar.gz diff --git a/linux/nginx/1.21.0/rtmp-hls/.env b/linux/nginx/1.21.0/rtmp-hls/.env deleted file mode 100644 index fec228d1d..000000000 --- a/linux/nginx/1.21.0/rtmp-hls/.env +++ /dev/null @@ -1,2 +0,0 @@ -NGINX_VERSION=1.21.0 -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.0.tar.gz diff --git a/linux/nginx/1.21.1/main/.env b/linux/nginx/1.21.1/main/.env new file mode 100644 index 000000000..eab5d9214 --- /dev/null +++ b/linux/nginx/1.21.1/main/.env @@ -0,0 +1,2 @@ +NGINX_VERSION=1.21.1 +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz diff --git a/linux/nginx/1.21.0/main/Dockerfile b/linux/nginx/1.21.1/main/Dockerfile similarity index 100% rename from linux/nginx/1.21.0/main/Dockerfile rename to linux/nginx/1.21.1/main/Dockerfile diff --git a/linux/nginx/1.21.0/main/Makefile b/linux/nginx/1.21.1/main/Makefile similarity index 100% rename from linux/nginx/1.21.0/main/Makefile rename to linux/nginx/1.21.1/main/Makefile diff --git a/linux/nginx/1.21.0/main/README.md b/linux/nginx/1.21.1/main/README.md similarity index 100% rename from linux/nginx/1.21.0/main/README.md rename to linux/nginx/1.21.1/main/README.md diff --git a/linux/nginx/1.21.0/main/docker-compose.yml b/linux/nginx/1.21.1/main/docker-compose.yml similarity index 100% rename from linux/nginx/1.21.0/main/docker-compose.yml rename to linux/nginx/1.21.1/main/docker-compose.yml diff --git a/linux/nginx/1.21.0/main/pre/ip2location-description-pak b/linux/nginx/1.21.1/main/pre/ip2location-description-pak similarity index 100% rename from linux/nginx/1.21.0/main/pre/ip2location-description-pak rename to linux/nginx/1.21.1/main/pre/ip2location-description-pak diff --git a/linux/nginx/1.21.0/main/pre/luajit2-description-pak b/linux/nginx/1.21.1/main/pre/luajit2-description-pak similarity index 100% rename from linux/nginx/1.21.0/main/pre/luajit2-description-pak rename to linux/nginx/1.21.1/main/pre/luajit2-description-pak diff --git a/linux/nginx/1.21.0/main/pre/nginx-description-pak b/linux/nginx/1.21.1/main/pre/nginx-description-pak similarity index 100% rename from linux/nginx/1.21.0/main/pre/nginx-description-pak rename to linux/nginx/1.21.1/main/pre/nginx-description-pak diff --git a/linux/nginx/1.21.0/main/pre/ngninx.pre.tar.gz b/linux/nginx/1.21.1/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/nginx/1.21.0/main/pre/ngninx.pre.tar.gz rename to linux/nginx/1.21.1/main/pre/ngninx.pre.tar.gz diff --git a/linux/nginx/1.21.1/php/.env b/linux/nginx/1.21.1/php/.env new file mode 100644 index 000000000..eab5d9214 --- /dev/null +++ b/linux/nginx/1.21.1/php/.env @@ -0,0 +1,2 @@ +NGINX_VERSION=1.21.1 +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz diff --git a/linux/nginx/1.21.0/php/Dockerfile b/linux/nginx/1.21.1/php/Dockerfile similarity index 100% rename from linux/nginx/1.21.0/php/Dockerfile rename to linux/nginx/1.21.1/php/Dockerfile diff --git a/linux/nginx/1.21.0/php/Makefile b/linux/nginx/1.21.1/php/Makefile similarity index 100% rename from linux/nginx/1.21.0/php/Makefile rename to linux/nginx/1.21.1/php/Makefile diff --git a/linux/nginx/1.21.0/php/README.md b/linux/nginx/1.21.1/php/README.md similarity index 100% rename from linux/nginx/1.21.0/php/README.md rename to linux/nginx/1.21.1/php/README.md diff --git a/linux/nginx/1.21.0/php/docker-compose.yml b/linux/nginx/1.21.1/php/docker-compose.yml similarity index 100% rename from linux/nginx/1.21.0/php/docker-compose.yml rename to linux/nginx/1.21.1/php/docker-compose.yml diff --git a/linux/nginx/1.21.1/rtmp-hls/.env b/linux/nginx/1.21.1/rtmp-hls/.env new file mode 100644 index 000000000..eab5d9214 --- /dev/null +++ b/linux/nginx/1.21.1/rtmp-hls/.env @@ -0,0 +1,2 @@ +NGINX_VERSION=1.21.1 +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz diff --git a/linux/nginx/1.21.0/rtmp-hls/Dockerfile b/linux/nginx/1.21.1/rtmp-hls/Dockerfile similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/Dockerfile rename to linux/nginx/1.21.1/rtmp-hls/Dockerfile diff --git a/linux/nginx/1.21.0/rtmp-hls/Makefile b/linux/nginx/1.21.1/rtmp-hls/Makefile similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/Makefile rename to linux/nginx/1.21.1/rtmp-hls/Makefile diff --git a/linux/nginx/1.21.0/rtmp-hls/README.md b/linux/nginx/1.21.1/rtmp-hls/README.md similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/README.md rename to linux/nginx/1.21.1/rtmp-hls/README.md diff --git a/linux/nginx/1.21.0/rtmp-hls/conf/nginx.conf b/linux/nginx/1.21.1/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/conf/nginx.conf rename to linux/nginx/1.21.1/rtmp-hls/conf/nginx.conf diff --git a/linux/nginx/1.21.0/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/nginx/1.21.1/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/nginx/1.21.1/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/nginx/1.21.0/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/nginx/1.21.1/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/nginx/1.21.1/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.1/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/docker-compose.yml rename to linux/nginx/1.21.1/rtmp-hls/docker-compose.yml diff --git a/linux/nginx/1.21.0/rtmp-hls/players/dash.html b/linux/nginx/1.21.1/rtmp-hls/players/dash.html similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/players/dash.html rename to linux/nginx/1.21.1/rtmp-hls/players/dash.html diff --git a/linux/nginx/1.21.0/rtmp-hls/players/hls.html b/linux/nginx/1.21.1/rtmp-hls/players/hls.html similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/players/hls.html rename to linux/nginx/1.21.1/rtmp-hls/players/hls.html diff --git a/linux/nginx/1.21.0/rtmp-hls/players/hls_hlsjs.html b/linux/nginx/1.21.1/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/players/hls_hlsjs.html rename to linux/nginx/1.21.1/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/nginx/1.21.0/rtmp-hls/players/rtmp.html b/linux/nginx/1.21.1/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/players/rtmp.html rename to linux/nginx/1.21.1/rtmp-hls/players/rtmp.html diff --git a/linux/nginx/1.21.0/rtmp-hls/players/rtmp_hls.html b/linux/nginx/1.21.1/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/players/rtmp_hls.html rename to linux/nginx/1.21.1/rtmp-hls/players/rtmp_hls.html diff --git a/linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.buster.list b/linux/nginx/1.21.1/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.buster.list rename to linux/nginx/1.21.1/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.sid.list b/linux/nginx/1.21.1/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.sid.list rename to linux/nginx/1.21.1/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.stretch.list b/linux/nginx/1.21.1/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/nginx/1.21.0/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/nginx/1.21.1/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/nginx/latest/main/.env b/linux/nginx/latest/main/.env index 87426d11a..a012fc251 100644 --- a/linux/nginx/latest/main/.env +++ b/linux/nginx/latest/main/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.0.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz diff --git a/linux/nginx/latest/php/.env b/linux/nginx/latest/php/.env index 87426d11a..a012fc251 100644 --- a/linux/nginx/latest/php/.env +++ b/linux/nginx/latest/php/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.0.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz diff --git a/linux/nginx/latest/rtmp-hls/.env b/linux/nginx/latest/rtmp-hls/.env index 87426d11a..a012fc251 100644 --- a/linux/nginx/latest/rtmp-hls/.env +++ b/linux/nginx/latest/rtmp-hls/.env @@ -1,2 +1,2 @@ NGINX_VERSION=latest -NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.0.tar.gz +NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-1.21.1.tar.gz