From 2380ccb1259cc18e9b49a8da287df5a261646e3a Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 28 Apr 2025 18:16:21 +0300 Subject: [PATCH 01/12] nginx optimizations --- .../nginx/{1.14.2 => 1.14}/main/.env | 0 .../nginx/{1.14.2 => 1.14}/main/Dockerfile | 0 .../nginx/{1.14.2 => 1.14}/main/Makefile | 0 .../nginx/{1.14.2 => 1.14}/main/README.md | 0 .../{1.14.2 => 1.14}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../main/pre/ngninx.pre.tar.gz | Bin .../ecosystem/nginx/{1.14.2 => 1.14}/php/.env | 0 .../nginx/{1.14.2 => 1.14}/php/Dockerfile | 0 .../nginx/{1.14.2 => 1.14}/php/Makefile | 0 .../nginx/{1.14.2 => 1.14}/php/README.md | 0 .../{1.14.2 => 1.14}/php/docker-compose.yml | 0 .../nginx/{1.14.2 => 1.14}/rtmp-hls/.env | 0 .../{1.14.2 => 1.14}/rtmp-hls/Dockerfile | 0 .../nginx/{1.14.2 => 1.14}/rtmp-hls/Makefile | 0 .../nginx/{1.14.2 => 1.14}/rtmp-hls/README.md | 0 .../{1.14.2 => 1.14}/rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../rtmp-hls/docker-compose.yml | 0 .../rtmp-hls/players/dash.html | 0 .../rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 .../nginx/{1.15.12 => 1.15}/main/.env | 0 .../nginx/{1.15.12 => 1.15}/main/Dockerfile | 0 .../nginx/{1.15.12 => 1.15}/main/Makefile | 0 .../nginx/{1.15.12 => 1.15}/main/README.md | 0 .../{1.15.12 => 1.15}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../main/pre/ngninx.pre.tar.gz | Bin .../nginx/{1.15.12 => 1.15}/php/.env | 0 .../nginx/{1.15.12 => 1.15}/php/Dockerfile | 0 .../nginx/{1.15.12 => 1.15}/php/Makefile | 0 .../nginx/{1.15.12 => 1.15}/php/README.md | 0 .../{1.15.12 => 1.15}/php/docker-compose.yml | 0 .../nginx/{1.15.12 => 1.15}/rtmp-hls/.env | 0 .../{1.15.12 => 1.15}/rtmp-hls/Dockerfile | 0 .../nginx/{1.15.12 => 1.15}/rtmp-hls/Makefile | 0 .../{1.15.12 => 1.15}/rtmp-hls/README.md | 0 .../rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../rtmp-hls/docker-compose.yml | 0 .../rtmp-hls/players/dash.html | 0 .../rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 .../nginx/{1.16.1 => 1.16}/main/.env | 0 .../nginx/{1.16.1 => 1.16}/main/Dockerfile | 0 .../nginx/{1.16.1 => 1.16}/main/Makefile | 0 .../nginx/{1.16.1 => 1.16}/main/README.md | 0 .../{1.16.1 => 1.16}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../main/pre/ngninx.pre.tar.gz | Bin .../ecosystem/nginx/{1.16.1 => 1.16}/php/.env | 0 .../nginx/{1.16.1 => 1.16}/php/Dockerfile | 0 .../nginx/{1.16.1 => 1.16}/php/Makefile | 0 .../nginx/{1.16.1 => 1.16}/php/README.md | 0 .../{1.16.1 => 1.16}/php/docker-compose.yml | 0 .../nginx/{1.16.1 => 1.16}/rtmp-hls/.env | 0 .../{1.16.1 => 1.16}/rtmp-hls/Dockerfile | 0 .../nginx/{1.16.1 => 1.16}/rtmp-hls/Makefile | 0 .../nginx/{1.16.1 => 1.16}/rtmp-hls/README.md | 0 .../{1.16.1 => 1.16}/rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../rtmp-hls/docker-compose.yml | 0 .../rtmp-hls/players/dash.html | 0 .../rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 .../nginx/{1.17.10 => 1.17}/main/.env | 0 .../nginx/{1.17.10 => 1.17}/main/Dockerfile | 0 .../nginx/{1.17.10 => 1.17}/main/Makefile | 0 .../nginx/{1.17.10 => 1.17}/main/README.md | 0 .../{1.17.10 => 1.17}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../main/pre/ngninx.pre.tar.gz | Bin .../nginx/{1.17.10 => 1.17}/php/.env | 0 .../nginx/{1.17.10 => 1.17}/php/Dockerfile | 0 .../nginx/{1.17.10 => 1.17}/php/Makefile | 0 .../nginx/{1.17.10 => 1.17}/php/README.md | 0 .../{1.17.10 => 1.17}/php/docker-compose.yml | 0 .../nginx/{1.17.10 => 1.17}/rtmp-hls/.env | 0 .../{1.17.10 => 1.17}/rtmp-hls/Dockerfile | 0 .../nginx/{1.17.10 => 1.17}/rtmp-hls/Makefile | 0 .../{1.17.10 => 1.17}/rtmp-hls/README.md | 0 .../rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../rtmp-hls/docker-compose.yml | 0 .../rtmp-hls/players/dash.html | 0 .../rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 .../nginx/{1.18.0 => 1.18}/main/.env | 0 .../nginx/{1.18.0 => 1.18}/main/Dockerfile | 0 .../nginx/{1.18.0 => 1.18}/main/Makefile | 0 .../nginx/{1.18.0 => 1.18}/main/README.md | 0 .../{1.18.0 => 1.18}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../main/pre/ngninx.pre.tar.gz | Bin .../ecosystem/nginx/{1.18.0 => 1.18}/php/.env | 0 .../nginx/{1.18.0 => 1.18}/php/Dockerfile | 0 .../nginx/{1.18.0 => 1.18}/php/Makefile | 0 .../nginx/{1.18.0 => 1.18}/php/README.md | 0 .../{1.18.0 => 1.18}/php/docker-compose.yml | 0 .../nginx/{1.18.0 => 1.18}/rtmp-hls/.env | 0 .../{1.18.0 => 1.18}/rtmp-hls/Dockerfile | 0 .../nginx/{1.18.0 => 1.18}/rtmp-hls/Makefile | 0 .../nginx/{1.18.0 => 1.18}/rtmp-hls/README.md | 0 .../{1.18.0 => 1.18}/rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../rtmp-hls/docker-compose.yml | 0 .../rtmp-hls/players/dash.html | 0 .../rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 .../nginx/{1.19.10 => 1.19}/main/.env | 0 .../nginx/{1.19.10 => 1.19}/main/Dockerfile | 0 .../nginx/{1.19.10 => 1.19}/main/Makefile | 0 .../nginx/{1.19.10 => 1.19}/main/README.md | 0 .../{1.19.10 => 1.19}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../main/pre/ngninx.pre.tar.gz | Bin .../nginx/{1.19.10 => 1.19}/php/.env | 0 .../nginx/{1.19.10 => 1.19}/php/Dockerfile | 0 .../nginx/{1.19.10 => 1.19}/php/Makefile | 0 .../nginx/{1.19.10 => 1.19}/php/README.md | 0 .../{1.19.10 => 1.19}/php/docker-compose.yml | 0 .../nginx/{1.19.10 => 1.19}/rtmp-hls/.env | 0 .../{1.19.10 => 1.19}/rtmp-hls/Dockerfile | 0 .../nginx/{1.19.10 => 1.19}/rtmp-hls/Makefile | 0 .../{1.19.10 => 1.19}/rtmp-hls/README.md | 0 .../rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../rtmp-hls/docker-compose.yml | 0 .../rtmp-hls/players/dash.html | 0 .../rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 .../nginx/{1.20.1 => 1.20}/main/.env | 0 .../nginx/{1.20.1 => 1.20}/main/Dockerfile | 0 .../nginx/{1.20.1 => 1.20}/main/Makefile | 0 .../nginx/{1.20.1 => 1.20}/main/README.md | 0 .../{1.20.1 => 1.20}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../main/pre/ngninx.pre.tar.gz | Bin .../ecosystem/nginx/{1.20.1 => 1.20}/php/.env | 0 .../nginx/{1.20.1 => 1.20}/php/Dockerfile | 0 .../nginx/{1.20.1 => 1.20}/php/Makefile | 0 .../nginx/{1.20.1 => 1.20}/php/README.md | 0 .../{1.20.1 => 1.20}/php/docker-compose.yml | 0 .../nginx/{1.20.1 => 1.20}/rtmp-hls/.env | 0 .../{1.20.1 => 1.20}/rtmp-hls/Dockerfile | 0 .../nginx/{1.20.1 => 1.20}/rtmp-hls/Makefile | 0 .../nginx/{1.20.1 => 1.20}/rtmp-hls/README.md | 0 .../{1.20.1 => 1.20}/rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../rtmp-hls/docker-compose.yml | 0 .../rtmp-hls/players/dash.html | 0 .../rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 linux/ecosystem/nginx/1.21.3/main/.env | 2 - linux/ecosystem/nginx/1.21.3/php/.env | 2 - linux/ecosystem/nginx/1.21.3/rtmp-hls/.env | 2 - linux/ecosystem/nginx/1.21.6/main/Dockerfile | 244 ----------- linux/ecosystem/nginx/1.21.6/php/Dockerfile | 257 ----------- .../nginx/1.21.6/rtmp-hls/Dockerfile | 127 ------ .../nginx/{1.21.6 => 1.21}/main/.env | 0 .../nginx/{1.21.3 => 1.21}/main/Dockerfile | 0 .../nginx/{1.21.3 => 1.21}/main/Makefile | 0 .../nginx/{1.21.3 => 1.21}/main/README.md | 0 .../{1.21.3 => 1.21}/main/docker-compose.yml | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../main/pre/nginx-description-pak | 0 .../main/pre/ngninx.pre.tar.gz | Bin .../ecosystem/nginx/{1.21.6 => 1.21}/php/.env | 0 .../nginx/{1.21.3 => 1.21}/php/Dockerfile | 0 .../nginx/{1.21.3 => 1.21}/php/Makefile | 0 .../nginx/{1.21.3 => 1.21}/php/README.md | 0 .../{1.21.3 => 1.21}/php/docker-compose.yml | 0 .../nginx/{1.21.6 => 1.21}/rtmp-hls/.env | 0 .../{1.21.3 => 1.21}/rtmp-hls/Dockerfile | 0 .../nginx/{1.21.3 => 1.21}/rtmp-hls/Makefile | 0 .../nginx/{1.21.3 => 1.21}/rtmp-hls/README.md | 0 .../{1.21.3 => 1.21}/rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../rtmp-hls/docker-compose.yml | 0 .../rtmp-hls/players/dash.html | 0 .../rtmp-hls/players/hls.html | 0 .../rtmp-hls/players/hls_hlsjs.html | 0 .../rtmp-hls/players/rtmp.html | 0 .../rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 .../nginx/{1.28.0 => 1.26}/main/Dockerfile | 84 ++-- .../nginx/{1.21.6 => 1.26}/main/Makefile | 0 .../nginx/{1.21.6 => 1.26}/main/README.md | 0 .../{1.27.0 => 1.26}/main/docker-compose.yml | 2 +- .../main/docker-entrypoint.sh | 0 .../{1.27.0 => 1.26}/main/etc/default/nginx | 0 .../{1.27.0 => 1.26}/main/etc/init.d/nginx | 0 .../main/etc/logrotate.d/nginx | 0 .../nginx/modules-avalible/additional.conf | 0 .../etc/nginx/modules-avalible/default.conf | 0 .../main/etc/nginx/nginx.conf | 0 .../etc/nginx/sites-available/default.conf | 0 .../main/etc/nginx/snippets/fastcgi-php.conf | 0 .../main/etc/nginx/snippets/proxy_params.conf | 0 .../main/etc/nginx/snippets/snakeoil.conf | 0 .../main/etc/ufw/applications.d/nginx | 0 .../nginx/{1.27.0 => 1.27}/main/Dockerfile | 144 +++---- .../nginx/{1.21.6/php => 1.27/main}/Makefile | 0 .../nginx/{1.21.6/php => 1.27/main}/README.md | 0 .../{1.28.0 => 1.27}/main/docker-compose.yml | 2 +- .../main/docker-entrypoint.sh | 0 .../{1.28.0 => 1.27}/main/etc/default/nginx | 0 .../{1.28.0 => 1.27}/main/etc/init.d/nginx | 0 .../main/etc/logrotate.d/nginx | 0 .../nginx/modules-avalible/additional.conf | 0 .../etc/nginx/modules-avalible/default.conf | 0 .../main/etc/nginx/nginx.conf | 0 .../etc/nginx/sites-available/default.conf | 0 .../main/etc/nginx/snippets/fastcgi-php.conf | 0 .../main/etc/nginx/snippets/proxy_params.conf | 0 .../main/etc/nginx/snippets/snakeoil.conf | 0 .../main/etc/ufw/applications.d/nginx | 0 linux/ecosystem/nginx/1.28/main/Dockerfile | 398 ++++++++++++++++++ .../{1.21.6/rtmp-hls => 1.28/main}/Makefile | 0 .../nginx/{1.27.0 => 1.28}/main/README.md | 0 .../nginx/1.28/main/docker-compose.yml | 9 + .../main/docker-entrypoint.sh | 0 .../nginx-pre => 1.28/main}/etc/default/nginx | 0 .../nginx-pre => 1.28/main}/etc/init.d/nginx | 0 .../main}/etc/logrotate.d/nginx | 0 .../nginx/modules-avalible/additional.conf | 3 + .../etc/nginx/modules-avalible/default.conf | 3 + .../nginx/1.28/main/etc/nginx/nginx.conf | 95 +++++ .../etc/nginx/sites-available/default.conf} | 0 .../main}/etc/nginx/snippets/fastcgi-php.conf | 0 .../etc/nginx/snippets/proxy_params.conf} | 0 .../main}/etc/nginx/snippets/snakeoil.conf | 0 .../main}/etc/ufw/applications.d/nginx | 0 .../nginx/latest/quic/main/docker-compose.yml | 8 - .../quic/main/pre/ip2location-description-pak | 1 - .../quic/main/pre/luajit2-description-pak | 1 - .../quic/main/pre/nginx-description-pak | 1 - .../latest/quic/main/pre/ngninx.pre.tar.gz | Bin 9573 -> 0 bytes .../ecosystem/nginx/latest/quic/php/Makefile | 44 -- .../ecosystem/nginx/latest/quic/php/README.md | 29 -- .../nginx/latest/quic/php/docker-compose.yml | 8 - .../nginx/latest/quic/rtmp-hls/Makefile | 44 -- .../nginx/latest/quic/rtmp-hls/README.md | 78 ---- .../latest/quic/rtmp-hls/conf/nginx.conf | 134 ------ .../quic/rtmp-hls/conf/nginx_no-ffmpeg.conf | 118 ------ .../conf/nginx_rtmp_minimal_no-stats.conf | 16 - .../latest/quic/rtmp-hls/docker-compose.yml | 8 - .../latest/quic/rtmp-hls/players/dash.html | 23 - .../latest/quic/rtmp-hls/players/hls.html | 23 - .../quic/rtmp-hls/players/hls_hlsjs.html | 41 -- .../latest/quic/rtmp-hls/players/rtmp.html | 24 -- .../quic/rtmp-hls/players/rtmp_hls.html | 30 -- .../sources.list.d/sources.buster.list | 19 - .../rtmp-hls/sources.list.d/sources.sid.list | 19 - .../sources.list.d/sources.stretch.list | 19 - .../nginx/latest/mainline/main/.env | 0 .../nginx/latest/mainline/main/Dockerfile | 0 .../nginx/latest/mainline}/main/Makefile | 0 .../nginx/latest/mainline}/main/README.md | 0 .../latest/mainline/main/docker-compose.yml | 0 .../mainline/main}/docker-entrypoint.sh | 0 .../main/pre/ip2location-description-pak | 0 .../main/pre/luajit2-description-pak | 0 .../mainline}/main/pre/nginx-description-pak | 0 .../main/pre/nginx-pre/etc/default/nginx | 10 + .../main/pre/nginx-pre/etc/init.d/nginx | 196 +++++++++ .../main/pre/nginx-pre/etc/logrotate.d/nginx | 18 + .../main/pre/nginx-pre/etc/nginx/fastcgi.conf | 0 .../pre/nginx-pre/etc/nginx/fastcgi_params | 0 .../main/pre/nginx-pre/etc/nginx/koi-utf | 0 .../main/pre/nginx-pre/etc/nginx/koi-win | 0 .../main/pre/nginx-pre/etc/nginx/mime.types | 0 .../main/pre/nginx-pre/etc/nginx/nginx.conf | 0 .../main/pre/nginx-pre/etc/nginx/proxy_params | 4 + .../main/pre/nginx-pre/etc/nginx/scgi_params | 0 .../etc/nginx/sites-available/default | 91 ++++ .../etc/nginx/snippets/fastcgi-php.conf | 13 + .../etc/nginx/snippets/snakeoil.conf | 5 + .../main/pre/nginx-pre/etc/nginx/uwsgi_params | 0 .../main/pre/nginx-pre/etc/nginx/win-utf | 0 .../nginx-pre/etc/ufw/applications.d/nginx | 14 + .../lib.masked/systemd/system/nginx.service | 0 .../mainline}/main/pre/ngninx.pre.tar.gz | Bin .../nginx/latest/mainline/php/.env | 0 .../nginx/latest/mainline/php/Dockerfile | 0 .../nginx/latest/mainline/php}/Makefile | 0 .../nginx/latest/mainline/php}/README.md | 0 .../addons/multiarch-support_2.28_amd64.deb | Bin .../latest/mainline}/php/docker-compose.yml | 0 .../latest/mainline/php}/docker-entrypoint.sh | 0 .../php/usr/lib/php/20190902/cassandra.so | Bin .../20190902/phpBolt-extension-1.0.4-php74.so | Bin .../php/usr/lib/php/20210902/cassandra.so | Bin .../20210902/phpBolt-extension-1.0.4-php81.so | Bin .../nginx/latest/mainline/rtmp-hls/.env | 0 .../nginx/latest/mainline/rtmp-hls/Dockerfile | 0 .../nginx/latest/mainline/rtmp-hls}/Makefile | 0 .../nginx/latest/mainline}/rtmp-hls/README.md | 0 .../latest/mainline}/rtmp-hls/conf/nginx.conf | 0 .../rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../mainline}/rtmp-hls/docker-compose.yml | 0 .../mainline/rtmp-hls}/docker-entrypoint.sh | 0 .../mainline}/rtmp-hls/players/dash.html | 0 .../mainline}/rtmp-hls/players/hls.html | 0 .../mainline}/rtmp-hls/players/hls_hlsjs.html | 0 .../mainline}/rtmp-hls/players/rtmp.html | 0 .../mainline}/rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 .../nginx/latest/quic/main/.env | 0 .../nginx/latest/quic/main/Dockerfile | 0 .../nginx/latest/quic/main/Dockerfile.test | 0 .../nginx/latest/quic/main}/Makefile | 0 .../nginx/latest/quic/main/README.md | 0 .../latest/quic}/main/docker-compose.yml | 0 .../latest/quic/main}/docker-entrypoint.sh | 0 .../main/pre/ip2location-description-pak | 0 .../quic}/main/pre/luajit2-description-pak | 0 .../quic}/main/pre/nginx-description-pak | 0 .../latest/quic}/main/pre/ngninx.pre.tar.gz | Bin .../nginx/latest/quic/php/.env | 0 .../nginx/latest/quic/php/Dockerfile | 0 .../nginx/latest/quic/php}/Makefile | 0 .../nginx/latest/quic}/php/README.md | 0 .../nginx/latest/quic}/php/docker-compose.yml | 0 .../latest/quic/php}/docker-entrypoint.sh | 0 .../nginx/latest/quic/rtmp-hls/.env | 0 .../nginx/latest/quic/rtmp-hls/Dockerfile | 0 .../nginx/latest/quic/rtmp-hls}/Makefile | 0 .../nginx/latest/quic}/rtmp-hls/README.md | 0 .../latest/quic}/rtmp-hls/conf/nginx.conf | 0 .../quic}/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../conf/nginx_rtmp_minimal_no-stats.conf | 0 .../latest/quic}/rtmp-hls/docker-compose.yml | 0 .../latest/quic/rtmp-hls/docker-entrypoint.sh | 16 + .../latest/quic}/rtmp-hls/players/dash.html | 0 .../latest/quic}/rtmp-hls/players/hls.html | 0 .../quic}/rtmp-hls/players/hls_hlsjs.html | 0 .../latest/quic}/rtmp-hls/players/rtmp.html | 0 .../quic}/rtmp-hls/players/rtmp_hls.html | 0 .../sources.list.d/sources.buster.list | 0 .../rtmp-hls/sources.list.d/sources.sid.list | 0 .../sources.list.d/sources.stretch.list | 0 linux/{ecosystem => obsolete}/nginx/links.txt | 0 407 files changed, 965 insertions(+), 1464 deletions(-) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/.env (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/Dockerfile (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/README.md (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/main/pre/ngninx.pre.tar.gz (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/php/.env (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/php/README.md (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/php/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/.env (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.14.2 => 1.14}/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/.env (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/Dockerfile (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/README.md (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/main/pre/ngninx.pre.tar.gz (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/php/.env (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/php/README.md (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/php/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/.env (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.15.12 => 1.15}/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/.env (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/Dockerfile (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/README.md (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/main/pre/ngninx.pre.tar.gz (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/php/.env (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/php/README.md (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/php/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/.env (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.16.1 => 1.16}/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/.env (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/Dockerfile (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/README.md (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/main/pre/ngninx.pre.tar.gz (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/php/.env (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/php/README.md (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/php/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/.env (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.17.10 => 1.17}/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/.env (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/Dockerfile (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/README.md (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/main/pre/ngninx.pre.tar.gz (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/php/.env (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/php/README.md (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/php/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/.env (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.18.0 => 1.18}/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/.env (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/Dockerfile (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/README.md (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/main/pre/ngninx.pre.tar.gz (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/php/.env (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/php/README.md (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/php/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/.env (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.19.10 => 1.19}/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/.env (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/Dockerfile (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/README.md (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/main/pre/ngninx.pre.tar.gz (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/php/.env (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/php/README.md (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/php/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/.env (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.20.1 => 1.20}/rtmp-hls/sources.list.d/sources.stretch.list (100%) delete mode 100644 linux/ecosystem/nginx/1.21.3/main/.env delete mode 100644 linux/ecosystem/nginx/1.21.3/php/.env delete mode 100644 linux/ecosystem/nginx/1.21.3/rtmp-hls/.env delete mode 100644 linux/ecosystem/nginx/1.21.6/main/Dockerfile delete mode 100644 linux/ecosystem/nginx/1.21.6/php/Dockerfile delete mode 100644 linux/ecosystem/nginx/1.21.6/rtmp-hls/Dockerfile rename linux/ecosystem/nginx/{1.21.6 => 1.21}/main/.env (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/main/Dockerfile (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/main/README.md (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/main/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/main/pre/ip2location-description-pak (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/main/pre/luajit2-description-pak (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/main/pre/nginx-description-pak (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/main/pre/ngninx.pre.tar.gz (100%) rename linux/ecosystem/nginx/{1.21.6 => 1.21}/php/.env (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/php/Dockerfile (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/php/Makefile (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/php/README.md (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/php/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.21.6 => 1.21}/rtmp-hls/.env (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/Dockerfile (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/Makefile (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/README.md (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/conf/nginx.conf (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/docker-compose.yml (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/players/dash.html (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/players/hls.html (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/players/rtmp.html (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/ecosystem/nginx/{1.21.3 => 1.21}/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.26}/main/Dockerfile (80%) rename linux/ecosystem/nginx/{1.21.6 => 1.26}/main/Makefile (100%) rename linux/ecosystem/nginx/{1.21.6 => 1.26}/main/README.md (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/docker-compose.yml (51%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/default/nginx (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/init.d/nginx (100%) mode change 100755 => 100644 rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/logrotate.d/nginx (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/nginx/modules-avalible/additional.conf (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/nginx/modules-avalible/default.conf (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/nginx/nginx.conf (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/nginx/sites-available/default.conf (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/nginx/snippets/fastcgi-php.conf (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/nginx/snippets/proxy_params.conf (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/nginx/snippets/snakeoil.conf (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.26}/main/etc/ufw/applications.d/nginx (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.27}/main/Dockerfile (75%) rename linux/ecosystem/nginx/{1.21.6/php => 1.27/main}/Makefile (100%) rename linux/ecosystem/nginx/{1.21.6/php => 1.27/main}/README.md (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/docker-compose.yml (51%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/docker-entrypoint.sh (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/default/nginx (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/init.d/nginx (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/logrotate.d/nginx (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/nginx/modules-avalible/additional.conf (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/nginx/modules-avalible/default.conf (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/nginx/nginx.conf (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/nginx/sites-available/default.conf (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/nginx/snippets/fastcgi-php.conf (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/nginx/snippets/proxy_params.conf (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/nginx/snippets/snakeoil.conf (100%) rename linux/ecosystem/nginx/{1.28.0 => 1.27}/main/etc/ufw/applications.d/nginx (100%) create mode 100644 linux/ecosystem/nginx/1.28/main/Dockerfile rename linux/ecosystem/nginx/{1.21.6/rtmp-hls => 1.28/main}/Makefile (100%) rename linux/ecosystem/nginx/{1.27.0 => 1.28}/main/README.md (100%) create mode 100644 linux/ecosystem/nginx/1.28/main/docker-compose.yml rename linux/ecosystem/nginx/{latest/mainline => 1.28}/main/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename linux/ecosystem/nginx/{latest/mainline/main/pre/nginx-pre => 1.28/main}/etc/default/nginx (100%) rename linux/ecosystem/nginx/{latest/mainline/main/pre/nginx-pre => 1.28/main}/etc/init.d/nginx (100%) mode change 100755 => 100644 rename linux/ecosystem/nginx/{latest/mainline/main/pre/nginx-pre => 1.28/main}/etc/logrotate.d/nginx (100%) create mode 100644 linux/ecosystem/nginx/1.28/main/etc/nginx/modules-avalible/additional.conf create mode 100644 linux/ecosystem/nginx/1.28/main/etc/nginx/modules-avalible/default.conf create mode 100644 linux/ecosystem/nginx/1.28/main/etc/nginx/nginx.conf rename linux/ecosystem/nginx/{latest/mainline/main/pre/nginx-pre/etc/nginx/sites-available/default => 1.28/main/etc/nginx/sites-available/default.conf} (100%) rename linux/ecosystem/nginx/{latest/mainline/main/pre/nginx-pre => 1.28/main}/etc/nginx/snippets/fastcgi-php.conf (100%) rename linux/ecosystem/nginx/{latest/mainline/main/pre/nginx-pre/etc/nginx/proxy_params => 1.28/main/etc/nginx/snippets/proxy_params.conf} (100%) rename linux/ecosystem/nginx/{latest/mainline/main/pre/nginx-pre => 1.28/main}/etc/nginx/snippets/snakeoil.conf (100%) rename linux/ecosystem/nginx/{latest/mainline/main/pre/nginx-pre => 1.28/main}/etc/ufw/applications.d/nginx (100%) delete mode 100644 linux/ecosystem/nginx/latest/quic/main/docker-compose.yml delete mode 100644 linux/ecosystem/nginx/latest/quic/main/pre/ip2location-description-pak delete mode 100644 linux/ecosystem/nginx/latest/quic/main/pre/luajit2-description-pak delete mode 100644 linux/ecosystem/nginx/latest/quic/main/pre/nginx-description-pak delete mode 100644 linux/ecosystem/nginx/latest/quic/main/pre/ngninx.pre.tar.gz delete mode 100644 linux/ecosystem/nginx/latest/quic/php/Makefile delete mode 100644 linux/ecosystem/nginx/latest/quic/php/README.md delete mode 100644 linux/ecosystem/nginx/latest/quic/php/docker-compose.yml delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/Makefile delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/README.md delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx.conf delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx_no-ffmpeg.conf delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/docker-compose.yml delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/players/dash.html delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/players/hls.html delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/players/hls_hlsjs.html delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/players/rtmp.html delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/players/rtmp_hls.html delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.buster.list delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.sid.list delete mode 100644 linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.stretch.list rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/Dockerfile (100%) rename linux/{ecosystem/nginx/1.27.0 => obsolete/nginx/latest/mainline}/main/Makefile (100%) rename linux/{ecosystem/nginx/1.28.0 => obsolete/nginx/latest/mainline}/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/docker-compose.yml (100%) rename linux/{ecosystem/nginx/latest/mainline/php => obsolete/nginx/latest/mainline/main}/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/main/pre/nginx-description-pak (100%) create mode 100644 linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/default/nginx create mode 100644 linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/init.d/nginx create mode 100644 linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/logrotate.d/nginx rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi.conf (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi_params (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-utf (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-win (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/mime.types (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/nginx.conf (100%) create mode 100644 linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/proxy_params rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/scgi_params (100%) create mode 100644 linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/sites-available/default create mode 100644 linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/fastcgi-php.conf create mode 100644 linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/snakeoil.conf rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/uwsgi_params (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/win-utf (100%) create mode 100644 linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/ufw/applications.d/nginx rename linux/{ecosystem => obsolete}/nginx/latest/mainline/main/pre/nginx-pre/lib.masked/systemd/system/nginx.service (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/php/Dockerfile (100%) rename linux/{ecosystem/nginx/1.28.0/main => obsolete/nginx/latest/mainline/php}/Makefile (100%) rename linux/{ecosystem/nginx/latest/mainline/main => obsolete/nginx/latest/mainline/php}/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/php/addons/multiarch-support_2.28_amd64.deb (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/php/docker-compose.yml (100%) rename linux/{ecosystem/nginx/latest/mainline/rtmp-hls => obsolete/nginx/latest/mainline/php}/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename linux/{ecosystem => obsolete}/nginx/latest/mainline/php/usr/lib/php/20190902/cassandra.so (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/php/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/php/usr/lib/php/20210902/cassandra.so (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/php/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem/nginx/latest/mainline/main => obsolete/nginx/latest/mainline/rtmp-hls}/Makefile (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/README.md (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem/nginx/latest/quic/main => obsolete/nginx/latest/mainline/rtmp-hls}/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/mainline}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/latest/quic/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/latest/quic/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/latest/quic/main/Dockerfile.test (100%) rename linux/{ecosystem/nginx/latest/mainline/php => obsolete/nginx/latest/quic/main}/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/latest/quic/main/README.md (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/quic}/main/docker-compose.yml (100%) rename linux/{ecosystem/nginx/latest/quic/php => obsolete/nginx/latest/quic/main}/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/main/pre/nginx-description-pak (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/latest/quic/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/latest/quic/php/Dockerfile (100%) rename linux/{ecosystem/nginx/latest/mainline/rtmp-hls => obsolete/nginx/latest/quic/php}/Makefile (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/php/README.md (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/php/docker-compose.yml (100%) rename linux/{ecosystem/nginx/latest/quic/rtmp-hls => obsolete/nginx/latest/quic/php}/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename linux/{ecosystem => obsolete}/nginx/latest/quic/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/latest/quic/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem/nginx/latest/quic/main => obsolete/nginx/latest/quic/rtmp-hls}/Makefile (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/README.md (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/docker-compose.yml (100%) create mode 100644 linux/obsolete/nginx/latest/quic/rtmp-hls/docker-entrypoint.sh rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem/nginx/latest/mainline => obsolete/nginx/latest/quic}/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem/nginx/1.21.6 => obsolete/nginx/latest/quic}/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/links.txt (100%) diff --git a/linux/ecosystem/nginx/1.14.2/main/.env b/linux/ecosystem/nginx/1.14/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/.env rename to linux/ecosystem/nginx/1.14/main/.env diff --git a/linux/ecosystem/nginx/1.14.2/main/Dockerfile b/linux/ecosystem/nginx/1.14/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/Dockerfile rename to linux/ecosystem/nginx/1.14/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.14.2/main/Makefile b/linux/ecosystem/nginx/1.14/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/Makefile rename to linux/ecosystem/nginx/1.14/main/Makefile diff --git a/linux/ecosystem/nginx/1.14.2/main/README.md b/linux/ecosystem/nginx/1.14/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/README.md rename to linux/ecosystem/nginx/1.14/main/README.md diff --git a/linux/ecosystem/nginx/1.14.2/main/docker-compose.yml b/linux/ecosystem/nginx/1.14/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/docker-compose.yml rename to linux/ecosystem/nginx/1.14/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.14.2/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.14/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.14/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.14.2/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.14/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.14/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.14.2/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.14/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.14/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.14.2/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.14/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.14.2/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.14/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.14.2/php/.env b/linux/ecosystem/nginx/1.14/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.14.2/php/.env rename to linux/ecosystem/nginx/1.14/php/.env diff --git a/linux/ecosystem/nginx/1.14.2/php/Dockerfile b/linux/ecosystem/nginx/1.14/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.14.2/php/Dockerfile rename to linux/ecosystem/nginx/1.14/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.14.2/php/Makefile b/linux/ecosystem/nginx/1.14/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.14.2/php/Makefile rename to linux/ecosystem/nginx/1.14/php/Makefile diff --git a/linux/ecosystem/nginx/1.14.2/php/README.md b/linux/ecosystem/nginx/1.14/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.14.2/php/README.md rename to linux/ecosystem/nginx/1.14/php/README.md diff --git a/linux/ecosystem/nginx/1.14.2/php/docker-compose.yml b/linux/ecosystem/nginx/1.14/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.14.2/php/docker-compose.yml rename to linux/ecosystem/nginx/1.14/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/.env b/linux/ecosystem/nginx/1.14/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/.env rename to linux/ecosystem/nginx/1.14/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.14/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.14/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.14/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.14/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/README.md b/linux/ecosystem/nginx/1.14/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.14/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.14/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.14/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.14.2/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.14.2/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.15.12/main/.env b/linux/ecosystem/nginx/1.15/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/.env rename to linux/ecosystem/nginx/1.15/main/.env diff --git a/linux/ecosystem/nginx/1.15.12/main/Dockerfile b/linux/ecosystem/nginx/1.15/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/Dockerfile rename to linux/ecosystem/nginx/1.15/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.15.12/main/Makefile b/linux/ecosystem/nginx/1.15/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/Makefile rename to linux/ecosystem/nginx/1.15/main/Makefile diff --git a/linux/ecosystem/nginx/1.15.12/main/README.md b/linux/ecosystem/nginx/1.15/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/README.md rename to linux/ecosystem/nginx/1.15/main/README.md diff --git a/linux/ecosystem/nginx/1.15.12/main/docker-compose.yml b/linux/ecosystem/nginx/1.15/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/docker-compose.yml rename to linux/ecosystem/nginx/1.15/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.15.12/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.15/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.15/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.15.12/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.15/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.15/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.15.12/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.15/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.15/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.15.12/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.15/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.15.12/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.15/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.15.12/php/.env b/linux/ecosystem/nginx/1.15/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.15.12/php/.env rename to linux/ecosystem/nginx/1.15/php/.env diff --git a/linux/ecosystem/nginx/1.15.12/php/Dockerfile b/linux/ecosystem/nginx/1.15/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.15.12/php/Dockerfile rename to linux/ecosystem/nginx/1.15/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.15.12/php/Makefile b/linux/ecosystem/nginx/1.15/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.15.12/php/Makefile rename to linux/ecosystem/nginx/1.15/php/Makefile diff --git a/linux/ecosystem/nginx/1.15.12/php/README.md b/linux/ecosystem/nginx/1.15/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.15.12/php/README.md rename to linux/ecosystem/nginx/1.15/php/README.md diff --git a/linux/ecosystem/nginx/1.15.12/php/docker-compose.yml b/linux/ecosystem/nginx/1.15/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.15.12/php/docker-compose.yml rename to linux/ecosystem/nginx/1.15/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/.env b/linux/ecosystem/nginx/1.15/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/.env rename to linux/ecosystem/nginx/1.15/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.15/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.15/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.15/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.15/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/README.md b/linux/ecosystem/nginx/1.15/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.15/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.15/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.15/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.15.12/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.15.12/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.16.1/main/.env b/linux/ecosystem/nginx/1.16/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/.env rename to linux/ecosystem/nginx/1.16/main/.env diff --git a/linux/ecosystem/nginx/1.16.1/main/Dockerfile b/linux/ecosystem/nginx/1.16/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/Dockerfile rename to linux/ecosystem/nginx/1.16/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.16.1/main/Makefile b/linux/ecosystem/nginx/1.16/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/Makefile rename to linux/ecosystem/nginx/1.16/main/Makefile diff --git a/linux/ecosystem/nginx/1.16.1/main/README.md b/linux/ecosystem/nginx/1.16/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/README.md rename to linux/ecosystem/nginx/1.16/main/README.md diff --git a/linux/ecosystem/nginx/1.16.1/main/docker-compose.yml b/linux/ecosystem/nginx/1.16/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/docker-compose.yml rename to linux/ecosystem/nginx/1.16/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.16.1/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.16/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.16/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.16.1/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.16/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.16/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.16.1/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.16/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.16/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.16.1/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.16/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.16.1/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.16/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.16.1/php/.env b/linux/ecosystem/nginx/1.16/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.16.1/php/.env rename to linux/ecosystem/nginx/1.16/php/.env diff --git a/linux/ecosystem/nginx/1.16.1/php/Dockerfile b/linux/ecosystem/nginx/1.16/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.16.1/php/Dockerfile rename to linux/ecosystem/nginx/1.16/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.16.1/php/Makefile b/linux/ecosystem/nginx/1.16/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.16.1/php/Makefile rename to linux/ecosystem/nginx/1.16/php/Makefile diff --git a/linux/ecosystem/nginx/1.16.1/php/README.md b/linux/ecosystem/nginx/1.16/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.16.1/php/README.md rename to linux/ecosystem/nginx/1.16/php/README.md diff --git a/linux/ecosystem/nginx/1.16.1/php/docker-compose.yml b/linux/ecosystem/nginx/1.16/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.16.1/php/docker-compose.yml rename to linux/ecosystem/nginx/1.16/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/.env b/linux/ecosystem/nginx/1.16/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/.env rename to linux/ecosystem/nginx/1.16/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.16/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.16/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.16/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.16/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/README.md b/linux/ecosystem/nginx/1.16/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.16/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.16/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.16/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.16.1/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.16.1/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.17.10/main/.env b/linux/ecosystem/nginx/1.17/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/.env rename to linux/ecosystem/nginx/1.17/main/.env diff --git a/linux/ecosystem/nginx/1.17.10/main/Dockerfile b/linux/ecosystem/nginx/1.17/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/Dockerfile rename to linux/ecosystem/nginx/1.17/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.17.10/main/Makefile b/linux/ecosystem/nginx/1.17/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/Makefile rename to linux/ecosystem/nginx/1.17/main/Makefile diff --git a/linux/ecosystem/nginx/1.17.10/main/README.md b/linux/ecosystem/nginx/1.17/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/README.md rename to linux/ecosystem/nginx/1.17/main/README.md diff --git a/linux/ecosystem/nginx/1.17.10/main/docker-compose.yml b/linux/ecosystem/nginx/1.17/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/docker-compose.yml rename to linux/ecosystem/nginx/1.17/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.17.10/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.17/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.17/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.17.10/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.17/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.17/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.17.10/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.17/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.17/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.17.10/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.17/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.17.10/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.17/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.17.10/php/.env b/linux/ecosystem/nginx/1.17/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.17.10/php/.env rename to linux/ecosystem/nginx/1.17/php/.env diff --git a/linux/ecosystem/nginx/1.17.10/php/Dockerfile b/linux/ecosystem/nginx/1.17/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.17.10/php/Dockerfile rename to linux/ecosystem/nginx/1.17/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.17.10/php/Makefile b/linux/ecosystem/nginx/1.17/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.17.10/php/Makefile rename to linux/ecosystem/nginx/1.17/php/Makefile diff --git a/linux/ecosystem/nginx/1.17.10/php/README.md b/linux/ecosystem/nginx/1.17/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.17.10/php/README.md rename to linux/ecosystem/nginx/1.17/php/README.md diff --git a/linux/ecosystem/nginx/1.17.10/php/docker-compose.yml b/linux/ecosystem/nginx/1.17/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.17.10/php/docker-compose.yml rename to linux/ecosystem/nginx/1.17/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/.env b/linux/ecosystem/nginx/1.17/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/.env rename to linux/ecosystem/nginx/1.17/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.17/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.17/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.17/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.17/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/README.md b/linux/ecosystem/nginx/1.17/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.17/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.17/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.17/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.17.10/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.17.10/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.18.0/main/.env b/linux/ecosystem/nginx/1.18/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/.env rename to linux/ecosystem/nginx/1.18/main/.env diff --git a/linux/ecosystem/nginx/1.18.0/main/Dockerfile b/linux/ecosystem/nginx/1.18/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/Dockerfile rename to linux/ecosystem/nginx/1.18/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.18.0/main/Makefile b/linux/ecosystem/nginx/1.18/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/Makefile rename to linux/ecosystem/nginx/1.18/main/Makefile diff --git a/linux/ecosystem/nginx/1.18.0/main/README.md b/linux/ecosystem/nginx/1.18/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/README.md rename to linux/ecosystem/nginx/1.18/main/README.md diff --git a/linux/ecosystem/nginx/1.18.0/main/docker-compose.yml b/linux/ecosystem/nginx/1.18/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/docker-compose.yml rename to linux/ecosystem/nginx/1.18/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.18.0/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.18/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.18/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.18.0/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.18/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.18/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.18.0/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.18/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.18/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.18.0/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.18/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.18.0/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.18/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.18.0/php/.env b/linux/ecosystem/nginx/1.18/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.18.0/php/.env rename to linux/ecosystem/nginx/1.18/php/.env diff --git a/linux/ecosystem/nginx/1.18.0/php/Dockerfile b/linux/ecosystem/nginx/1.18/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.18.0/php/Dockerfile rename to linux/ecosystem/nginx/1.18/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.18.0/php/Makefile b/linux/ecosystem/nginx/1.18/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.18.0/php/Makefile rename to linux/ecosystem/nginx/1.18/php/Makefile diff --git a/linux/ecosystem/nginx/1.18.0/php/README.md b/linux/ecosystem/nginx/1.18/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.18.0/php/README.md rename to linux/ecosystem/nginx/1.18/php/README.md diff --git a/linux/ecosystem/nginx/1.18.0/php/docker-compose.yml b/linux/ecosystem/nginx/1.18/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.18.0/php/docker-compose.yml rename to linux/ecosystem/nginx/1.18/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/.env b/linux/ecosystem/nginx/1.18/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/.env rename to linux/ecosystem/nginx/1.18/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.18/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.18/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.18/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.18/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/README.md b/linux/ecosystem/nginx/1.18/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.18/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.18/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.18/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.18.0/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.18.0/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.19.10/main/.env b/linux/ecosystem/nginx/1.19/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/.env rename to linux/ecosystem/nginx/1.19/main/.env diff --git a/linux/ecosystem/nginx/1.19.10/main/Dockerfile b/linux/ecosystem/nginx/1.19/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/Dockerfile rename to linux/ecosystem/nginx/1.19/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.19.10/main/Makefile b/linux/ecosystem/nginx/1.19/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/Makefile rename to linux/ecosystem/nginx/1.19/main/Makefile diff --git a/linux/ecosystem/nginx/1.19.10/main/README.md b/linux/ecosystem/nginx/1.19/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/README.md rename to linux/ecosystem/nginx/1.19/main/README.md diff --git a/linux/ecosystem/nginx/1.19.10/main/docker-compose.yml b/linux/ecosystem/nginx/1.19/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/docker-compose.yml rename to linux/ecosystem/nginx/1.19/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.19.10/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.19/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.19/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.19.10/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.19/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.19/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.19.10/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.19/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.19/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.19.10/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.19/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.19.10/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.19/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.19.10/php/.env b/linux/ecosystem/nginx/1.19/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.19.10/php/.env rename to linux/ecosystem/nginx/1.19/php/.env diff --git a/linux/ecosystem/nginx/1.19.10/php/Dockerfile b/linux/ecosystem/nginx/1.19/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.19.10/php/Dockerfile rename to linux/ecosystem/nginx/1.19/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.19.10/php/Makefile b/linux/ecosystem/nginx/1.19/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.19.10/php/Makefile rename to linux/ecosystem/nginx/1.19/php/Makefile diff --git a/linux/ecosystem/nginx/1.19.10/php/README.md b/linux/ecosystem/nginx/1.19/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.19.10/php/README.md rename to linux/ecosystem/nginx/1.19/php/README.md diff --git a/linux/ecosystem/nginx/1.19.10/php/docker-compose.yml b/linux/ecosystem/nginx/1.19/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.19.10/php/docker-compose.yml rename to linux/ecosystem/nginx/1.19/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/.env b/linux/ecosystem/nginx/1.19/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/.env rename to linux/ecosystem/nginx/1.19/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.19/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.19/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.19/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.19/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/README.md b/linux/ecosystem/nginx/1.19/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.19/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.19/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.19/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.19.10/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.19.10/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.20.1/main/.env b/linux/ecosystem/nginx/1.20/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/.env rename to linux/ecosystem/nginx/1.20/main/.env diff --git a/linux/ecosystem/nginx/1.20.1/main/Dockerfile b/linux/ecosystem/nginx/1.20/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/Dockerfile rename to linux/ecosystem/nginx/1.20/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.20.1/main/Makefile b/linux/ecosystem/nginx/1.20/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/Makefile rename to linux/ecosystem/nginx/1.20/main/Makefile diff --git a/linux/ecosystem/nginx/1.20.1/main/README.md b/linux/ecosystem/nginx/1.20/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/README.md rename to linux/ecosystem/nginx/1.20/main/README.md diff --git a/linux/ecosystem/nginx/1.20.1/main/docker-compose.yml b/linux/ecosystem/nginx/1.20/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/docker-compose.yml rename to linux/ecosystem/nginx/1.20/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.20.1/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.20/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.20/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.20.1/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.20/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.20/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.20.1/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.20/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.20/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.20.1/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.20/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.20.1/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.20/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.20.1/php/.env b/linux/ecosystem/nginx/1.20/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.20.1/php/.env rename to linux/ecosystem/nginx/1.20/php/.env diff --git a/linux/ecosystem/nginx/1.20.1/php/Dockerfile b/linux/ecosystem/nginx/1.20/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.20.1/php/Dockerfile rename to linux/ecosystem/nginx/1.20/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.20.1/php/Makefile b/linux/ecosystem/nginx/1.20/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.20.1/php/Makefile rename to linux/ecosystem/nginx/1.20/php/Makefile diff --git a/linux/ecosystem/nginx/1.20.1/php/README.md b/linux/ecosystem/nginx/1.20/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.20.1/php/README.md rename to linux/ecosystem/nginx/1.20/php/README.md diff --git a/linux/ecosystem/nginx/1.20.1/php/docker-compose.yml b/linux/ecosystem/nginx/1.20/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.20.1/php/docker-compose.yml rename to linux/ecosystem/nginx/1.20/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/.env b/linux/ecosystem/nginx/1.20/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/.env rename to linux/ecosystem/nginx/1.20/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.20/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.20/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.20/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.20/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/README.md b/linux/ecosystem/nginx/1.20/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.20/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.20/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.20/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.20.1/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.20.1/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.21.3/main/.env b/linux/ecosystem/nginx/1.21.3/main/.env deleted file mode 100644 index f85e95b3d..000000000 --- a/linux/ecosystem/nginx/1.21.3/main/.env +++ /dev/null @@ -1,2 +0,0 @@ -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.3/php/.env b/linux/ecosystem/nginx/1.21.3/php/.env deleted file mode 100644 index f85e95b3d..000000000 --- a/linux/ecosystem/nginx/1.21.3/php/.env +++ /dev/null @@ -1,2 +0,0 @@ -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.3/rtmp-hls/.env b/linux/ecosystem/nginx/1.21.3/rtmp-hls/.env deleted file mode 100644 index f85e95b3d..000000000 --- a/linux/ecosystem/nginx/1.21.3/rtmp-hls/.env +++ /dev/null @@ -1,2 +0,0 @@ -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.6/main/Dockerfile b/linux/ecosystem/nginx/1.21.6/main/Dockerfile deleted file mode 100644 index 1f2eb165e..000000000 --- a/linux/ecosystem/nginx/1.21.6/main/Dockerfile +++ /dev/null @@ -1,244 +0,0 @@ -################################################################## -# Set Global ARG to build process -################################################################## -ARG NGINX_VERSION - -################################################################## -# Start build process -################################################################## -FROM quay.io/epicmorg/debian:bullseye-develop AS builder -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ENV BuildDocker true -ARG BUILDS_DIR=/builds -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 -ARG NGINX_DOWNLOAD_URL -ARG LUAJIT_INC=/usr/local/include/luajit-2.1 -ARG LUAJIT_LIB=/usr/local/lib - -################################################################## -# Files and folders -################################################################## -RUN mkdir -p ${PRE_DIR} ${NGINX_SRC_DIR} /usr/lib/nginx -ADD pre/luajit2-description-pak ${PRE_DIR} -ADD pre/nginx-description-pak ${PRE_DIR} -ADD pre/ip2location-description-pak ${PRE_DIR} - -################################################################## -# IP2Location support for prod nginx module -################################################################## -RUN cd ${SRC_DIR} && \ - git clone https://github.com/chrislim2888/IP2Location-C-Library.git ip2 && \ - cp -fv ${PRE_DIR}/ip2location-description-pak ${SRC_DIR}/ip2/description-pak && \ - cd ${SRC_DIR}/ip2 && \ ls -las && \ - autoreconf -i -v --force && \ - aclocal && \ - automake --gnu --add-missing && \ - autoconf && \ - autoreconf -i -v --force && \ - ./configure && \ - ls -las && \ - make clean && \ - make && \ - make -C data convert && \ - make check && \ - ls -las && \ - fakeroot checkinstall -D --pakdir=${EXPORT_DIR} --maintainer="EpicMorg, developer@epicm.org" --pkgname=ip2-custom --conflicts=ip2 --install=yes -y && \ - ln -s /usr/local/lib/libIP2Location.so /usr/lib/libIP2Location.so && \ - ln -s /usr/local/lib/libIP2Location.so.1 /usr/lib/libIP2Location.so.1 && \ - ln -s /usr/local/lib/libIP2Location.so.2 /usr/lib/libIP2Location.so.2 && \ - 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 && \ - dpkg --force-all -i ${EXPORT_DIR}/*.deb - -################################################################## -# luaJIT 2 support for prod nginx module -################################################################## -RUN cd ${SRC_DIR} && \ - git clone https://github.com/openresty/luajit2.git luajit2 && \ - cp -fv ${PRE_DIR}/luajit2-description-pak ${SRC_DIR}/luajit2/description-pak && \ - cd ${SRC_DIR}/luajit2 && \ - make && \ - make install && \ - fakeroot checkinstall -D --pakdir=${EXPORT_DIR} --maintainer="EpicMorg, developer@epicm.org" --pkgname=luajit2-custom --conflicts=luajit2 --install=no -y - -################################################################## -# nginx preparing -################################################################## -RUN wget -qO - ${NGINX_DOWNLOAD_URL} | tar -zxv --strip-components=1 -C ${NGINX_SRC_DIR} && \ - cd ${NGINX_SRC_DIR} && \ - git clone https://github.com/openresty/headers-more-nginx-module.git http-headers-more-filter && \ - git clone https://github.com/sto/ngx_http_auth_pam_module.git http-auth-pam && \ - git clone https://github.com/arut/nginx-dav-ext-module.git http-dav-ext && \ - git clone https://github.com/openresty/echo-nginx-module.git http-echo && \ - git clone https://github.com/aperezdc/ngx-fancyindex.git http-fancyindex && \ - git clone https://github.com/slact/nchan.git nchan && \ - git clone https://github.com/masterzen/nginx-upload-progress-module.git http-uploadprogress && \ - git clone https://github.com/yaoweibin/ngx_http_substitutions_filter_module http-subs-filter && \ - git clone https://github.com/grahamedgecombe/nginx-ct.git ssl-ct && \ - git clone https://github.com/stnoonan/spnego-http-auth-nginx-module.git spnego-http-auth-nginx-module && \ - git clone https://github.com/leev/ngx_http_geoip2_module http-geoip2 && \ - git clone https://github.com/flavioribeiro/nginx-audio-track-for-hls-module.git nginx-audio-track-for-hls-module && \ - git clone https://github.com/chrislim2888/ip2location-nginx.git ip2location-nginx && \ - git clone https://github.com/kaltura/nginx-vod-module.git nginx-vod-module && \ - git clone https://github.com/vozlt/nginx-module-vts.git nginx-module-vts && \ - git clone https://github.com/evanmiller/mod_zip.git mod-zip && \ - git clone https://github.com/alibaba/nginx-http-user-agent.git nginx-http-user-agent && \ - git clone https://github.com/youzee/nginx-unzip-module.git nginx-unzip-module && \ - git clone https://github.com/vladbondarenko/ngx_webp.git ngx-webp && \ - git clone https://github.com/openresty/xss-nginx-module.git xss-nginx-module && \ - git clone https://github.com/openresty/set-misc-nginx-module.git set-misc-nginx-module && \ - git clone https://github.com/arut/nginx-rtmp-module.git rtmp && \ - git clone https://github.com/kvspb/nginx-auth-ldap.git http-auth-ldap && \ - git clone https://github.com/simplresty/ngx_devel_kit.git http-ndk && \ - git clone https://github.com/chrislim2888/IP2Location-C-Library.git ip2location-c-7.0.0 && \ - git clone https://github.com/itoffshore/nginx-upstream-fair.git http-upstream-fair && \ - git clone https://github.com/yaoweibin/nginx_upstream_check_module.git nginx-upstream-check-module && \ - git clone https://github.com/openresty/lua-nginx-module http-lua - -################################################################## -# nginx compilling -################################################################## -RUN cd ${NGINX_SRC_DIR} && \ - ./configure \ - --sbin-path=/usr/sbin/nginx \ - --prefix=/usr/share/nginx \ - --conf-path=/etc/nginx/nginx.conf \ - --http-log-path=/var/log/nginx/access.log \ - --error-log-path=/var/log/nginx/error.log \ - --lock-path=/var/lock/nginx.lock \ - --pid-path=/run/nginx.pid \ - --modules-path=/usr/lib/nginx/modules \ - --http-client-body-temp-path=/var/lib/nginx/body \ - --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ - --http-proxy-temp-path=/var/lib/nginx/proxy \ - --http-scgi-temp-path=/var/lib/nginx/scgi \ - --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ - --with-cc-opt='-I/usr/local/include/luajit-2.1 -g -O2 -lz -fstack-protector-strong -Wformat -Wno-error=date-time -Wno-error=implicit-fallthrough= -Wno-error=cast-function-type -Wno-error=format-security -Wno-error=implicit-function-declaration -Wno-error=deprecated-declarations -Wno-error=unused-result -fPIC -Wdate-time -D_FORTIFY_SOURCE=2' \ - --with-ld-opt='-Wl,-z,relro -Wl,-z,now -lz -fPIC -L/usr/local/lib' \ - --with-file-aio \ - --with-compat \ - --with-debug \ - --with-threads \ - --with-pcre-jit \ - --with-http_ssl_module \ - --with-http_stub_status_module \ - --with-http_realip_module \ - --with-http_auth_request_module \ - --with-http_v2_module \ - --with-http_dav_module \ - --with-http_slice_module \ - --with-http_addition_module \ - --with-http_flv_module \ - --with-http_geoip_module=dynamic \ - --with-http_gunzip_module \ - --with-http_gzip_static_module \ - --with-http_image_filter_module=dynamic \ - --with-http_mp4_module \ - --with-http_perl_module=dynamic \ - --with-http_random_index_module \ - --with-http_secure_link_module \ - --with-http_sub_module \ - --with-http_xslt_module=dynamic \ - --with-mail=dynamic \ - --with-mail_ssl_module \ - --with-stream=dynamic \ - --with-stream_ssl_module \ - --with-stream_ssl_preread_module \ - --add-dynamic-module=http-headers-more-filter \ - --add-dynamic-module=http-auth-pam \ - --add-dynamic-module=http-dav-ext \ - --add-dynamic-module=http-ndk \ - --add-dynamic-module=http-echo \ - --add-dynamic-module=http-fancyindex \ - --add-dynamic-module=nchan \ - --add-dynamic-module=http-uploadprogress \ - --add-dynamic-module=http-subs-filter \ - --add-dynamic-module=ssl-ct \ - --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=ip2location-nginx \ - --add-dynamic-module=nginx-vod-module \ -# --add-dynamic-module=nginx-module-vts \ - --add-dynamic-module=mod-zip \ - --add-dynamic-module=nginx-http-user-agent \ - --add-dynamic-module=nginx-unzip-module \ - --add-dynamic-module=ngx-webp \ - --add-dynamic-module=set-misc-nginx-module \ - --add-dynamic-module=rtmp \ - --add-dynamic-module=http-upstream-fair \ - --add-dynamic-module=nginx-upstream-check-module \ - --add-dynamic-module=http-lua && \ - cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \ - fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, developer@epicm.org" --pkgname=nginx-custom --install=no -y && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -################################################################## -################################################################## -################################################################## - -FROM quay.io/epicmorg/debian:bullseye -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# LDAP Fix -################################################################## -RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf - -################################################################## -# Installing nginx from deb -################################################################## -ADD pre/ngninx.pre.tar.gz / -COPY --from=builder /builds/export /tmp/deb -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated \ - geoip-database \ - geoip-bin \ - libgeoip1 \ - libmaxminddb0 \ - libgd3 \ - libxslt1.1 && \ - dpkg --force-all -i /tmp/deb/*.deb && \ - ln -s /usr/local/lib/libIP2Location.so /usr/lib/libIP2Location.so && \ - ln -s /usr/local/lib/libIP2Location.so.1 /usr/lib/libIP2Location.so.1 && \ - ln -s /usr/local/lib/libIP2Location.so.2 /usr/lib/libIP2Location.so.2 && \ - ln -s /usr/local/lib/libIP2Location.so.3 /usr/lib/libIP2Location.so.3 && \ - ln -s /usr/local/lib/libIP2Location.so.4 /usr/lib/libIP2Location.so.4 && \ - ln -s /usr/local/lib/libIP2Location.so.5 /usr/lib/libIP2Location.so.5 && \ - 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 /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 -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 && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /var/cache/apt/archives/*.deb && \ - rm -rf /tmp/deb/* && \ - rm -rf /builds/* && \ - rm -rf /valve/* - -#Final config -VOLUME ["/var/cache/nginx"] -EXPOSE 80 443 - -CMD ["nginx", "-g", "daemon off;"] diff --git a/linux/ecosystem/nginx/1.21.6/php/Dockerfile b/linux/ecosystem/nginx/1.21.6/php/Dockerfile deleted file mode 100644 index 8b5f99e2c..000000000 --- a/linux/ecosystem/nginx/1.21.6/php/Dockerfile +++ /dev/null @@ -1,257 +0,0 @@ -################################################################## -# Set Global ARG to build process -################################################################## -ARG NGINX_VERSION - -################################################################## -# Start build process -################################################################## -FROM quay.io/epicmorg/debian:bullseye-develop AS builder -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ENV BuildDocker true - -ARG BUILDS_DIR=/builds -ARG SRC_DIR=${BUILDS_DIR}/src -ARG EXPORT_DIR=${BUILDS_DIR}/export -ARG P4API_DIR=${SRC_DIR}/p4api -ARG P4PHP_DIR=${SRC_DIR}/p4php -ARG MAKE_DIR=${SRC_DIR}/p4php-7.4 - -ARG P4API_VER=r20.1 -ARG P4API_URL=http://filehost.perforce.com/perforce/${P4API_VER}/bin.linux26x86_64/p4api.tgz - -ARG P4PHP_VER=r20.1 -ARG P4PHP_URL=http://filehost.perforce.com/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz - -ENV PHP_MODULE_PATH=/usr/lib/php/20190902 - -################################################################## -# Files and folders -################################################################## -RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P4PHP_DIR} - -################################################################## -# Installing PHP7 -################################################################## -#installing php repo - -#Install base packages -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated \ - libmemcached-dev \ - smbclient libsmbclient libsmbclient-dev \ - php7.4 \ - php7.4-dev \ - php7.4-fpm \ - php7.4-cli \ - php7.4-cgi - -################################################################## -# preparing p4src -################################################################## -RUN wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${P4API_DIR} && \ - wget -qO - ${P4API_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ - wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${P4PHP_DIR} && \ - wget -qO - ${P4PHP_URL} | tar -zxv --strip-components=1 -C ${MAKE_DIR} && \ - cd ${P4API_DIR} && \ - ls -las && \ - cd ${P4PHP_DIR} && \ - ls -las && \ - cd ${MAKE_DIR} && \ - ls -las && \ - cd ${SRC_DIR} && \ - ls -las - -################################################################## -# compilling p4src -################################################################## -RUN cd ${MAKE_DIR} && \ - ls -las && \ - phpize && \ - ./configure --with-perforce=${P4API_DIR} && \ - make && \ - make test && \ - make install && \ - cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} - - -################################################################## -# compilling smbclient -################################################################## -RUN pecl install smbclient && \ - cp ${PHP_MODULE_PATH}/smbclient.so ${EXPORT_DIR} - -################################################################## -################################################################## -################################################################## - -FROM quay.io/epicmorg/nginx:${NGINX_VERSION} -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# Installing php fpm for nginx from deb -################################################################## -ENV PHP_MODULE_PATH=/usr/lib/php/20190902 -ENV PHP_VER=7.4 -ENV PHP_DIR=/etc/php/${PHP_VER} -ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini -ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini - -################################################################## -# Installing PHP7 -################################################################## -#Install base packages -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated \ - php7.4 \ - php7.4-dev \ - php7.4-fpm \ - php7.4-cli \ - php7.4-cgi \ - php-pear \ - php7.4-gmp \ - php7.4-snmp \ - php7.4-ldap \ - php7.4-mail \ - php7.4-soap \ - php7.4-mysql \ - php7.4-memcached \ - php7.4-memcache \ - php7.4-igbinary \ - php7.4-interbase \ - php7.4-curl \ - php7.4-gd \ - php7.4-intl \ - php7.4-zip \ - php7.4-bcmath \ - php7.4-imap \ - php7.4-pspell \ - php7.4-sqlite3 \ - php7.4-tidy \ - php7.4-xmlrpc \ - php7.4-xml \ - php7.4-mbstring \ - php7.4-apcu \ - php7.4-common \ - php7.4-json \ - php7.4-readline \ - php7.4-enchant \ - php7.4-ssh2 \ - php7.4-oauth \ - php7.4-gmagick \ - php7.4-gnupg \ - php7.4-redis \ - smbclient libsmbclient \ -# php-smbclient \ - php7.4-yaml \ - php7.4-geoip \ - sendmail && \ - update-alternatives --set php /usr/bin/php7.4 && \ - phpenmod \ - snmp \ - gmp \ - calendar \ - ldap \ - curl \ - exif \ - ftp \ - fileinfo \ - gd \ - geoip \ - gnupg \ - iconv \ - imap \ - json \ - mbstring \ - memcached \ - mysqli \ - mysqlnd \ - oauth \ - pdo_mysql \ - pdo_sqlite \ - phar \ - posix \ - readline \ - redis \ - simplexml \ - sockets \ - sqlite3 \ - ssh2 \ - tokenizer \ - xml \ - xmlreader \ - xmlrpc \ - xmlwriter \ - xsl \ - yaml && \ - ln -sfv /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ - php -v - -################################################################## -# Installing IOnCube addon -################################################################## -ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz -RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ - cp /tmp/ioncube/ioncube_loader_lin_7.4.so ${PHP_MODULE_PATH} && \ -# echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \ - echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cgi/php.ini && \ - echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cli/php.ini && \ - echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/fpm/php.ini && \ - php -m && \ - php -v - -################################################################## -# Installing P4 addon -################################################################## -COPY --from=builder /builds/export/perforce.so ${PHP_MODULE_PATH} -RUN echo "extension=perforce.so" > ${P4_PHP_INI} && \ - ln -sf ${P4_PHP_INI} ${PHP_DIR}/cgi/conf.d/perforce.ini && \ - ln -sf ${P4_PHP_INI} ${PHP_DIR}/cli/conf.d/perforce.ini && \ - ln -sf ${P4_PHP_INI} ${PHP_DIR}/fpm/conf.d/perforce.ini && \ - php -m && \ - php -v - -################################################################## -# Installing smbclient addon -################################################################## -COPY --from=builder /builds/export/smbclient.so ${PHP_MODULE_PATH} -RUN echo "extension=smbclient.so" > ${SMB_PHP_INI} && \ - ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cgi/conf.d/smbclient.ini && \ - ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cli/conf.d/smbclient.ini && \ - ln -sf ${SMB_PHP_INI} ${PHP_DIR}/fpm/conf.d/smbclient.ini && \ - php -m && \ - php -v - - - -################################################################## -# Installing Composer addon -################################################################## -RUN cd /tmp && \ - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ - php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ - rm /tmp/composer-setup.php - -################################################################## -# cleaninig up -################################################################## -RUN apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/deb/* && \ - rm -rfv /tmp/ioncube/* && \ - rm -rfv /tmp/composer-setup.php && \ - rm -rfv /tmp/ioncube.tar.gz - -#Final config -VOLUME ["/var/cache/nginx"] -EXPOSE 80 443 - -CMD ["nginx", "-g", "daemon off;"] diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.21.6/rtmp-hls/Dockerfile deleted file mode 100644 index 4a263d3aa..000000000 --- a/linux/ecosystem/nginx/1.21.6/rtmp-hls/Dockerfile +++ /dev/null @@ -1,127 +0,0 @@ -################################################################## -# Set Global ARG to build process -################################################################## -ARG NGINX_VERSION - -################################################################## -# Start build process -################################################################## -FROM quay.io/epicmorg/nginx:${NGINX_VERSION} -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG NGINX_RTMP_MODULE_VERSION=1.2.1 - -################################################################## -# Clear sources.list.d -################################################################## -RUN rm -rfv /etc/apt/sources.list.d/* - -################################################################## -# sid sources list -################################################################## -RUN rm -rfv /etc/apt/sources.list -COPY sources.list.d/sources.sid.list /etc/apt/sources.list -RUN apt-get update - -################################################################## -# installing utils -################################################################## -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - libpcre3-dev \ - librtmp1 \ - libtheora0 \ - libvorbis-dev \ - libmp3lame0 \ - libx264-dev \ - libx265-dev - - -################################################################## -# stretch sources list + libvpx -################################################################## -RUN rm -rfv /etc/apt/sources.list -COPY sources.list.d/sources.stretch.list /etc/apt/sources.list -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - libvpx4 - - -################################################################## -# buster sources list + libvpx -################################################################## -RUN rm -rfv /etc/apt/sources.list -COPY sources.list.d/sources.buster.list /etc/apt/sources.list -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - libvpx5 - - -################################################################## -# sid sources list + libvpx -################################################################## -RUN rm -rfv /etc/apt/sources.list -COPY sources.list.d/sources.sid.list /etc/apt/sources.list -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - libvpx6 - - -################################################################## -# installing deps for rtmp module -################################################################## -RUN mkdir -p /usr/share/nginx/html \ - /mnt/hls \ - /mnt/dash \ - /tmp/build && \ - chown -R www-data:www-data /mnt/hls && \ - chown -R www-data:www-data /mnt/dash && \ - chmod -R 755 /mnt/hls && \ - chmod -R 755 /mnt/dash && \ - cd /tmp/build && \ - wget https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_MODULE_VERSION}.tar.gz && \ - tar -zxf v${NGINX_RTMP_MODULE_VERSION}.tar.gz && \ - rm v${NGINX_RTMP_MODULE_VERSION}.tar.gz && \ - cp /tmp/build/nginx-rtmp-module-${NGINX_RTMP_MODULE_VERSION}/stat.xsl /usr/share/nginx/html/stat.xsl && \ - rm -rf /tmp/build - - -################################################################## -# Forward logs to Docker -################################################################## -RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log - - -################################################################## -# Copy nginx config file to container -################################################################## -RUN rm -rfv /etc/nginx/nginx.conf \ - /etc/nginx/sites-avalible/default -COPY conf/nginx.conf /etc/nginx/nginx.conf - - -################################################################## -# Copy html players to container -################################################################## -COPY players /usr/share/nginx/html/players - - -################################################################## -# cleaninig up -################################################################## -RUN apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb - - -EXPOSE 1935 -EXPOSE 8080 - -CMD ["nginx", "-g", "daemon off;"] diff --git a/linux/ecosystem/nginx/1.21.6/main/.env b/linux/ecosystem/nginx/1.21/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.21.6/main/.env rename to linux/ecosystem/nginx/1.21/main/.env diff --git a/linux/ecosystem/nginx/1.21.3/main/Dockerfile b/linux/ecosystem/nginx/1.21/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.21.3/main/Dockerfile rename to linux/ecosystem/nginx/1.21/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.21.3/main/Makefile b/linux/ecosystem/nginx/1.21/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.3/main/Makefile rename to linux/ecosystem/nginx/1.21/main/Makefile diff --git a/linux/ecosystem/nginx/1.21.3/main/README.md b/linux/ecosystem/nginx/1.21/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.3/main/README.md rename to linux/ecosystem/nginx/1.21/main/README.md diff --git a/linux/ecosystem/nginx/1.21.3/main/docker-compose.yml b/linux/ecosystem/nginx/1.21/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.3/main/docker-compose.yml rename to linux/ecosystem/nginx/1.21/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21.3/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.21/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.3/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.21/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.21.3/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.21/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.3/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.21/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.21.3/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.21/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.3/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.21/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.21.3/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.21/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.21.3/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.21/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.21.6/php/.env b/linux/ecosystem/nginx/1.21/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.21.6/php/.env rename to linux/ecosystem/nginx/1.21/php/.env diff --git a/linux/ecosystem/nginx/1.21.3/php/Dockerfile b/linux/ecosystem/nginx/1.21/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.21.3/php/Dockerfile rename to linux/ecosystem/nginx/1.21/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.21.3/php/Makefile b/linux/ecosystem/nginx/1.21/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.3/php/Makefile rename to linux/ecosystem/nginx/1.21/php/Makefile diff --git a/linux/ecosystem/nginx/1.21.3/php/README.md b/linux/ecosystem/nginx/1.21/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.3/php/README.md rename to linux/ecosystem/nginx/1.21/php/README.md diff --git a/linux/ecosystem/nginx/1.21.3/php/docker-compose.yml b/linux/ecosystem/nginx/1.21/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.3/php/docker-compose.yml rename to linux/ecosystem/nginx/1.21/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/.env b/linux/ecosystem/nginx/1.21/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/.env rename to linux/ecosystem/nginx/1.21/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.21/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.21/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.21/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.21/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/README.md b/linux/ecosystem/nginx/1.21/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.21/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.21/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.21/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.21.3/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.28.0/main/Dockerfile b/linux/ecosystem/nginx/1.26/main/Dockerfile similarity index 80% rename from linux/ecosystem/nginx/1.28.0/main/Dockerfile rename to linux/ecosystem/nginx/1.26/main/Dockerfile index 291f25771..b806101f7 100644 --- a/linux/ecosystem/nginx/1.28.0/main/Dockerfile +++ b/linux/ecosystem/nginx/1.26/main/Dockerfile @@ -12,7 +12,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # Nginx ################################################################## -ENV NGINX_VERSION=1.28.0 +ENV NGINX_VERSION=1.26 +ENV NGINX_VERSION_FULL=${NGINX_VERSION}.3 ENV NGINX_DIR=${EMG_LOCAL_BASE_DIR}/nginx/${NGINX_VERSION} ENV NGINX_BIN_DIR=${NGINX_SBIN_DIR} ENV NGINX_CONF_DIR=/etc/nginx @@ -27,9 +28,9 @@ ENV NGINX_HTML_DIR=${NGINX_DIR}/html ENV NGINX_PID_DIR=/run/nginx ENV NGINX_PID=${NGINX_PID_DIR}/nginx.pid ENV NGINX_SRC_DIR=/usr/local/src/nginx/${NGINX_VERSION} -ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz -ARG NGINX_TEMP=/tmp/nginx-${NGINX_VERSION}.tar.gz -ARG NGINX_TEMP_SRC=/tmp/nginx-${NGINX_VERSION} +ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION_FULL}.tar.gz +ARG NGINX_TEMP=/tmp/nginx-${NGINX_VERSION_FULL}.tar.gz +ARG NGINX_TEMP_SRC=/tmp/nginx-${NGINX_VERSION_FULL} # NJS ENV NJS_VERSION=0.8.10 @@ -39,8 +40,7 @@ ARG NJS_DOWNLOAD_URL=https://github.com/nginx/njs # Prepare zlib ################################################################## WORKDIR ${ZLIB_SRC_DIR} -RUN ./configure \ - --static \ +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ --prefix=${ZLIB_DIR} ################################################################## @@ -83,7 +83,6 @@ RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ enable-ktls \ enable-ec_nistp_64_gcc_128 \ enable-egd \ -# enable-fips \ enable-ssl-trace\ enable-trace \ threads \ @@ -98,15 +97,15 @@ RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ # Prepare IP2Location-C-Library ################################################################## WORKDIR ${IP2LOC_SRC_DIR} -RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" autoreconf -i -v --force && \ +RUN autoreconf -i -v --force && \ aclocal && \ - CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" automake --gnu --add-missing && \ + automake --gnu --add-missing && \ autoconf && \ autoreconf -i -v --force && \ CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ --prefix=${IP2LOC_DIR} \ --disable-silent-rules \ - --disable-shared \ + --enable-shared \ --enable-static ################################################################## @@ -150,29 +149,7 @@ RUN tar -xf ${NGINX_TEMP} --directory /tmp && \ git clone https://github.com/itoffshore/nginx-upstream-fair modules/http-upstream-fair && \ git clone https://github.com/yaoweibin/nginx_upstream_check_module modules/nginx-upstream-check-module -RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ - cp -rfv /usr/local/share/epicmorg/libxml2/2.13.5/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/luajit2/2.1/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/gperftools/2.15/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libxml2/2.13.5/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/luajit2/2.1/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/gperftools/2.15/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/geoip/1.6.12/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/libxml2/2.13.5/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/luajit2/2.1/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/gperftools/2.15/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/geoip/1.6.12/lib/* /usr/lib/x86_64-linux-gnu && \ - ldconfig && \ - CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ --user=www-data \ --group=www-data \ --prefix=${NGINX_DIR} \ @@ -189,19 +166,14 @@ RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ --http-proxy-temp-path=${NGINX_CACHE_DIR}/proxy \ --http-scgi-temp-path=${NGINX_CACHE_DIR}/scgi \ --http-uwsgi-temp-path=${NGINX_CACHE_DIR}/uwsgi \ - --with-cc-opt="-I/usr/local/share/epicmorg/ip2location/8.7.0/include \ - -I/usr/local/share/epicmorg/libxml2/2.13.5/include \ - -I/usr/local/share/epicmorg/libxslt/1.1.42/include \ - -I/usr/local/share/epicmorg/luajit2/2.1/include \ - -I/usr/local/share/epicmorg/libgd/2.3.3/include \ - -I/usr/local/share/epicmorg/gperftools/2.15/include\ - -I/usr/local/share/epicmorg/geoip/1.6.12/include \ - -I/usr/local/share/epicmorg/libxml2/2.13.5/include/libxml2/libxml \ - -I/usr/local/share/epicmorg/libxslt/1.1.42/include/libexslt \ - -I/usr/local/share/epicmorg/libxslt/1.1.42/include/libxslt \ - -I/usr/local/share/epicmorg/luajit2/2.1/include/luajit-2.1 \ - -I/usr/local/share/epicmorg/gperftools/2.15/include/google \ - -I/usr/local/share/epicmorg/gperftools/2.15/include/gperftools \ + --with-cc-opt="-I${IP2LOC_INC_DIR} \ + -I${LIBXML2_INC_DIR} \ + -I${LIBXSLT_INC_DIR} \ + -I${LUAJIT2OR_INC_DIR} \ + -I${LIBGD_INC_DIR} \ + -I${GPERFTOOLS_INC_DIR} \ + -I${MM_GEOIP_INC_DIR} \ + -I${LIBATOMICOPS_INC_DIR} \ -I/usr/include/x86_64-linux-gnu/libavcodec \ -I/usr/include/x86_64-linux-gnu \ -I/usr/include \ @@ -209,20 +181,21 @@ RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ -Wno-error=unused-but-set-variable -Wformat -Wno-error=date-time -Wno-error=implicit-fallthrough \ -Wno-error=cast-function-type -Wno-error=format-security -Wno-error=implicit-function-declaration \ -Wno-error=deprecated-declarations -Wno-error=unused-result" \ - --with-ld-opt="-L/usr/local/share/epicmorg/ip2location/8.7.0/lib \ - -L/usr/local/share/epicmorg/libxml2/2.13.5/lib \ - -L/usr/local/share/epicmorg/libxslt/1.1.42/lib \ - -L/usr/local/share/epicmorg/luajit2/2.1/lib \ - -L/usr/local/share/epicmorg/libgd/2.3.3/lib \ - -L/usr/local/share/epicmorg/gperftools/2.15/lib \ - -L/usr/local/share/epicmorg/geoip/1.6.12/lib \ + --with-ld-opt="-L${IP2LOC_LIB_DIR} \ + -L${LIBXML2_LIB_DIR} \ + -L${LIBXSLT_LIB_DIR} \ + -L${LUAJIT2OR_LIB_DIR} \ + -L${LIBGD_LIB_DIR} \ + -L${GPERFTOOLS_LIB_DIR} \ + -L${MM_GEOIP_LIB_DIR} \ + -L${LIBATOMICOPS_LIB_DIR} \ -L/usr/lib/x86_64-linux-gnu \ -L/usr/lib \ -static -Wl,-z,relro -Wl,-z,now -lz -fPIC" \ --with-pcre=${PCRE_SRC_DIR} \ --with-pcre-jit \ --with-zlib=${ZLIB_SRC_DIR} \ - --with-zlib-opt="--static" \ +# --with-zlib-opt="--static" \ --with-libatomic \ --with-openssl=${OPENSSL_35_SRC_DIR} \ --with-openssl-opt="shared zlib --with-zlib-include=${ZLIB_INC_DIR} --with-zlib-lib=${ZLIB_LIB_DIR} --with-zstd-include=${ZSTD_INC_DIR} --with-zstd-lib=${ZSTD_LIB_DIR} enable-ktls enable-ec_nistp_64_gcc_128 enable-egd enable-ssl-trace enable-trace threads sctp --release" \ @@ -335,7 +308,8 @@ RUN updatedb ################################################################## FROM quay.io/epicmorg/debian:bookworm -ENV NGINX_VERSION=1.28.0 +ENV NGINX_VERSION=1.26 +ENV NGINX_VERSION_FULL=${NGINX_VERSION}.3 ENV NGINX_DIR=${EMG_LOCAL_BASE_DIR}/nginx/${NGINX_VERSION} ENV NGINX_BIN_DIR=${NGINX_SBIN_DIR} ENV NGINX_CONF_DIR=/etc/nginx diff --git a/linux/ecosystem/nginx/1.21.6/main/Makefile b/linux/ecosystem/nginx/1.26/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.6/main/Makefile rename to linux/ecosystem/nginx/1.26/main/Makefile diff --git a/linux/ecosystem/nginx/1.21.6/main/README.md b/linux/ecosystem/nginx/1.26/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.6/main/README.md rename to linux/ecosystem/nginx/1.26/main/README.md diff --git a/linux/ecosystem/nginx/1.27.0/main/docker-compose.yml b/linux/ecosystem/nginx/1.26/main/docker-compose.yml similarity index 51% rename from linux/ecosystem/nginx/1.27.0/main/docker-compose.yml rename to linux/ecosystem/nginx/1.26/main/docker-compose.yml index c4e80d4e8..cc8e05e4e 100644 --- a/linux/ecosystem/nginx/1.27.0/main/docker-compose.yml +++ b/linux/ecosystem/nginx/1.26/main/docker-compose.yml @@ -1,5 +1,5 @@ services: app: - image: "quay.io/epicmorg/nginx:1.27.0" + image: "quay.io/epicmorg/nginx:1.26" build: context: . diff --git a/linux/ecosystem/nginx/1.27.0/main/docker-entrypoint.sh b/linux/ecosystem/nginx/1.26/main/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/docker-entrypoint.sh rename to linux/ecosystem/nginx/1.26/main/docker-entrypoint.sh diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/default/nginx b/linux/ecosystem/nginx/1.26/main/etc/default/nginx similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/default/nginx rename to linux/ecosystem/nginx/1.26/main/etc/default/nginx diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/init.d/nginx b/linux/ecosystem/nginx/1.26/main/etc/init.d/nginx old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/init.d/nginx rename to linux/ecosystem/nginx/1.26/main/etc/init.d/nginx diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/logrotate.d/nginx b/linux/ecosystem/nginx/1.26/main/etc/logrotate.d/nginx similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/logrotate.d/nginx rename to linux/ecosystem/nginx/1.26/main/etc/logrotate.d/nginx diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/nginx/modules-avalible/additional.conf b/linux/ecosystem/nginx/1.26/main/etc/nginx/modules-avalible/additional.conf similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/nginx/modules-avalible/additional.conf rename to linux/ecosystem/nginx/1.26/main/etc/nginx/modules-avalible/additional.conf diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/nginx/modules-avalible/default.conf b/linux/ecosystem/nginx/1.26/main/etc/nginx/modules-avalible/default.conf similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/nginx/modules-avalible/default.conf rename to linux/ecosystem/nginx/1.26/main/etc/nginx/modules-avalible/default.conf diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/nginx/nginx.conf b/linux/ecosystem/nginx/1.26/main/etc/nginx/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/nginx/nginx.conf rename to linux/ecosystem/nginx/1.26/main/etc/nginx/nginx.conf diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/nginx/sites-available/default.conf b/linux/ecosystem/nginx/1.26/main/etc/nginx/sites-available/default.conf similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/nginx/sites-available/default.conf rename to linux/ecosystem/nginx/1.26/main/etc/nginx/sites-available/default.conf diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/nginx/snippets/fastcgi-php.conf b/linux/ecosystem/nginx/1.26/main/etc/nginx/snippets/fastcgi-php.conf similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/nginx/snippets/fastcgi-php.conf rename to linux/ecosystem/nginx/1.26/main/etc/nginx/snippets/fastcgi-php.conf diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/nginx/snippets/proxy_params.conf b/linux/ecosystem/nginx/1.26/main/etc/nginx/snippets/proxy_params.conf similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/nginx/snippets/proxy_params.conf rename to linux/ecosystem/nginx/1.26/main/etc/nginx/snippets/proxy_params.conf diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/nginx/snippets/snakeoil.conf b/linux/ecosystem/nginx/1.26/main/etc/nginx/snippets/snakeoil.conf similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/nginx/snippets/snakeoil.conf rename to linux/ecosystem/nginx/1.26/main/etc/nginx/snippets/snakeoil.conf diff --git a/linux/ecosystem/nginx/1.27.0/main/etc/ufw/applications.d/nginx b/linux/ecosystem/nginx/1.26/main/etc/ufw/applications.d/nginx similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/etc/ufw/applications.d/nginx rename to linux/ecosystem/nginx/1.26/main/etc/ufw/applications.d/nginx diff --git a/linux/ecosystem/nginx/1.27.0/main/Dockerfile b/linux/ecosystem/nginx/1.27/main/Dockerfile similarity index 75% rename from linux/ecosystem/nginx/1.27.0/main/Dockerfile rename to linux/ecosystem/nginx/1.27/main/Dockerfile index 59e5a9277..75e6fa051 100644 --- a/linux/ecosystem/nginx/1.27.0/main/Dockerfile +++ b/linux/ecosystem/nginx/1.27/main/Dockerfile @@ -12,7 +12,8 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # Nginx ################################################################## -ENV NGINX_VERSION=1.27.0 +ENV NGINX_VERSION=1.27 +ENV NGINX_VERSION_FULL=${NGINX_VERSION}.5 ENV NGINX_DIR=${EMG_LOCAL_BASE_DIR}/nginx/${NGINX_VERSION} ENV NGINX_BIN_DIR=${NGINX_SBIN_DIR} ENV NGINX_CONF_DIR=/etc/nginx @@ -27,55 +28,53 @@ ENV NGINX_HTML_DIR=${NGINX_DIR}/html ENV NGINX_PID_DIR=/run/nginx ENV NGINX_PID=${NGINX_PID_DIR}/nginx.pid ENV NGINX_SRC_DIR=/usr/local/src/nginx/${NGINX_VERSION} -ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz -ARG NGINX_TEMP=/tmp/nginx-${NGINX_VERSION}.tar.gz -ARG NGINX_TEMP_SRC=/tmp/nginx-${NGINX_VERSION} +ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION_FULL}.tar.gz +ARG NGINX_TEMP=/tmp/nginx-${NGINX_VERSION_FULL}.tar.gz +ARG NGINX_TEMP_SRC=/tmp/nginx-${NGINX_VERSION_FULL} # NJS -ENV NJS_VERSION=0.8.5 +ENV NJS_VERSION=0.8.10 ARG NJS_DOWNLOAD_URL=https://github.com/nginx/njs ################################################################## # Prepare zlib ################################################################## WORKDIR ${ZLIB_SRC_DIR} -RUN ./configure \ - --static \ +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ --prefix=${ZLIB_DIR} ################################################################## # Prepare pcre2 ################################################################## WORKDIR ${PCRE_SRC_DIR} -RUN ./configure --prefix=${PCRE_DIR} \ - --disable-silent-rules \ - --disable-shared \ - --enable-static \ - --enable-rebuild-chartables \ - --enable-pcre2-8 \ - --enable-pcre2-16 \ - --enable-pcre2-32 \ - --enable-jit \ - --enable-newline-is-cr \ - --enable-newline-is-lf \ - --enable-newline-is-anycrlf \ - --enable-newline-is-any \ - --enable-newline-is-nul \ - --enable-bsr-anycrlf \ - --enable-pcre2grep-libz \ - --enable-pcre2grep-libbz2 \ - --enable-pcre2test-libedit \ - --enable-unicode \ - --enable-valgrind \ - --enable-fuzz-support \ - --enable-diff-fuzz-support +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure --prefix=${PCRE_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-rebuild-chartables \ + --enable-pcre2-8 \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --enable-jit \ + --enable-newline-is-cr \ + --enable-newline-is-lf \ + --enable-newline-is-anycrlf \ + --enable-newline-is-any \ + --enable-newline-is-nul \ + --enable-bsr-anycrlf \ + --enable-pcre2grep-libz \ + --enable-pcre2grep-libbz2 \ + --enable-pcre2test-libedit \ + --enable-unicode \ + --enable-valgrind \ + --enable-fuzz-support \ + --enable-diff-fuzz-support ################################################################## # Prepare openssl ################################################################## -WORKDIR ${OPENSSL_33_SRC_DIR} -RUN ./config \ - no-shared \ +WORKDIR ${OPENSSL_35_SRC_DIR} +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ zlib \ --with-zlib-include=${ZLIB_DIR}/include \ --with-zlib-lib=${ZLIB_DIR}/lib \ @@ -84,15 +83,15 @@ RUN ./config \ enable-ktls \ enable-ec_nistp_64_gcc_128 \ enable-egd \ -# enable-fips \ enable-ssl-trace\ enable-trace \ threads \ sctp \ + shared \ --release \ - --prefix=${OPENSSL_33_DIR} && \ - cp -rfv ${OPENSSL_33_INC_DIR}/* /usr/local/include && \ - cp -rfv ${OPENSSL_33_LIB_DIR}/* /usr/local/lib + --prefix=${OPENSSL_35_DIR} && \ + cp -rfv ${OPENSSL_35_INC_DIR}/* /usr/local/include && \ + cp -rfv ${OPENSSL_35_LIB_DIR}/* /usr/local/lib ################################################################## # Prepare IP2Location-C-Library @@ -103,10 +102,10 @@ RUN autoreconf -i -v --force && \ automake --gnu --add-missing && \ autoconf && \ autoreconf -i -v --force && \ - ./configure \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ --prefix=${IP2LOC_DIR} \ --disable-silent-rules \ - --disable-shared \ + --enable-shared \ --enable-static ################################################################## @@ -150,29 +149,7 @@ RUN tar -xf ${NGINX_TEMP} --directory /tmp && \ git clone https://github.com/itoffshore/nginx-upstream-fair modules/http-upstream-fair && \ git clone https://github.com/yaoweibin/nginx_upstream_check_module modules/nginx-upstream-check-module -RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ - cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/luajit2/2.1/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/gperftools/2.15/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/include/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/luajit2/2.1/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/gperftools/2.15/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/geoip/1.6.12/lib/* /usr/lib && \ - cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/luajit2/2.1/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/gperftools/2.15/lib/* /usr/lib/x86_64-linux-gnu && \ - cp -rfv /usr/local/share/epicmorg/geoip/1.6.12/lib/* /usr/lib/x86_64-linux-gnu && \ - ldconfig && \ - ./configure \ +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ --user=www-data \ --group=www-data \ --prefix=${NGINX_DIR} \ @@ -189,19 +166,14 @@ RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ --http-proxy-temp-path=${NGINX_CACHE_DIR}/proxy \ --http-scgi-temp-path=${NGINX_CACHE_DIR}/scgi \ --http-uwsgi-temp-path=${NGINX_CACHE_DIR}/uwsgi \ - --with-cc-opt="-I/usr/local/share/epicmorg/ip2location/8.7.0/include \ - -I/usr/local/share/epicmorg/libxml2/2.13.2/include \ - -I/usr/local/share/epicmorg/libxslt/1.1.42/include \ - -I/usr/local/share/epicmorg/luajit2/2.1/include \ - -I/usr/local/share/epicmorg/libgd/2.3.3/include \ - -I/usr/local/share/epicmorg/gperftools/2.15/include\ - -I/usr/local/share/epicmorg/geoip/1.6.12/include \ - -I/usr/local/share/epicmorg/libxml2/2.13.2/include/libxml2/libxml \ - -I/usr/local/share/epicmorg/libxslt/1.1.42/include/libexslt \ - -I/usr/local/share/epicmorg/libxslt/1.1.42/include/libxslt \ - -I/usr/local/share/epicmorg/luajit2/2.1/include/luajit-2.1 \ - -I/usr/local/share/epicmorg/gperftools/2.15/include/google \ - -I/usr/local/share/epicmorg/gperftools/2.15/include/gperftools \ + --with-cc-opt="-I${IP2LOC_INC_DIR} \ + -I${LIBXML2_INC_DIR} \ + -I${LIBXSLT_INC_DIR} \ + -I${LUAJIT2OR_INC_DIR} \ + -I${LIBGD_INC_DIR} \ + -I${GPERFTOOLS_INC_DIR} \ + -I${MM_GEOIP_INC_DIR} \ + -I${LIBATOMICOPS_INC_DIR} \ -I/usr/include/x86_64-linux-gnu/libavcodec \ -I/usr/include/x86_64-linux-gnu \ -I/usr/include \ @@ -209,23 +181,24 @@ RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ -Wno-error=unused-but-set-variable -Wformat -Wno-error=date-time -Wno-error=implicit-fallthrough \ -Wno-error=cast-function-type -Wno-error=format-security -Wno-error=implicit-function-declaration \ -Wno-error=deprecated-declarations -Wno-error=unused-result" \ - --with-ld-opt="-L/usr/local/share/epicmorg/ip2location/8.7.0/lib \ - -L/usr/local/share/epicmorg/libxml2/2.13.2/lib \ - -L/usr/local/share/epicmorg/libxslt/1.1.42/lib \ - -L/usr/local/share/epicmorg/luajit2/2.1/lib \ - -L/usr/local/share/epicmorg/libgd/2.3.3/lib \ - -L/usr/local/share/epicmorg/gperftools/2.15/lib \ - -L/usr/local/share/epicmorg/geoip/1.6.12/lib \ + --with-ld-opt="-L${IP2LOC_LIB_DIR} \ + -L${LIBXML2_LIB_DIR} \ + -L${LIBXSLT_LIB_DIR} \ + -L${LUAJIT2OR_LIB_DIR} \ + -L${LIBGD_LIB_DIR} \ + -L${GPERFTOOLS_LIB_DIR} \ + -L${MM_GEOIP_LIB_DIR} \ + -L${LIBATOMICOPS_LIB_DIR} \ -L/usr/lib/x86_64-linux-gnu \ -L/usr/lib \ -static -Wl,-z,relro -Wl,-z,now -lz -fPIC" \ --with-pcre=${PCRE_SRC_DIR} \ --with-pcre-jit \ --with-zlib=${ZLIB_SRC_DIR} \ - --with-zlib-opt="--static" \ +# --with-zlib-opt="--static" \ --with-libatomic \ - --with-openssl=${OPENSSL_33_SRC_DIR} \ - --with-openssl-opt="no-shared zlib --with-zlib-include=${ZLIB_INC_DIR} --with-zlib-lib=${ZLIB_LIB_DIR} --with-zstd-include=${ZSTD_INC_DIR} --with-zstd-lib=${ZSTD_LIB_DIR} enable-ktls enable-ec_nistp_64_gcc_128 enable-egd enable-fips enable-ssl-trace enable-trace threads sctp --release" \ + --with-openssl=${OPENSSL_35_SRC_DIR} \ + --with-openssl-opt="shared zlib --with-zlib-include=${ZLIB_INC_DIR} --with-zlib-lib=${ZLIB_LIB_DIR} --with-zstd-include=${ZSTD_INC_DIR} --with-zstd-lib=${ZSTD_LIB_DIR} enable-ktls enable-ec_nistp_64_gcc_128 enable-egd enable-ssl-trace enable-trace threads sctp --release" \ --with-threads \ --with-file-aio \ --with-compat \ @@ -335,7 +308,8 @@ RUN updatedb ################################################################## FROM quay.io/epicmorg/debian:bookworm -ENV NGINX_VERSION=1.27.0 +ENV NGINX_VERSION=1.27 +ENV NGINX_VERSION_FULL=${NGINX_VERSION}.5 ENV NGINX_DIR=${EMG_LOCAL_BASE_DIR}/nginx/${NGINX_VERSION} ENV NGINX_BIN_DIR=${NGINX_SBIN_DIR} ENV NGINX_CONF_DIR=/etc/nginx diff --git a/linux/ecosystem/nginx/1.21.6/php/Makefile b/linux/ecosystem/nginx/1.27/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.6/php/Makefile rename to linux/ecosystem/nginx/1.27/main/Makefile diff --git a/linux/ecosystem/nginx/1.21.6/php/README.md b/linux/ecosystem/nginx/1.27/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.6/php/README.md rename to linux/ecosystem/nginx/1.27/main/README.md diff --git a/linux/ecosystem/nginx/1.28.0/main/docker-compose.yml b/linux/ecosystem/nginx/1.27/main/docker-compose.yml similarity index 51% rename from linux/ecosystem/nginx/1.28.0/main/docker-compose.yml rename to linux/ecosystem/nginx/1.27/main/docker-compose.yml index 29c1310fa..a489a8f73 100644 --- a/linux/ecosystem/nginx/1.28.0/main/docker-compose.yml +++ b/linux/ecosystem/nginx/1.27/main/docker-compose.yml @@ -1,5 +1,5 @@ services: app: - image: "quay.io/epicmorg/nginx:1.28.0" + image: "quay.io/epicmorg/nginx:1.27" build: context: . diff --git a/linux/ecosystem/nginx/1.28.0/main/docker-entrypoint.sh b/linux/ecosystem/nginx/1.27/main/docker-entrypoint.sh similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/docker-entrypoint.sh rename to linux/ecosystem/nginx/1.27/main/docker-entrypoint.sh diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/default/nginx b/linux/ecosystem/nginx/1.27/main/etc/default/nginx similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/default/nginx rename to linux/ecosystem/nginx/1.27/main/etc/default/nginx diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/init.d/nginx b/linux/ecosystem/nginx/1.27/main/etc/init.d/nginx similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/init.d/nginx rename to linux/ecosystem/nginx/1.27/main/etc/init.d/nginx diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/logrotate.d/nginx b/linux/ecosystem/nginx/1.27/main/etc/logrotate.d/nginx similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/logrotate.d/nginx rename to linux/ecosystem/nginx/1.27/main/etc/logrotate.d/nginx diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/nginx/modules-avalible/additional.conf b/linux/ecosystem/nginx/1.27/main/etc/nginx/modules-avalible/additional.conf similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/nginx/modules-avalible/additional.conf rename to linux/ecosystem/nginx/1.27/main/etc/nginx/modules-avalible/additional.conf diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/nginx/modules-avalible/default.conf b/linux/ecosystem/nginx/1.27/main/etc/nginx/modules-avalible/default.conf similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/nginx/modules-avalible/default.conf rename to linux/ecosystem/nginx/1.27/main/etc/nginx/modules-avalible/default.conf diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/nginx/nginx.conf b/linux/ecosystem/nginx/1.27/main/etc/nginx/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/nginx/nginx.conf rename to linux/ecosystem/nginx/1.27/main/etc/nginx/nginx.conf diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/nginx/sites-available/default.conf b/linux/ecosystem/nginx/1.27/main/etc/nginx/sites-available/default.conf similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/nginx/sites-available/default.conf rename to linux/ecosystem/nginx/1.27/main/etc/nginx/sites-available/default.conf diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/nginx/snippets/fastcgi-php.conf b/linux/ecosystem/nginx/1.27/main/etc/nginx/snippets/fastcgi-php.conf similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/nginx/snippets/fastcgi-php.conf rename to linux/ecosystem/nginx/1.27/main/etc/nginx/snippets/fastcgi-php.conf diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/nginx/snippets/proxy_params.conf b/linux/ecosystem/nginx/1.27/main/etc/nginx/snippets/proxy_params.conf similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/nginx/snippets/proxy_params.conf rename to linux/ecosystem/nginx/1.27/main/etc/nginx/snippets/proxy_params.conf diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/nginx/snippets/snakeoil.conf b/linux/ecosystem/nginx/1.27/main/etc/nginx/snippets/snakeoil.conf similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/nginx/snippets/snakeoil.conf rename to linux/ecosystem/nginx/1.27/main/etc/nginx/snippets/snakeoil.conf diff --git a/linux/ecosystem/nginx/1.28.0/main/etc/ufw/applications.d/nginx b/linux/ecosystem/nginx/1.27/main/etc/ufw/applications.d/nginx similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/etc/ufw/applications.d/nginx rename to linux/ecosystem/nginx/1.27/main/etc/ufw/applications.d/nginx diff --git a/linux/ecosystem/nginx/1.28/main/Dockerfile b/linux/ecosystem/nginx/1.28/main/Dockerfile new file mode 100644 index 000000000..2062e75b6 --- /dev/null +++ b/linux/ecosystem/nginx/1.28/main/Dockerfile @@ -0,0 +1,398 @@ +################################################################## +################################################################## +################################################################## +# Temp Build Layer +################################################################## +################################################################## +################################################################## +FROM quay.io/epicmorg/debian:bookworm-develop AS build +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# Nginx +################################################################## +ENV NGINX_VERSION=1.28 +ENV NGINX_VERSION_FULL=${NGINX_VERSION}.0 +ENV NGINX_DIR=${EMG_LOCAL_BASE_DIR}/nginx/${NGINX_VERSION} +ENV NGINX_BIN_DIR=${NGINX_SBIN_DIR} +ENV NGINX_CONF_DIR=/etc/nginx +ENV NGINX_MODULES_DIR=${NGINX_CONF_DIR}/modules +ENV NGINX_MODULES_PERL_DIR=${NGINX_CONF_DIR}/modules-perl +ENV NGINX_SBIN_DIR=${NGINX_DIR}/sbin +ENV NGINX_CACHE_DIR=/var/cache/nginx +ENV NGINX_LOGS_DIR=/var/log/nginx +ENV NGINX_LOCK_DIR=/var/lock/nginx +ENV NGINX_LOCK=${NGINX_LOCK_DIR}/nginx.lock +ENV NGINX_HTML_DIR=${NGINX_DIR}/html +ENV NGINX_PID_DIR=/run/nginx +ENV NGINX_PID=${NGINX_PID_DIR}/nginx.pid +ENV NGINX_SRC_DIR=/usr/local/src/nginx/${NGINX_VERSION} +ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION_FULL}.tar.gz +ARG NGINX_TEMP=/tmp/nginx-${NGINX_VERSION_FULL}.tar.gz +ARG NGINX_TEMP_SRC=/tmp/nginx-${NGINX_VERSION_FULL} + +# NJS +ENV NJS_VERSION=0.8.10 +ARG NJS_DOWNLOAD_URL=https://github.com/nginx/njs + +################################################################## +# Prepare zlib +################################################################## +WORKDIR ${ZLIB_SRC_DIR} +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ + --prefix=${ZLIB_DIR} + +################################################################## +# Prepare pcre2 +################################################################## +WORKDIR ${PCRE_SRC_DIR} +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure --prefix=${PCRE_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-rebuild-chartables \ + --enable-pcre2-8 \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --enable-jit \ + --enable-newline-is-cr \ + --enable-newline-is-lf \ + --enable-newline-is-anycrlf \ + --enable-newline-is-any \ + --enable-newline-is-nul \ + --enable-bsr-anycrlf \ + --enable-pcre2grep-libz \ + --enable-pcre2grep-libbz2 \ + --enable-pcre2test-libedit \ + --enable-unicode \ + --enable-valgrind \ + --enable-fuzz-support \ + --enable-diff-fuzz-support + +################################################################## +# Prepare openssl +################################################################## +WORKDIR ${OPENSSL_35_SRC_DIR} +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_35_DIR} && \ + cp -rfv ${OPENSSL_35_INC_DIR}/* /usr/local/include && \ + cp -rfv ${OPENSSL_35_LIB_DIR}/* /usr/local/lib + +################################################################## +# Prepare IP2Location-C-Library +################################################################## +WORKDIR ${IP2LOC_SRC_DIR} +RUN autoreconf -i -v --force && \ + aclocal && \ + automake --gnu --add-missing && \ + autoconf && \ + autoreconf -i -v --force && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ + --prefix=${IP2LOC_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static + +################################################################## +# Prepare Nginx +################################################################## +RUN mkdir -p ${NGINX_DIR} ${NGINX_SRC_DIR} +ADD ${NGINX_DOWNLOAD_URL} /tmp + +WORKDIR ${NGINX_TEMP_SRC} + +RUN tar -xf ${NGINX_TEMP} --directory /tmp && \ +# + git clone --depth 1 --branch ${NJS_VERSION} ${NJS_DOWNLOAD_URL} modules/nginx-njs && \ +# + git clone https://github.com/openresty/headers-more-nginx-module modules/http-headers-more-filter && \ + git clone https://github.com/sto/ngx_http_auth_pam_module modules/http-auth-pam && \ + git clone https://github.com/openresty/lua-nginx-module modules/http-lua && \ + git clone https://github.com/chrislim2888/ip2location-nginx modules/ip2location-nginx && \ + git clone https://github.com/leev/ngx_http_geoip2_module modules/http-geoip2 && \ +# + git clone https://github.com/arut/nginx-dav-ext-module modules/http-dav-ext && \ + git clone https://github.com/openresty/echo-nginx-module modules/http-echo && \ + git clone https://github.com/aperezdc/ngx-fancyindex modules/http-fancyindex && \ + git clone https://github.com/slact/nchan modules/nchan && \ + git clone https://github.com/masterzen/nginx-upload-progress-module modules/http-uploadprogress && \ + git clone https://github.com/yaoweibin/ngx_http_substitutions_filter_module modules/http-subs-filter && \ + git clone https://github.com/grahamedgecombe/nginx-ct modules/ssl-ct && \ + git clone https://github.com/stnoonan/spnego-http-auth-nginx-module modules/spnego-http-auth-nginx-module && \ + git clone https://github.com/flavioribeiro/nginx-audio-track-for-hls-module modules/nginx-audio-track-for-hls-module && \ + git clone https://github.com/kaltura/nginx-vod-module modules/nginx-vod-module && \ + git clone https://github.com/vozlt/nginx-module-vts modules/nginx-module-vts && \ + git clone https://github.com/evanmiller/mod_zip modules/mod-zip && \ + git clone https://github.com/alibaba/nginx-http-user-agent modules/nginx-http-user-agent && \ + git clone https://github.com/youzee/nginx-unzip-module modules/nginx-unzip-module && \ + git clone https://github.com/vladbondarenko/ngx_webp modules/ngx-webp && \ + git clone https://github.com/openresty/xss-nginx-module modules/xss-nginx-module && \ + git clone https://github.com/openresty/set-misc-nginx-module modules/set-misc-nginx-module && \ + git clone https://github.com/arut/nginx-rtmp-module modules/rtmp && \ + git clone https://github.com/kvspb/nginx-auth-ldap modules/http-auth-ldap && \ + git clone https://github.com/simplresty/ngx_devel_kit modules/http-ndk && \ + git clone https://github.com/itoffshore/nginx-upstream-fair modules/http-upstream-fair && \ + git clone https://github.com/yaoweibin/nginx_upstream_check_module modules/nginx-upstream-check-module + +RUN CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./configure \ + --user=www-data \ + --group=www-data \ + --prefix=${NGINX_DIR} \ + --sbin-path=${NGINX_SBIN_DIR}/nginx \ + --conf-path=${NGINX_CONF_DIR}/nginx.conf \ + --http-log-path=${NGINX_LOGS_DIR}/access.log \ + --error-log-path=${NGINX_LOGS_DIR}/error.log \ + --modules-path=${NGINX_MODULES_DIR} \ + --with-perl_modules_path=${NGINX_MODULES_PERL_DIR} \ + --lock-path=${NGINX_LOCK} \ + --pid-path=${NGINX_PID} \ + --http-client-body-temp-path=${NGINX_CACHE_DIR}/body \ + --http-fastcgi-temp-path=${NGINX_CACHE_DIR}/fastcgi \ + --http-proxy-temp-path=${NGINX_CACHE_DIR}/proxy \ + --http-scgi-temp-path=${NGINX_CACHE_DIR}/scgi \ + --http-uwsgi-temp-path=${NGINX_CACHE_DIR}/uwsgi \ + --with-cc-opt="-I${IP2LOC_INC_DIR} \ + -I${LIBXML2_INC_DIR} \ + -I${LIBXSLT_INC_DIR} \ + -I${LUAJIT2OR_INC_DIR} \ + -I${LIBGD_INC_DIR} \ + -I${GPERFTOOLS_INC_DIR} \ + -I${MM_GEOIP_INC_DIR} \ + -I${LIBATOMICOPS_INC_DIR} \ + -I/usr/include/x86_64-linux-gnu/libavcodec \ + -I/usr/include/x86_64-linux-gnu \ + -I/usr/include \ + -static -g -O2 -lz -fPIC -Wdate-time -D_FORTIFY_SOURCE=2 -fstack-protector-strong \ + -Wno-error=unused-but-set-variable -Wformat -Wno-error=date-time -Wno-error=implicit-fallthrough \ + -Wno-error=cast-function-type -Wno-error=format-security -Wno-error=implicit-function-declaration \ + -Wno-error=deprecated-declarations -Wno-error=unused-result" \ + --with-ld-opt="-L${IP2LOC_LIB_DIR} \ + -L${LIBXML2_LIB_DIR} \ + -L${LIBXSLT_LIB_DIR} \ + -L${LUAJIT2OR_LIB_DIR} \ + -L${LIBGD_LIB_DIR} \ + -L${GPERFTOOLS_LIB_DIR} \ + -L${MM_GEOIP_LIB_DIR} \ + -L${LIBATOMICOPS_LIB_DIR} \ + -L/usr/lib/x86_64-linux-gnu \ + -L/usr/lib \ + -static -Wl,-z,relro -Wl,-z,now -lz -fPIC" \ + --with-pcre=${PCRE_SRC_DIR} \ + --with-pcre-jit \ + --with-zlib=${ZLIB_SRC_DIR} \ +# --with-zlib-opt="--static" \ + --with-libatomic \ + --with-openssl=${OPENSSL_35_SRC_DIR} \ + --with-openssl-opt="shared zlib --with-zlib-include=${ZLIB_INC_DIR} --with-zlib-lib=${ZLIB_LIB_DIR} --with-zstd-include=${ZSTD_INC_DIR} --with-zstd-lib=${ZSTD_LIB_DIR} enable-ktls enable-ec_nistp_64_gcc_128 enable-egd enable-ssl-trace enable-trace threads sctp --release" \ + --with-threads \ + --with-file-aio \ + --with-compat \ + --with-select_module \ + --with-poll_module \ + --without-quic_bpf_module \ + --with-http_ssl_module \ + --with-http_v2_module \ + --with-http_v3_module \ + --with-http_realip_module \ + --with-http_addition_module \ + --with-http_geoip_module \ + --with-http_sub_module \ + --with-http_dav_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_auth_request_module \ + --with-http_random_index_module \ + --with-http_secure_link_module \ + --with-http_degradation_module \ + --with-http_slice_module \ + --with-http_stub_status_module \ + --with-mail \ + --with-mail_ssl_module \ + --with-stream \ + --with-stream_ssl_module \ + --with-stream_realip_module \ + --with-stream_geoip_module \ + --with-stream_ssl_preread_module \ + --with-cpp_test_module \ + --add-module=modules/http-headers-more-filter \ + --add-module=modules/nginx-http-user-agent \ + --add-module=modules/http-ndk \ + --add-module=modules/http-echo \ + --add-module=modules/http-fancyindex \ + --add-module=modules/nchan \ + --add-module=modules/http-uploadprogress \ + --add-module=modules/http-subs-filter \ + --add-module=modules/mod-zip \ + --add-module=modules/http-geoip2 \ + --add-module=modules/nginx-vod-module \ + --add-module=modules/ngx-webp \ + --add-module=modules/set-misc-nginx-module \ + --add-module=modules/rtmp \ + --add-module=modules/http-upstream-fair \ + --add-module=modules/nginx-upstream-check-module \ +## xslt fuck +## --with-http_xslt_module \ +## xslt fuck +## --add-module=modules/nginx-njs/nginx \ +## lua fuck +## --add-module=modules/http-lua \ +## ip2location fuck +## --add-module=modules/ip2location-nginx \ +## xslt fuck +## --add-module=modules/http-dav-ext \ +## gd fuck +## --with-http_image_filter_module \ +## perftools fuck +## --with-google_perftools_module \ +## perl problem fuck +## --with-http_perl_module \ +## +## --with-perl_modules_path=${NGINX_MODULES_PERL_DIR} \ +## some compile fuck +## --add-module=modules/http-auth-pam \ +## some compile fuck +## --add-module=modules/nginx-audio-track-for-hls-module \ +## some compile fuck +## --add-module=modules/nginx-module-vts \ +## some compile fuck +## --add-module=modules/nginx-unzip-module \ +## some compile fuck +## --add-module=modules/spnego-http-auth-nginx-module \ +## ssl outdated compile fuck +##--add-module=modules/ssl-ct \ +## undefined reference to `sasl_getprop' +## --add-module=modules/http-auth-ldap \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +RUN rm -rfv ${NGINX_CONF_DIR}/nginx.conf && \ + mkdir -p ${NGINX_MODULES_DIR} ${NGINX_MODULES_PERL_DIR} + +################################################################## +# Cleanup +################################################################## +RUN echo "clean up" && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +RUN updatedb + +################################################################## +################################################################## +################################################################## +# Main Final Layer +################################################################## +################################################################## +################################################################## +FROM quay.io/epicmorg/debian:bookworm + +ENV NGINX_VERSION=1.28 +ENV NGINX_VERSION_FULL=${NGINX_VERSION}.0 +ENV NGINX_DIR=${EMG_LOCAL_BASE_DIR}/nginx/${NGINX_VERSION} +ENV NGINX_BIN_DIR=${NGINX_SBIN_DIR} +ENV NGINX_CONF_DIR=/etc/nginx +ENV NGINX_MODULES_DIR=${NGINX_CONF_DIR}/modules +ENV NGINX_MODULES_PERL_DIR=${NGINX_CONF_DIR}/modules-perl +ENV NGINX_SBIN_DIR=${NGINX_DIR}/sbin +ENV NGINX_CACHE_DIR=/var/cache/nginx +ENV NGINX_LOGS_DIR=/var/log/nginx +ENV NGINX_LOCK_DIR=/var/lock/nginx +ENV NGINX_LOCK=${NGINX_LOCK_DIR}/nginx.lock +ENV NGINX_HTML_DIR=${NGINX_DIR}/html +ENV NGINX_PID_DIR=/run/nginx +ENV NGINX_PID=${NGINX_PID_DIR}/nginx.pid +ENV NGINX_SRC_DIR=/usr/local/src/nginx/${NGINX_VERSION} + +################################################################## +# Copy compilled nginx from dev stage and prepare +################################################################## +RUN mkdir -p \ + ${NGINX_CONF_DIR}/sites-enabled \ + ${NGINX_CONF_DIR}/modules-enabled \ + ${NGINX_LOCK_DIR} \ + ${NGINX_LOGS_DIR} \ + ${NGINX_PID_DIR} \ + ${NGINX_SRC_DIR} \ + /var/www + +COPY --from=build ${NGINX_SRC_DIR} ${NGINX_SRC_DIR} +COPY --from=build ${NGINX_CONF_DIR} ${NGINX_CONF_DIR} +COPY --from=build ${NGINX_DIR} ${NGINX_DIR} +COPY etc /etc + +RUN mv ${NGINX_HTML_DIR} /var/www/ &\ + ln -sfv /etc/ssl/dhparam.pem ${NGINX_CONF_DIR}/dhparam.pem && \ + ln -sfv ${NGINX_MODULES_DIR} ${NGINX_DIR}/modules && \ + ln -sfv ${NGINX_MODULES_PERL_DIR} ${NGINX_DIR}/modules-perl && \ + ln -sfv ${NGINX_CACHE_DIR} ${NGINX_DIR}/cache && \ + ln -sfv ${NGINX_LOGS_DIR} ${NGINX_DIR}/logs && \ + ln -sfv /dev/stdout /var/log/nginx/access.log && \ + ln -sfv /dev/stderr /var/log/nginx/error.log && \ + ln -sfv /var/lock/nginx ${NGINX_DIR}/lock && \ + ln -sfv /var/run/nginx ${NGINX_DIR}/run && \ + ln -sfv /etc/nginx ${NGINX_DIR}/etc && \ + ln -sfv /var/www/html ${NGINX_HTML_DIR} && \ + ln -sfv ${NGINX_SRC_DIR} ${NGINX_DIR}/src && \ + ln -sfv ${NGINX_DIR} /usr/share/nginx + +################################################################## +# Add nginx to $PATH +################################################################## +ENV PATH="${NGINX_SBIN_DIR}:${PATH}" + +################################################################## +# Expose default nginx ports +################################################################## +EXPOSE 80 443 + +################################################################## +# Setup volume with nginx cache +################################################################## +VOLUME ["${NGINX_CACHE_DIR}"] + +################################################################## +# Setup nginx workdir +################################################################## +WORKDIR ${NGINX_DIR} + +################################################################## +# Cleanup +################################################################## +RUN echo "clean up" && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +RUN updatedb + +################################################################## +# Run nginx in foreground +################################################################## +RUN nginx -V + +CMD ["nginx", "-g", "daemon off;"] diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.28/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.28/main/Makefile diff --git a/linux/ecosystem/nginx/1.27.0/main/README.md b/linux/ecosystem/nginx/1.28/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/README.md rename to linux/ecosystem/nginx/1.28/main/README.md diff --git a/linux/ecosystem/nginx/1.28/main/docker-compose.yml b/linux/ecosystem/nginx/1.28/main/docker-compose.yml new file mode 100644 index 000000000..3fdd47e25 --- /dev/null +++ b/linux/ecosystem/nginx/1.28/main/docker-compose.yml @@ -0,0 +1,9 @@ +services: + app: + image: "quay.io/epicmorg/nginx:1.28" + build: + context: . + app-latest: + image: "quay.io/epicmorg/nginx:latest" + build: + context: . diff --git a/linux/ecosystem/nginx/latest/mainline/main/docker-entrypoint.sh b/linux/ecosystem/nginx/1.28/main/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/docker-entrypoint.sh rename to linux/ecosystem/nginx/1.28/main/docker-entrypoint.sh diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/default/nginx b/linux/ecosystem/nginx/1.28/main/etc/default/nginx similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/default/nginx rename to linux/ecosystem/nginx/1.28/main/etc/default/nginx diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/init.d/nginx b/linux/ecosystem/nginx/1.28/main/etc/init.d/nginx old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/init.d/nginx rename to linux/ecosystem/nginx/1.28/main/etc/init.d/nginx diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/logrotate.d/nginx b/linux/ecosystem/nginx/1.28/main/etc/logrotate.d/nginx similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/logrotate.d/nginx rename to linux/ecosystem/nginx/1.28/main/etc/logrotate.d/nginx diff --git a/linux/ecosystem/nginx/1.28/main/etc/nginx/modules-avalible/additional.conf b/linux/ecosystem/nginx/1.28/main/etc/nginx/modules-avalible/additional.conf new file mode 100644 index 000000000..fc5386454 --- /dev/null +++ b/linux/ecosystem/nginx/1.28/main/etc/nginx/modules-avalible/additional.conf @@ -0,0 +1,3 @@ +# NOTE: When nginx build as static binary - all modules will be included in main nginx binary. + +# load_module "/etc/nginx/modules/ngx_some_module.so"; diff --git a/linux/ecosystem/nginx/1.28/main/etc/nginx/modules-avalible/default.conf b/linux/ecosystem/nginx/1.28/main/etc/nginx/modules-avalible/default.conf new file mode 100644 index 000000000..fc5386454 --- /dev/null +++ b/linux/ecosystem/nginx/1.28/main/etc/nginx/modules-avalible/default.conf @@ -0,0 +1,3 @@ +# NOTE: When nginx build as static binary - all modules will be included in main nginx binary. + +# load_module "/etc/nginx/modules/ngx_some_module.so"; diff --git a/linux/ecosystem/nginx/1.28/main/etc/nginx/nginx.conf b/linux/ecosystem/nginx/1.28/main/etc/nginx/nginx.conf new file mode 100644 index 000000000..75dad302b --- /dev/null +++ b/linux/ecosystem/nginx/1.28/main/etc/nginx/nginx.conf @@ -0,0 +1,95 @@ +include /etc/nginx/modules-enabled/*.conf; + +user www-data; +worker_processes auto; +pid /var/run/nginx/nginx.pid; +lock_file /var/lock/nginx/nginx.lock; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 512; + types_hash_bucket_size 128; + # server_tokens off; + + server_names_hash_max_size 512; + server_names_hash_bucket_size 128; + # server_name_in_redirect off; + + variables_hash_max_size 2048; + variables_hash_bucket_size 512; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Virtual Host Configs + ## + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/sites-available/default b/linux/ecosystem/nginx/1.28/main/etc/nginx/sites-available/default.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/sites-available/default rename to linux/ecosystem/nginx/1.28/main/etc/nginx/sites-available/default.conf diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/fastcgi-php.conf b/linux/ecosystem/nginx/1.28/main/etc/nginx/snippets/fastcgi-php.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/fastcgi-php.conf rename to linux/ecosystem/nginx/1.28/main/etc/nginx/snippets/fastcgi-php.conf diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/proxy_params b/linux/ecosystem/nginx/1.28/main/etc/nginx/snippets/proxy_params.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/proxy_params rename to linux/ecosystem/nginx/1.28/main/etc/nginx/snippets/proxy_params.conf diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/snakeoil.conf b/linux/ecosystem/nginx/1.28/main/etc/nginx/snippets/snakeoil.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/snakeoil.conf rename to linux/ecosystem/nginx/1.28/main/etc/nginx/snippets/snakeoil.conf diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/ufw/applications.d/nginx b/linux/ecosystem/nginx/1.28/main/etc/ufw/applications.d/nginx similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/ufw/applications.d/nginx rename to linux/ecosystem/nginx/1.28/main/etc/ufw/applications.d/nginx diff --git a/linux/ecosystem/nginx/latest/quic/main/docker-compose.yml b/linux/ecosystem/nginx/latest/quic/main/docker-compose.yml deleted file mode 100644 index 25c3162ef..000000000 --- a/linux/ecosystem/nginx/latest/quic/main/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -services: - app: - image: "quay.io/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/ecosystem/nginx/latest/quic/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/latest/quic/main/pre/ip2location-description-pak deleted file mode 100644 index e93eb7783..000000000 --- a/linux/ecosystem/nginx/latest/quic/main/pre/ip2location-description-pak +++ /dev/null @@ -1 +0,0 @@ -Custom build of ip2location lib by EpicMorg. diff --git a/linux/ecosystem/nginx/latest/quic/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/latest/quic/main/pre/luajit2-description-pak deleted file mode 100644 index 4305e8e88..000000000 --- a/linux/ecosystem/nginx/latest/quic/main/pre/luajit2-description-pak +++ /dev/null @@ -1 +0,0 @@ -Custom build of luajit2 for Nginx module, by EpicMorg. diff --git a/linux/ecosystem/nginx/latest/quic/main/pre/nginx-description-pak b/linux/ecosystem/nginx/latest/quic/main/pre/nginx-description-pak deleted file mode 100644 index b6c186ed8..000000000 --- a/linux/ecosystem/nginx/latest/quic/main/pre/nginx-description-pak +++ /dev/null @@ -1 +0,0 @@ -Custom build of Nginx with some modules by EpicMorg. \ No newline at end of file diff --git a/linux/ecosystem/nginx/latest/quic/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/latest/quic/main/pre/ngninx.pre.tar.gz deleted file mode 100644 index bf9c2735172faf460d34cb157f13291f42cdef88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9573 zcmV-rC7RkFiwFRv!iZe}1MEF(QyaOm`_=O+wAi%?yZCKP4ivk^f|F2(00)~*ZDn(O zh8fw`Wjr%G(g5C&``d4KYsT}i%_9MCPF*V%u=VI}b+=klt0gMc@18x?AZ=}K(r-xl z-}JfO+-x=Kt$J;<4f$JJ^~QH>^Z7~p?z>PbGhpny!1L5y_3kVGFHM!|l^Hy<4m?o) zpaJczMg#Ie3+lC%{Fjlm{2g)ej5_dm`PUm@23GQ4LQ3TC4uyO3EL!k*`8Qg%`bz%G zNRj-#;Wsw^w^s6BN=oGaZH@nWYbF0>BrX5z>+5f8{5P8``7b3U@*k?V2 zTdn_>k}A)<_Q&*i`PW+Q)%t%aNy}eOq~c@yne^Zb#(#aa|65MV%3uF}YBhMg{F|G# zmH%%kX|DWfD^QU{U0{qv}Ee5aBp12whjW!wnYcC{yMom(229 z6?hInGhI8Oqt`im$6gLhshAvv%J#0^DIH@|xM?!>hy>I1piq<26Jzd$3cJ?j*6!x| z20<5tgecPyS3Dtx5Cbeg{m;XrBSd8a(TFbKh!9ARaRSvq02W0VY#4Z<&tCo$`uWbY z`R-WUaC^N%Jk}Vc7`mn-0oZ^C9A#vC);1K6l=8Q$(Ma`zVU@d8D3aBPF%?|S1E3G* zu23J111_yV_)2*0?j9S7;fVP>0C|r|@Yno;;czE@*vtfc@L3Y2H&v1p+RCL&oXh z!E530-6}{s>XR>QL+hCtsM7$-LK#%$g@`J!vSQ^wS$W7_*d`x)F7wUI*U9cUbd)HEAl6tgf43Q0rN1dvNUNV0#{<`Y z$@wq*Y&2KvzhxvX|8L^_FD3t#|9@F2k^kTB|4+$(<^Nw+s#LkMz76}I@&9eD?Eg}d zmOt!MROPwce_wL`({8W)|4T_3`O_5e^f>O8f4#QVYUcgFTg{dKXDO-peU-MOBf}^b zi|p6Vo5N#vczoD{AFof0B0CMdD`9iFU0_q+&>4rVYQXI>ZL7B#q>|%VrqdrtRtjJ{ zt2lj(90IH)C(`kTkYSEtPnvk-!$8Mhzq|job8vpt*iqH`bS;#K#7_2t z2|C{RjS5Ul#r{U^E4REZjGd~cnVx+}v{~7$uSb0S zi>;M_hP8y3NKwv-gPhdWU8sJ3bolPDmudl8%M}Y9F$NAnJ^U#_Llrs{=Ln_{RgEAK zcv8^5cG#`6PXrXRNbR-CRwIu;lwt81S7G4FZTyVm2M|ZDs*x$#1?R5TdKivWqn@g9 zZKA6*0A5UD53a7%NL8}D(6O28DFBv$n&%m#yp)G5_Jtv5;VZx4)>MV}TP{xAv!P_TeH#OhChgJ4Eq`zNQpE^GX}2w}tctQEeG8YhM^|9ePhVs&(37?69_ zC`@rFmcf%k)A;#^I>N?|)2GDc=rRyaqn5*kILaMtPlws!=U>6bOY;BXl0pa79%)=Ii~4Y{a2 zwOKyCj_eGu5-f;5W-!s)|MvVeK3B+d_>OL9cRs_$3l%L*d_-oA$n%s5lOjxlGN$f~ zvKY>b2thss_j&iM{&?h}KMYKpXPI;2I>O~FDvPuj$4RJYVktcIm|}raYJiDOh8B9( z2cY?r7-?EVr)M;%c(X=_4qk+ z5IIzP5X&16VR>xsfrR%am~T9eyMPfxRN%Rc%dcZHd{vXjO{_og5|2+|L_|>U?up-eq#0iU^dN6lv5rmR<9)! z6Qrq)gU>L}z|ZL*E7+dPsXHB5N=?)V7fJ$;M8JA%u=upl(Uv5~Z=>)q=Hdcl4s-Jz zpUdY&#R~=QNS?}S8oE1Cb~1H9CX5Hml!&9g1~YIp>eitejKsdCvp<$Ywnj57_PT`2 zvNdRd_`whrQqwVfi@^P&!4(R%+xj{V>pmD9f>dKWJ6O7qIGkizVbxOJJG5nv}$AW*{bQGGfGu@fNsm@v{ChU!+(vm1tIaUm@Qjwdjq6 zjEy^Y6>J{CZde|y9AL>0TQG}j1LBr#AuprJ0EWI9OsM_XoG@Dq24Fh}fj6eg!Yz-1 ze%L;Mq1s>;8_#xT`PB(;8Xwi&6kJNK2LSnVR)5a~ca#=*FUR%vq>ayo^H(|td zv6V)WTAM9GK|_#RBM-=x=8$jexrlwDL3@i@e;e7$+c^X7RnLyv{3#} zcou*Hz9as#w%Kmyz#fylu!=eea|mgR|f;Wq|yy4UN`Ji z5Mg(0I*wj4;ogq<9_*+w^b;3Bd@vA}fK^)BlkR(glDn^JRb}~xk;2=(2XXglFt=LG z4C>b*#>Cx;8Fs)=NWiPwMoh!sE%hW-GVbH&!SQ(e->BEOR`!1xsWN+f@Z>n|v;Xbd zX8!(1y}dgBT}mplV^6_mF0oZ*Z=i;-u`c4{MX9jgD5g0>pA z5gj#^Z8oEoIIY;_Y1Q}$icZ=KLFkr!3dy;z-3~Pv2>gYIxkLky;7OIx;9hx`yc}2+ zJ8~mOIP)j(DF~mxp(XvJQY94?^ISL{Z~yD<`s)7oQc_y}(iOhXmHY8;dC5KDP=wsq?rDKA z@0XRIe)*#U8nphhTKRFkw1cjf{U~xGax9&`J!Kj^p7l#5W8ac*(zb&MWvF1%*CBgz zDcWt-S_Jyn2{zLHDvScxNT!Wpe*&7FC7vkNzMk#aZ-pV`DZiB-7)n@|TveNmx`9F0 zrKFp)@OF$OD=^0lWB&UX{-0_F1jm(xYXkS`Co*ft5K+W_RDs6dGg`Cs_#cylPL{cg zp0}s-1U-KJ*J`ice_BpT%Rju9vD(U~#Bq=P$JhR5&i_~Uzm}7Xl+YRb*Lmmc_kOo` zc6j_Iy6aT>Gvr`Jr3%0x?_{f=b)Z4F*MHaPy*)Y5)dLOPN1Aw{!Me=d6EvcG5f9KRKfMdPR(3aLThhX8}X;z~G(c zPzjGG#(B=ru{6u163$?FwX5%Xs!vY1S?;_$>2>;h2M1>dVyO1%$yqO7 z8xOP>bT(Z(?(D+a6akm3jnn#S`M#`FnR_elX>r_R{~P$nK63t_HvavOmHmJIgpWW? z-Say}bU2&5SZ0O_maBNZBzt8sS*YHzfc!C9y&C)qOr*qfg$M!UyIkMkWLxc5J9zDe zUZv`rmc?N|;JG_^&jM{4G=pNgBJ`^%g@s4Oc=9YM*C^nvEV}c7Z3@cr!2tT99Hqb0 zIfc%+VBw{~)sV71>5xGgAVJ%TcijX+n0=-I&&7CQ5$>5-*k^s1hvIG#)g+#K&r zIn?bQ&G1J$)A>fS-ck3eu76hI-wnJ*a1cas_W$+^?D8A7UD4mg-Au5cQeuJ8`Q&M;qya*wwigMNcKXYUwQyJZ~s4i8sLdM0FU4Q zZ?59Mmz2`-&p580&;xMa{(oyT@BeLWuJ-@SNjY!j13Un^1`qK8?1z6DFPCr1d zO?Ut7@U)lRVa{_`=fLQ<%q{2`;(yt4J91in;jM#ziO`#jasZgpZKWBCM=0 z2I2`_yqlQi!@=QMXCLI>+v}Z^bQ`tW9JfkkW})}gv;UX*|5x!J%Sm_1KiYbJHI94c z|JLSaYv%p`*2@30lvKpG<}vtRj_7@p`Emc}XGbsS^?EO`^&R+OU`n5vOnQ#6S?EGG zFw(_K*Z|NQu;bY`jiRSl(qN*;TwI5na-^SV!P`_*0F~&edx_h|>+4GFq8wKPF1--U zprq}jeowvnxZ29|g(a&hR9+xVhaRN?YWu!W1Ji-;X>hn_wfTiGUD~t~b=3nhzFsit zsvxvf7;t*K|IlS)+1$9ElIQo6#Z86k-+`cZ=HRvVAo0UGcIY6{p! zr~eLsaHW8Kx;J3CVau*Z__mEu8WFCOgd1|?_63IQgua~)>WN-Uqlg~5&cV&G{tE=X zDQyG@J%Mc__-o}UEtquu#x_xqoj2%H(_ct86K|dX_8L^x`U^vb)2qx z=m+&ME*YOE()O^7pSZqTBCE*_51T9fibh-p(27R#>R|kr6teGm6^-ehKi=`bs>L^2 zBB$EUwCKb3_Q&lx<*|z|_f{A=exjzWRudz&WIxvLP#w z3eaf0?pV<;)I~uQI9e{kp-hjKt*vIW*_gib1gaCFtBz5CSL8^<7yMj_FM@$p;TC?# z^zs2%+M8RiVl4Tvwui*C6&@VWrg6m1viX6NC@q{dSmsacX&LU>b`tavKM;cAiSIjs zCPpty!a@+;a!Hs7LP1vQX{#oKfM0!{J%R;7s$D%fNv2N_zWAS=ti18}{uRjI+h z`u0C+xIQlwHA8IfPMG$NBQHRr(HG+525O0Rk;1ebZyp&c8#aa>!|;*X8j@nXKtDa7 z;bHX;0IXT45ju`0fjqofPjb%IL;oW4hx4luuOciHr#_n4OwuPadUOZrqq&5Pc7D#P z>c8SM89Tz&@nHr%o0FRl$wcT|fr?Cc%8fd;sXNJ+$cpY@)y!Z>k**7~<1|}5Gx&6q z%vdVkspVhgp?%(zS^qzW^Y6R+{eShX{QAFDTg87bCmHhp+Pk(L$BiSJSMFEvAqX5K z9P2JI8w6-dq`kf_c5Nf;7lR{lB+iH;ElMNJ=I2wVn;KTPni{XM7~3!lkat|Cy4hXT zcOH@-c$R0gZ#*k2Kj>t!{Gc;J&HU+8IIDH@5nQPqC4Tl;ze>7>#VPmn6Kh(nb7oL+N#U!!GDo7`rDO`b}I= zg_8X?S4w{^k&f49X)HEEaekW@)WWYV{qq{?7S29Z6Fw913lI>EqdQsy^1cd4wX^rFYC zf`??CZ}(*>4e?zGcds%GI`Stgx=5B)EvcBUP_>-LMY^M{)w^#MLiH3vL+T>D3#;U) zX|KWPl`^5ail`}{S5-c~{K05LOP*~mk4Y+wJRyb+8AxAzrtIL0u4ZTP#`jgG5gDrs zelq>L(oM-jQOF~{SNg8&h8?DlmAXgjE>mACHF-1|G4-xgdh%z;1G-RZYOUdrUo=sA z@@&M-ZQj^aku6|HXpOMoe9*eC~!|6O0%I7ok zdBnTNPN~V~5qF}B^Nd^`^2ohcPMpE#JePZ=hR=EZWm}Z(R>I`^hmwehvbr|;KH}a~tz$;Mk9^I1UL_#+M?C+Np8Oy2*wPrgV7-hQIMQkZ!S@R3%C5l? zp@5$38(N1`KwmnO1K+(>$Ut@kj?5G=lwCo)e5jC-j3Y-P1&n29Uc~_w6B=dEt+Z$#sJ28s3H?$}GOZGY zvZr(GghaC2a-{A&zt1DIKeSv~dFLPZ8c(eM$HURt`~OD6_We)KA}v;W0q#7N>M;BavXGY`_<1!i+Op-Y29FvMLs__FBVPhi4coTp z^LI_xAmrQ}?G^u@TxB#=?YDLCv;KZ!x2HCh9OsGAPL6BKxK)`W+WGY@o=7`MlJ6SL zB|WRiQ`WDGqQSfxFXnn-pt0L8^L)8ZJZdew)zw|LRt^5{G_X8j{$6EIf1H~iz43eR z^qRtiw~DdVdY;eo*b=Atsmtr;ya#xTdT65dzesIerb=?VSr?wXEB+`@+3d6UE-682 zFkZ%~$#S?hupzZ`Pm^KAIn_?k{)yo165!!ewe{%SUfFw~xHg z@9u0Vj>C@c&11zcVgm9*k!0?CYrW91NH??~U7MF9y~P~sFYByutXF1Qg0i@=&mut1 z?ZNf33n7-7gFlk0+ta{}F9W)ZwWV0i$rg#FE`m)K{6fX!`10#nXRuL$vdu`m@E_7)0vh9zNlBOl7ymu zCI4lSU6;QqQ*`Uo+pQ^A{=ag_Kc4EpU!*y09T#asQ&E0P7p}CqdmJ28x+fOt8J?r8 z&GY5uRU+ZsoQBPTeH5v3AH=#j`Ef1(wwiC_s?H#|=AZVL#l_{7#OXgTS(>cqH7tmg z>`L8waLJgwGtkYSawg%~X~(0|{Jc-+cX$xKDNTOQ&1uP)HCRdk&h3vh9N%BCCsa4j z2A9kUHOwzAxwFmEFfYBhY}`1+<&l0jXGsoOW0?pt&E;QBSGZ4K{=QDJ`1#Kv-FW-m zM}GOoU!FYw8IH&2_kV}&^B>P570n-af2)rx#`2*I{TA@Q|Kn1_n855`c(P!TC(`(Z zB%AJV@bEU-f_p59oL|S7NaQ`kb+X$f+w#hJ#lGWEU4nA^Cmu*BCDVJiO|L)QZ)jJ& zNP1d>RHdVJ5zTT}FZdm6hnLbJQ*R>Q7BcBMVQ$VSt=(y^T(1)X$3hD#!Q(sm+v@)Y1V1mBUVcP8wNP_sks8ai%?Z z*sU1_j_5kG?j%&oi+7ou*eigyk+BC!z>82_j#)7JFGpJ`(xlzm2LxJZ3LnCqexCn(C zHx}*{xi~;DgHtdiJ;DjP&{g#>*89@S(#^iC3J~;=>!>N$S7gygfJZ#QoCo3r1B9+? z$19G96AV#^p)$(S`H30f1c+!*kXs96Rlhf6az1NZ*CtXq5r!5f8to>wh49 zANszoryemKKyNhJ8R>`64~r!EO(B>e1i}cx z8`2{L!U(}z(jx@I2*G!xM+k%w0vZ8l2!Sv{5Ro1s5Jm{TBu~!}0%3&UJ6std5Jm{5 zNP!p#BL;5)APB-Y0htDI5Jnv88@|pA@eoEl-jN>h5Jo)eo7~O}aS=vbsA0_z7h%NZ z9sGm92qQ4>1Vtu9WKP4?iIe1nh)bY#@N3c{DnXBH?@5c81bwch(I!Mh0)r8@?|uFT5~bJP7{rx)?7S?H3s;J=3^{xA|GmB zS4(@0?-R|>teHmvP|e>Dq@6;m`I|NIXa-dCJ2jLjWQ(FlW}OpZ4wz_;e~7UYHTl24 z#r|*5JOBP4soMSDGsug^4PeCuZrb{tHhwR##yxtAZ7kmuAfMyQv!r_Z5qq_GE_Z;g z8zgvSy;KjqCy{ zK_QuCe%CdYmJ%CCY@lIw#xxeo4Q4fK8mq>pyclyD3+o0mgFTHsm}YsIL5*F)$q71( z8ha)8Y_lZMfkX!eYG+epQ_*NxGpezpY0i(as@2-QnOTk9V`D}JyBedoVSAZjjcuY^ z?-QjSENhn08PggI8x5=3)>z$WP|di;H0c`iq{O7}1HJv#%xkP`^n%pvYfRG`Rx_}% zbkd-jg^g)kgBTMVDEaZu}adgnyHO>Tz6y5*2XGI!)nGhmQos2v$nCG(&MS1p@ekj*X(VqM>U8sxUmS< zu$sk<6^&kwGbT5dLV67qq(Y|;Nj0Mz%P~FUn$?Ykl7`jHZY?{Y{%h1Fae0 z*xVZ+V}W;snJ;64V|Q+#H5(jTbOWpz;n=5}`6^I$NivKHe*66Ivxw#WzaRYz5Krv?dz~}>|DfA#`Tx%%4X@3OUVRmw zUfiI+8siteM7Mp5aQhbF_ASDHp0^0M@<$au|I6=6JpcFqI=#`^`@edlaXbG%hp3q2 ze0!C|Ag9Zh{mGI0Cwz$H<%=_m|9Wqdc:/stats`. - * Available web video players (based on [video.js](https://videojs.com/) and [hls.js](https://github.com/video-dev/hls.js/)) at `/usr/share/nginx/html/players`. - -## Usage - -### To run the server -``` -docker run -d -p 1935:1935 -p 8080:8080 epicmorg/balancer:rtmp-hls -``` - -To run with custom conf file: -``` -docker run -d -p 1935:1935 -p 8080:8080 -v custom.conf:/etc/nginx/nginx.conf epicmorg/balancer:rtmp-hls -``` -where `custom.conf` is the new conf file for Nginx. - -### To stream to the server - * **Stream live RTMP content to:** - ``` - rtmp://:1935/live/ - ``` - where `` is any stream key you specify. - - * **Configure [OBS](https://obsproject.com/) to stream content:**
-Go to Settings > Stream, choose the following settings: - * Service: Custom Streaming Server. - * Server: `rtmp://:1935/live`. - * Stream key: anything you want, however provided video players assume stream key is `test` - -### To view the stream - * **Using [VLC](https://www.videolan.org/vlc/index.html):** - * Go to Media > Open Network Stream. - * Enter the streaming URL: `rtmp://:1935/live/` - Replace `` with the IP of where the server is running, and - `` with the stream key you used when setting up the stream. - * For HLS and DASH, the URLs are of the forms: - `http://:8080/hls/.m3u8` and - `http://:8080/dash/_src.mpd` respectively. - * Click Play. - -* **Using provided web players:**
-The provided demo players assume the stream-key is called `test` and the player is opened in localhost. - * To play RTMP content (requires Flash): `http://localhost:8080/players/rtmp.html` - * To play HLS content: `http://localhost:8080/players/hls.html` - * To play HLS content using hls.js library: `http://localhost:8080/players/hls_hlsjs.html` - * To play DASH content: `http://localhost:8080/players/dash.html` - * To play RTMP and HLS contents on the same page: `http://localhost:8080/players/rtmp_hls.html` - - **Notes:** - - * These web players are hardcoded to play stream key "test" at localhost. - * To change the stream source for these players. Download the html files and modify the `src` attribute in the video tag in the html file. You can then mount the modified files to the container as follows: - ``` - docker run -d -p 1935:1935 -p 8080:8080 -v custom_players:/usr/share/nginx/html/players epicmorg/balancer:rtmp-hls - ``` - where `custom_players` is the directory holding the modified html files. - - diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx.conf deleted file mode 100644 index 938da01e2..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx.conf +++ /dev/null @@ -1,134 +0,0 @@ -load_module "/usr/lib/nginx/modules/ngx_rtmp_module.so"; - -worker_processes auto; -#error_log logs/error.log; - -events { - worker_connections 1024; -} - -# RTMP configuration -rtmp { - server { - listen 1935; # Listen on standard RTMP port - chunk_size 4000; - # ping 30s; - # notify_method get; - - # This application is to accept incoming stream - application live { - live on; # Allows live input - - # for each received stream, transcode for adaptive streaming - # This single ffmpeg command takes the input and transforms - # the source into 4 different streams with different bitrates - # and qualities. # these settings respect the aspect ratio. - exec_push /usr/bin/ffmpeg -i rtmp://localhost:1935/$app/$name -async 1 -vsync -1 - -c:v libx264 -c:a aac -b:v 256k -b:a 64k -vf "scale=480:trunc(ow/a/2)*2" -tune zerolatency -preset superfast -crf 23 -f flv rtmp://localhost:1935/show/$name_low - -c:v libx264 -c:a aac -b:v 768k -b:a 128k -vf "scale=720:trunc(ow/a/2)*2" -tune zerolatency -preset superfast -crf 23 -f flv rtmp://localhost:1935/show/$name_mid - -c:v libx264 -c:a aac -b:v 1024k -b:a 128k -vf "scale=960:trunc(ow/a/2)*2" -tune zerolatency -preset superfast -crf 23 -f flv rtmp://localhost:1935/show/$name_high - -c:v libx264 -c:a aac -b:v 1920k -b:a 128k -vf "scale=1280:trunc(ow/a/2)*2" -tune zerolatency -preset superfast -crf 23 -f flv rtmp://localhost:1935/show/$name_hd720 - -c copy -f flv rtmp://localhost:1935/show/$name_src; - } - - # This is the HLS application - application show { - live on; # Allows live input from above application - deny play all; # disable consuming the stream from nginx as rtmp - - hls on; # Enable HTTP Live Streaming - hls_fragment 3; - hls_playlist_length 20; - hls_path /mnt/hls/; # hls fragments path - # Instruct clients to adjust resolution according to bandwidth - hls_variant _src BANDWIDTH=4096000; # Source bitrate, source resolution - hls_variant _hd720 BANDWIDTH=2048000; # High bitrate, HD 720p resolution - hls_variant _high BANDWIDTH=1152000; # High bitrate, higher-than-SD resolution - hls_variant _mid BANDWIDTH=448000; # Medium bitrate, SD resolution - hls_variant _low BANDWIDTH=288000; # Low bitrate, sub-SD resolution - - # MPEG-DASH - dash on; - dash_path /mnt/dash/; # dash fragments path - dash_fragment 3; - dash_playlist_length 20; - } - } -} - - -http { - include /etc/nginx/sites-enabled/*.conf; - sendfile off; - tcp_nopush on; - directio 512; - # aio on; - - # HTTP server required to serve the player and HLS fragments - server { - listen 8080; - - # Serve HLS fragments - location /hls { - types { - application/vnd.apple.mpegurl m3u8; - video/mp2t ts; - } - - root /mnt; - - add_header Cache-Control no-cache; # Disable cache - - # CORS setup - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Expose-Headers' 'Content-Length'; - - # allow CORS preflight requests - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - add_header 'Content-Length' 0; - return 204; - } - } - - # Serve DASH fragments - location /dash { - types { - application/dash+xml mpd; - video/mp4 mp4; - } - - root /mnt; - - add_header Cache-Control no-cache; # Disable cache - - - # CORS setup - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Expose-Headers' 'Content-Length'; - - # Allow CORS preflight requests - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - add_header 'Content-Length' 0; - return 204; - } - } - - # This URL provides RTMP statistics in XML - location /stat { - rtmp_stat all; - rtmp_stat_stylesheet stat.xsl; # Use stat.xsl stylesheet - } - - location /stat.xsl { - # XML stylesheet to view RTMP stats. - root /usr/share/nginx/html; - } - - } -} \ No newline at end of file diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx_no-ffmpeg.conf deleted file mode 100644 index 99644e14f..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx_no-ffmpeg.conf +++ /dev/null @@ -1,118 +0,0 @@ -load_module "/usr/lib/nginx/modules/ngx_rtmp_module.so"; - -worker_processes auto; -#error_log logs/error.log; - -events { - worker_connections 1024; -} - -# RTMP configuration -rtmp { - server { - listen 1935; # Listen on standard RTMP port - chunk_size 4000; - # ping 30s; - # notify_method get; - - # This application is to accept incoming stream - application live { - live on; # Allows live input - push rtmp://localhost:1935/show; - } - - # This is the HLS application - application show { - live on; # Allows live input from above application - deny play all; # disable consuming the stream from nginx as rtmp - - hls on; # Enable HTTP Live Streaming - hls_fragment 3; - hls_playlist_length 10; - hls_path /mnt/hls/; # hls fragments path - - # MPEG-DASH - dash on; - dash_path /mnt/dash/; # dash fragments path - dash_fragment 3; - dash_playlist_length 10; - } - } -} - - -http { - include /etc/nginx/sites-enabled/*.conf; - sendfile off; - tcp_nopush on; - directio 512; - # aio on; - - # HTTP server required to serve the player and HLS fragments - server { - listen 8080; - - # Serve HLS fragments - location /hls { - types { - application/vnd.apple.mpegurl m3u8; - video/mp2t ts; - } - - root /mnt; - - add_header Cache-Control no-cache; # Disable cache - - # CORS setup - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Expose-Headers' 'Content-Length'; - - # allow CORS preflight requests - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - add_header 'Content-Length' 0; - return 204; - } - } - - # Serve DASH fragments - location /dash { - types { - application/dash+xml mpd; - video/mp4 mp4; - } - - root /mnt; - - add_header Cache-Control no-cache; # Disable cache - - - # CORS setup - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Expose-Headers' 'Content-Length'; - - # Allow CORS preflight requests - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - add_header 'Content-Length' 0; - return 204; - } - } - - # This URL provides RTMP statistics in XML - location /stat { - rtmp_stat all; - rtmp_stat_stylesheet stat.xsl; # Use stat.xsl stylesheet - } - - location /stat.xsl { - # XML stylesheet to view RTMP stats. - root /usr/share/nginx/html; - } - - } -} \ No newline at end of file diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf deleted file mode 100644 index 780a1d1ff..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf +++ /dev/null @@ -1,16 +0,0 @@ -load_module "/usr/lib/nginx/modules/ngx_rtmp_module.so"; - -worker_processes auto; -rtmp_auto_push on; -events {} -rtmp { - server { - listen 1935; - listen [::]:1935; - - application live { - live on; - record off; - } - } -} \ No newline at end of file diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/latest/quic/rtmp-hls/docker-compose.yml deleted file mode 100644 index e03d8012c..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -services: - app: - image: "quay.io/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/ecosystem/nginx/latest/quic/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/dash.html deleted file mode 100644 index 12b8df786..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/dash.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - DASH Live Streaming - - - - -

DASH Player

- - - - - - - diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/hls.html deleted file mode 100644 index 15d95b4c1..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/hls.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - HLS Live Streaming - - - - -

HLS Player

- - - - - - - diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/hls_hlsjs.html deleted file mode 100644 index 0237e7a52..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/hls_hlsjs.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - HLS streaming - - - - - - - - - - -

HLS Player (using hls.js)

- -
-
- -
-
- - - - - - - diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/rtmp.html deleted file mode 100644 index d8ce85610..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/rtmp.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - RTMP Live Streaming - Live Streaming - - - - - - - -

RTMP Player

- - - - - diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/rtmp_hls.html deleted file mode 100644 index 35617e913..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/players/rtmp_hls.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - Live Streaming - - - - - - - - -

RTMP Player

- - -

HLS Player

- - - - - diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.buster.list deleted file mode 100644 index 412c35d1a..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.buster.list +++ /dev/null @@ -1,19 +0,0 @@ -#main -deb http://httpredir.debian.org/debian/ buster main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster main contrib non-free -deb http://httpredir.debian.org/debian/ buster-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster-updates main contrib non-free -deb http://httpredir.debian.org/debian/ buster-backports main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster-backports main contrib non-free -deb http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free - -#security -deb http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ buster main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ buster main non-free -#deb http://httpredir.debian.org/debian-multimedia/ buster-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ buster-backports main diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.sid.list deleted file mode 100644 index 465c737af..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.sid.list +++ /dev/null @@ -1,19 +0,0 @@ -#main -deb http://httpredir.debian.org/debian/ sid main contrib non-free -deb-src http://httpredir.debian.org/debian/ sid main contrib non-free -deb http://httpredir.debian.org/debian/ testing-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ testing-updates main contrib non-free -deb http://httpredir.debian.org/debian/ testing-proposed-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ testing-proposed-updates main contrib non-free - -#backports -#deb http://httpredir.debian.org/debian/ testing-backports main contrib non-free -#deb-src http://httpredir.debian.org/debian/ testing-backports main contrib non-free - -#security -deb http://httpredir.debian.org/debian-security/ testing-security main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ testing-security main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ sid main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ sid main non-free diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.stretch.list deleted file mode 100644 index 617bf9bb6..000000000 --- a/linux/ecosystem/nginx/latest/quic/rtmp-hls/sources.list.d/sources.stretch.list +++ /dev/null @@ -1,19 +0,0 @@ -#main -deb http://httpredir.debian.org/debian/ stretch main contrib non-free -deb-src http://httpredir.debian.org/debian/ stretch main contrib non-free -deb http://httpredir.debian.org/debian/ stretch-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ stretch-updates main contrib non-free -deb http://httpredir.debian.org/debian/ stretch-backports main contrib non-free -deb-src http://httpredir.debian.org/debian/ stretch-backports main contrib non-free -deb http://httpredir.debian.org/debian/ stretch-proposed-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ stretch-proposed-updates main contrib non-free - -#security -deb http://httpredir.debian.org/debian-security/ stretch/updates main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ stretch/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ stretch main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ stretch main non-free -#deb http://httpredir.debian.org/debian-multimedia/ stretch-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ stretch-backports main diff --git a/linux/ecosystem/nginx/latest/mainline/main/.env b/linux/obsolete/nginx/latest/mainline/main/.env similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/.env rename to linux/obsolete/nginx/latest/mainline/main/.env diff --git a/linux/ecosystem/nginx/latest/mainline/main/Dockerfile b/linux/obsolete/nginx/latest/mainline/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/Dockerfile rename to linux/obsolete/nginx/latest/mainline/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.27.0/main/Makefile b/linux/obsolete/nginx/latest/mainline/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.27.0/main/Makefile rename to linux/obsolete/nginx/latest/mainline/main/Makefile diff --git a/linux/ecosystem/nginx/1.28.0/main/README.md b/linux/obsolete/nginx/latest/mainline/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/README.md rename to linux/obsolete/nginx/latest/mainline/main/README.md diff --git a/linux/ecosystem/nginx/latest/mainline/main/docker-compose.yml b/linux/obsolete/nginx/latest/mainline/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/docker-compose.yml rename to linux/obsolete/nginx/latest/mainline/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/latest/mainline/php/docker-entrypoint.sh b/linux/obsolete/nginx/latest/mainline/main/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/docker-entrypoint.sh rename to linux/obsolete/nginx/latest/mainline/main/docker-entrypoint.sh diff --git a/linux/ecosystem/nginx/1.21.6/main/pre/ip2location-description-pak b/linux/obsolete/nginx/latest/mainline/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.6/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/latest/mainline/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.21.6/main/pre/luajit2-description-pak b/linux/obsolete/nginx/latest/mainline/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.6/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/latest/mainline/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.21.6/main/pre/nginx-description-pak b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21.6/main/pre/nginx-description-pak rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/default/nginx b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/default/nginx new file mode 100644 index 000000000..09b8fd0a7 --- /dev/null +++ b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/default/nginx @@ -0,0 +1,10 @@ +# Note: You may want to look at the following page before setting the ULIMIT. +# http://wiki.nginx.org/CoreModule#worker_rlimit_nofile +# Set the ulimit variable if you need defaults to change. +# Example: ULIMIT="-n 4096" +#ULIMIT="-n 4096" + +# Define the stop schedule for nginx +# see the start-stop-daemon --retry documentation for more information +# +#STOP_SCHEDULE="QUIT/5/TERM/5/KILL/5" diff --git a/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/init.d/nginx b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/init.d/nginx new file mode 100644 index 000000000..db10b7df0 --- /dev/null +++ b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/init.d/nginx @@ -0,0 +1,196 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: nginx +# Required-Start: $local_fs $remote_fs $network $syslog $named +# Required-Stop: $local_fs $remote_fs $network $syslog $named +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: starts the nginx web server +# Description: starts nginx using start-stop-daemon +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/nginx +NAME=nginx +DESC=nginx + +# Include nginx defaults if available +if [ -r /etc/default/nginx ]; then + . /etc/default/nginx +fi + +STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/5/KILL/5}" + +test -x $DAEMON || exit 0 + +. /lib/init/vars.sh +. /lib/lsb/init-functions + +# Try to extract nginx pidfile +PID=$(cat /etc/nginx/nginx.conf | grep -Ev '^\s*#' | awk 'BEGIN { RS="[;{}]" } { if ($1 == "pid") print $2 }' | head -n1) +if [ -z "$PID" ]; then + PID=/run/nginx.pid +fi + +if [ -n "$ULIMIT" ]; then + # Set ulimit if it is set in /etc/default/nginx + ulimit $ULIMIT +fi + +start_nginx() { + # Start the daemon/service + # + # Returns: + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON -- \ + $DAEMON_OPTS 2>/dev/null \ + || return 2 +} + +test_config() { + # Test the nginx configuration + $DAEMON -t $DAEMON_OPTS >/dev/null 2>&1 +} + +stop_nginx() { + # Stops the daemon/service + # + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=$STOP_SCHEDULE --pidfile $PID --name $NAME + RETVAL="$?" + sleep 1 + return "$RETVAL" +} + +reload_nginx() { + # Function that sends a SIGHUP to the daemon/service + start-stop-daemon --stop --signal HUP --quiet --pidfile $PID --name $NAME + return 0 +} + +rotate_logs() { + # Rotate log files + start-stop-daemon --stop --signal USR1 --quiet --pidfile $PID --name $NAME + return 0 +} + +upgrade_nginx() { + # Online upgrade nginx executable + # http://nginx.org/en/docs/control.html + # + # Return + # 0 if nginx has been successfully upgraded + # 1 if nginx is not running + # 2 if the pid files were not created on time + # 3 if the old master could not be killed + if start-stop-daemon --stop --signal USR2 --quiet --pidfile $PID --name $NAME; then + # Wait for both old and new master to write their pid file + while [ ! -s "${PID}.oldbin" ] || [ ! -s "${PID}" ]; do + cnt=`expr $cnt + 1` + if [ $cnt -gt 10 ]; then + return 2 + fi + sleep 1 + done + # Everything is ready, gracefully stop the old master + if start-stop-daemon --stop --signal QUIT --quiet --pidfile "${PID}.oldbin" --name $NAME; then + return 0 + else + return 3 + fi + else + return 1 + fi +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + start_nginx + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + stop_nginx + case "$?" in + 0|1) log_end_msg 0 ;; + 2) log_end_msg 1 ;; + esac + ;; + restart) + log_daemon_msg "Restarting $DESC" "$NAME" + + # Check configuration before stopping nginx + if ! test_config; then + log_end_msg 1 # Configuration error + exit $? + fi + + stop_nginx + case "$?" in + 0|1) + start_nginx + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + reload|force-reload) + log_daemon_msg "Reloading $DESC configuration" "$NAME" + + # Check configuration before stopping nginx + # + # This is not entirely correct since the on-disk nginx binary + # may differ from the in-memory one, but that's not common. + # We prefer to check the configuration and return an error + # to the administrator. + if ! test_config; then + log_end_msg 1 # Configuration error + exit $? + fi + + reload_nginx + log_end_msg $? + ;; + configtest|testconfig) + log_daemon_msg "Testing $DESC configuration" + test_config + log_end_msg $? + ;; + status) + status_of_proc -p $PID "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + upgrade) + log_daemon_msg "Upgrading binary" "$NAME" + upgrade_nginx + log_end_msg $? + ;; + rotate) + log_daemon_msg "Re-opening $DESC log files" "$NAME" + rotate_logs + log_end_msg $? + ;; + *) + echo "Usage: $NAME {start|stop|restart|reload|force-reload|status|configtest|rotate|upgrade}" >&2 + exit 3 + ;; +esac diff --git a/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/logrotate.d/nginx b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/logrotate.d/nginx new file mode 100644 index 000000000..423c6ad18 --- /dev/null +++ b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/logrotate.d/nginx @@ -0,0 +1,18 @@ +/var/log/nginx/*.log { + daily + missingok + rotate 14 + compress + delaycompress + notifempty + create 0640 www-data adm + sharedscripts + prerotate + if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ + run-parts /etc/logrotate.d/httpd-prerotate; \ + fi \ + endscript + postrotate + invoke-rc.d nginx rotate >/dev/null 2>&1 + endscript +} diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi.conf b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi.conf rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi.conf diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi_params b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi_params similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi_params rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/fastcgi_params diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-utf b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-utf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-utf rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-utf diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-win b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-win similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-win rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/koi-win diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/mime.types b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/mime.types similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/mime.types rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/mime.types diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/nginx.conf b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/nginx.conf rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/nginx.conf diff --git a/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/proxy_params b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/proxy_params new file mode 100644 index 000000000..df75bc5d7 --- /dev/null +++ b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/proxy_params @@ -0,0 +1,4 @@ +proxy_set_header Host $http_host; +proxy_set_header X-Real-IP $remote_addr; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/scgi_params b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/scgi_params similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/scgi_params rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/scgi_params diff --git a/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/sites-available/default b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/sites-available/default new file mode 100644 index 000000000..f5c5e1b78 --- /dev/null +++ b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/sites-available/default @@ -0,0 +1,91 @@ +## +# You should look at the following URL's in order to grasp a solid understanding +# of Nginx configuration files in order to fully unleash the power of Nginx. +# https://www.nginx.com/resources/wiki/start/ +# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/ +# https://wiki.debian.org/Nginx/DirectoryStructure +# +# In most cases, administrators will remove this file from sites-enabled/ and +# leave it as reference inside of sites-available where it will continue to be +# updated by the nginx packaging team. +# +# This file will automatically load configuration files provided by other +# applications, such as Drupal or Wordpress. These applications will be made +# available underneath a path with that package name, such as /drupal8. +# +# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. +## + +# Default server configuration +# +server { + listen 80 default_server; + listen [::]:80 default_server; + + # SSL configuration + # + # listen 443 ssl default_server; + # listen [::]:443 ssl default_server; + # + # Note: You should disable gzip for SSL traffic. + # See: https://bugs.debian.org/773332 + # + # Read up on ssl_ciphers to ensure a secure configuration. + # See: https://bugs.debian.org/765782 + # + # Self signed certs generated by the ssl-cert package + # Don't use them in a production server! + # + # include snippets/snakeoil.conf; + + root /var/www/html; + + # Add index.php to the list if you are using PHP + index index.html index.htm index.nginx-debian.html; + + server_name _; + + location / { + # First attempt to serve request as file, then + # as directory, then fall back to displaying a 404. + try_files $uri $uri/ =404; + } + + # pass PHP scripts to FastCGI server + # + #location ~ \.php$ { + # include snippets/fastcgi-php.conf; + # + # # With php-fpm (or other unix sockets): + # fastcgi_pass unix:/run/php/php7.3-fpm.sock; + # # With php-cgi (or other tcp sockets): + # fastcgi_pass 127.0.0.1:9000; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + + +# Virtual Host configuration for example.com +# +# You can move that to a different file under sites-available/ and symlink that +# to sites-enabled/ to enable it. +# +#server { +# listen 80; +# listen [::]:80; +# +# server_name example.com; +# +# root /var/www/example.com; +# index index.html; +# +# location / { +# try_files $uri $uri/ =404; +# } +#} diff --git a/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/fastcgi-php.conf b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/fastcgi-php.conf new file mode 100644 index 000000000..467a9e732 --- /dev/null +++ b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/fastcgi-php.conf @@ -0,0 +1,13 @@ +# regex to split $uri to $fastcgi_script_name and $fastcgi_path +fastcgi_split_path_info ^(.+?\.php)(/.*)$; + +# Check that the PHP script exists before passing it +try_files $fastcgi_script_name =404; + +# Bypass the fact that try_files resets $fastcgi_path_info +# see: http://trac.nginx.org/nginx/ticket/321 +set $path_info $fastcgi_path_info; +fastcgi_param PATH_INFO $path_info; + +fastcgi_index index.php; +include fastcgi.conf; diff --git a/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/snakeoil.conf b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/snakeoil.conf new file mode 100644 index 000000000..ad26c3e21 --- /dev/null +++ b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/snippets/snakeoil.conf @@ -0,0 +1,5 @@ +# Self signed certificates generated by the ssl-cert package +# Don't use them in a production server! + +ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; +ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/uwsgi_params b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/uwsgi_params similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/uwsgi_params rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/uwsgi_params diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/win-utf b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/win-utf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/win-utf rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/nginx/win-utf diff --git a/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/ufw/applications.d/nginx b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/ufw/applications.d/nginx new file mode 100644 index 000000000..0cb044972 --- /dev/null +++ b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/etc/ufw/applications.d/nginx @@ -0,0 +1,14 @@ +[Nginx HTTP] +title=Web Server (Nginx, HTTP) +description=Small, but very powerful and efficient web server +ports=80/tcp + +[Nginx HTTPS] +title=Web Server (Nginx, HTTPS) +description=Small, but very powerful and efficient web server +ports=443/tcp + +[Nginx Full] +title=Web Server (Nginx, HTTP + HTTPS) +description=Small, but very powerful and efficient web server +ports=80,443/tcp diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/lib.masked/systemd/system/nginx.service b/linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/lib.masked/systemd/system/nginx.service similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-pre/lib.masked/systemd/system/nginx.service rename to linux/obsolete/nginx/latest/mainline/main/pre/nginx-pre/lib.masked/systemd/system/nginx.service diff --git a/linux/ecosystem/nginx/1.21.6/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/latest/mainline/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.21.6/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/latest/mainline/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/latest/mainline/php/.env b/linux/obsolete/nginx/latest/mainline/php/.env similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/.env rename to linux/obsolete/nginx/latest/mainline/php/.env diff --git a/linux/ecosystem/nginx/latest/mainline/php/Dockerfile b/linux/obsolete/nginx/latest/mainline/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/Dockerfile rename to linux/obsolete/nginx/latest/mainline/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.28.0/main/Makefile b/linux/obsolete/nginx/latest/mainline/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.28.0/main/Makefile rename to linux/obsolete/nginx/latest/mainline/php/Makefile diff --git a/linux/ecosystem/nginx/latest/mainline/main/README.md b/linux/obsolete/nginx/latest/mainline/php/README.md similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/README.md rename to linux/obsolete/nginx/latest/mainline/php/README.md diff --git a/linux/ecosystem/nginx/latest/mainline/php/addons/multiarch-support_2.28_amd64.deb b/linux/obsolete/nginx/latest/mainline/php/addons/multiarch-support_2.28_amd64.deb similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/addons/multiarch-support_2.28_amd64.deb rename to linux/obsolete/nginx/latest/mainline/php/addons/multiarch-support_2.28_amd64.deb diff --git a/linux/ecosystem/nginx/1.21.6/php/docker-compose.yml b/linux/obsolete/nginx/latest/mainline/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.6/php/docker-compose.yml rename to linux/obsolete/nginx/latest/mainline/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/docker-entrypoint.sh b/linux/obsolete/nginx/latest/mainline/php/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/docker-entrypoint.sh rename to linux/obsolete/nginx/latest/mainline/php/docker-entrypoint.sh diff --git a/linux/ecosystem/nginx/latest/mainline/php/usr/lib/php/20190902/cassandra.so b/linux/obsolete/nginx/latest/mainline/php/usr/lib/php/20190902/cassandra.so similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/usr/lib/php/20190902/cassandra.so rename to linux/obsolete/nginx/latest/mainline/php/usr/lib/php/20190902/cassandra.so diff --git a/linux/ecosystem/nginx/latest/mainline/php/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so b/linux/obsolete/nginx/latest/mainline/php/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so rename to linux/obsolete/nginx/latest/mainline/php/usr/lib/php/20190902/phpBolt-extension-1.0.4-php74.so diff --git a/linux/ecosystem/nginx/latest/mainline/php/usr/lib/php/20210902/cassandra.so b/linux/obsolete/nginx/latest/mainline/php/usr/lib/php/20210902/cassandra.so similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/usr/lib/php/20210902/cassandra.so rename to linux/obsolete/nginx/latest/mainline/php/usr/lib/php/20210902/cassandra.so diff --git a/linux/ecosystem/nginx/latest/mainline/php/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so b/linux/obsolete/nginx/latest/mainline/php/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so rename to linux/obsolete/nginx/latest/mainline/php/usr/lib/php/20210902/phpBolt-extension-1.0.4-php81.so diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/.env b/linux/obsolete/nginx/latest/mainline/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/.env rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/Dockerfile b/linux/obsolete/nginx/latest/mainline/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/latest/mainline/main/Makefile b/linux/obsolete/nginx/latest/mainline/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/Makefile rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/README.md b/linux/obsolete/nginx/latest/mainline/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/README.md rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/latest/mainline/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/latest/mainline/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/latest/mainline/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/latest/mainline/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/latest/quic/main/docker-entrypoint.sh b/linux/obsolete/nginx/latest/mainline/rtmp-hls/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/latest/quic/main/docker-entrypoint.sh rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/docker-entrypoint.sh diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/players/dash.html b/linux/obsolete/nginx/latest/mainline/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/players/hls.html b/linux/obsolete/nginx/latest/mainline/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/latest/mainline/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/latest/mainline/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/latest/mainline/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/latest/quic/main/.env b/linux/obsolete/nginx/latest/quic/main/.env similarity index 100% rename from linux/ecosystem/nginx/latest/quic/main/.env rename to linux/obsolete/nginx/latest/quic/main/.env diff --git a/linux/ecosystem/nginx/latest/quic/main/Dockerfile b/linux/obsolete/nginx/latest/quic/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/latest/quic/main/Dockerfile rename to linux/obsolete/nginx/latest/quic/main/Dockerfile diff --git a/linux/ecosystem/nginx/latest/quic/main/Dockerfile.test b/linux/obsolete/nginx/latest/quic/main/Dockerfile.test similarity index 100% rename from linux/ecosystem/nginx/latest/quic/main/Dockerfile.test rename to linux/obsolete/nginx/latest/quic/main/Dockerfile.test diff --git a/linux/ecosystem/nginx/latest/mainline/php/Makefile b/linux/obsolete/nginx/latest/quic/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/Makefile rename to linux/obsolete/nginx/latest/quic/main/Makefile diff --git a/linux/ecosystem/nginx/latest/quic/main/README.md b/linux/obsolete/nginx/latest/quic/main/README.md similarity index 100% rename from linux/ecosystem/nginx/latest/quic/main/README.md rename to linux/obsolete/nginx/latest/quic/main/README.md diff --git a/linux/ecosystem/nginx/1.21.6/main/docker-compose.yml b/linux/obsolete/nginx/latest/quic/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21.6/main/docker-compose.yml rename to linux/obsolete/nginx/latest/quic/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/latest/quic/php/docker-entrypoint.sh b/linux/obsolete/nginx/latest/quic/main/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/latest/quic/php/docker-entrypoint.sh rename to linux/obsolete/nginx/latest/quic/main/docker-entrypoint.sh diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/ip2location-description-pak b/linux/obsolete/nginx/latest/quic/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/latest/quic/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/luajit2-description-pak b/linux/obsolete/nginx/latest/quic/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/latest/quic/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/nginx-description-pak b/linux/obsolete/nginx/latest/quic/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/nginx-description-pak rename to linux/obsolete/nginx/latest/quic/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/latest/mainline/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/latest/quic/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/latest/quic/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/latest/quic/php/.env b/linux/obsolete/nginx/latest/quic/php/.env similarity index 100% rename from linux/ecosystem/nginx/latest/quic/php/.env rename to linux/obsolete/nginx/latest/quic/php/.env diff --git a/linux/ecosystem/nginx/latest/quic/php/Dockerfile b/linux/obsolete/nginx/latest/quic/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/latest/quic/php/Dockerfile rename to linux/obsolete/nginx/latest/quic/php/Dockerfile diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/Makefile b/linux/obsolete/nginx/latest/quic/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/Makefile rename to linux/obsolete/nginx/latest/quic/php/Makefile diff --git a/linux/ecosystem/nginx/latest/mainline/php/README.md b/linux/obsolete/nginx/latest/quic/php/README.md similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/README.md rename to linux/obsolete/nginx/latest/quic/php/README.md diff --git a/linux/ecosystem/nginx/latest/mainline/php/docker-compose.yml b/linux/obsolete/nginx/latest/quic/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/php/docker-compose.yml rename to linux/obsolete/nginx/latest/quic/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/docker-entrypoint.sh b/linux/obsolete/nginx/latest/quic/php/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from linux/ecosystem/nginx/latest/quic/rtmp-hls/docker-entrypoint.sh rename to linux/obsolete/nginx/latest/quic/php/docker-entrypoint.sh diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/.env b/linux/obsolete/nginx/latest/quic/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/latest/quic/rtmp-hls/.env rename to linux/obsolete/nginx/latest/quic/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/latest/quic/rtmp-hls/Dockerfile b/linux/obsolete/nginx/latest/quic/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/latest/quic/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/latest/quic/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/latest/quic/main/Makefile b/linux/obsolete/nginx/latest/quic/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/latest/quic/main/Makefile rename to linux/obsolete/nginx/latest/quic/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/README.md b/linux/obsolete/nginx/latest/quic/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/README.md rename to linux/obsolete/nginx/latest/quic/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/latest/quic/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/latest/quic/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/latest/quic/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/latest/quic/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/latest/quic/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/latest/quic/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/latest/quic/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/latest/quic/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/latest/quic/rtmp-hls/docker-entrypoint.sh b/linux/obsolete/nginx/latest/quic/rtmp-hls/docker-entrypoint.sh new file mode 100644 index 000000000..9ebcd6a91 --- /dev/null +++ b/linux/obsolete/nginx/latest/quic/rtmp-hls/docker-entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +if [[ -z "${FIX_WWW_DATA}" ]]; then + echo "[nginx] env FIX_WWW_DATA is not set. Skipping..." +elif [ "${FIX_WWW_DATA}" == "false" ]; then + echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..." +elif [ "${FIX_WWW_DATA}" == "true" ]; then + echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait." + chown www-data:www-data /var/www -R + echo "[nginx] Done" +else + echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..." +fi + +echo "[nginx] Starting up" +nginx -g 'daemon off;' diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/dash.html b/linux/obsolete/nginx/latest/quic/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/latest/quic/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/hls.html b/linux/obsolete/nginx/latest/quic/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/latest/quic/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/latest/quic/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/latest/quic/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/latest/quic/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/latest/quic/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/latest/quic/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/latest/quic/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/latest/quic/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/latest/quic/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/latest/quic/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/latest/mainline/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/latest/quic/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.21.6/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/latest/quic/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.21.6/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/latest/quic/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/links.txt b/linux/obsolete/nginx/links.txt similarity index 100% rename from linux/ecosystem/nginx/links.txt rename to linux/obsolete/nginx/links.txt From e23dc209799faa5154c95bf5a183f1414868ec16 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 28 Apr 2025 19:20:59 +0300 Subject: [PATCH 02/12] readme + nginx gha --- .../epicmorg.ecosystem.images.nginx.yml | 85 +++++++++++++++++++ CHANGELOG.md | 1 + README.md | 1 + 3 files changed, 87 insertions(+) create mode 100644 .github/workflows/epicmorg.ecosystem.images.nginx.yml diff --git a/.github/workflows/epicmorg.ecosystem.images.nginx.yml b/.github/workflows/epicmorg.ecosystem.images.nginx.yml new file mode 100644 index 000000000..e82ce0c2a --- /dev/null +++ b/.github/workflows/epicmorg.ecosystem.images.nginx.yml @@ -0,0 +1,85 @@ +name: EpicMorg EcoSystem nginx Images + +on: + workflow_dispatch: + schedule: + - cron: '2 20 * * 1,3,5' + +jobs: + build-nginx-images: + name: Build nginx ${{ matrix.version }} + runs-on: [ ubuntu-24.04 ] + strategy: + matrix: + version: [ + '1.26', '1.27', '1.28', + ] + + steps: + - uses: actions/checkout@v4 + with: + clean: true + show-progress: true + submodules: true + + - name: Log into docker registry + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin + + + - name: Log into Quay.IO registry + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: echo "${{ secrets.QUAY_SERVER_KEY }}" | docker login -u "${{ secrets.QUAY_SERVER_LOGIN }}" --password-stdin "${{ secrets.QUAY_SERVER_URL }}" + + + - name: Check buildah + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: buildah --version + + + - name: Test Make + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make + + + - name: Install requirements.txt + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make pip + + + - name: Build and Deploy nginx ${{ matrix.version }} Main Image + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: cd linux/ecosystem/nginx/${{ matrix.version }}/main && pwd && make build && make deploy + + + - name: Conditional Cleanup + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make clean diff --git a/CHANGELOG.md b/CHANGELOG.md index 21819345b..3df3cf520 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 2025 * `apr` + * fixed `nginx` iamges, added new `1.28` version. * added `fisheye` images to `gha`. * added `crucible` images to `gha`. * added `GitHub Actions` to `Bitbucket` images. diff --git a/README.md b/README.md index 0ef0594ec..811e42a51 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ A collection of docker images for production use. This repo contains 2 types of * `epicmorg/php` - image, migrated to `epicmorg/debian:bookworm-php`. Look at `linux/ecosystem/epicmorg/debian/12-bookworm/php`. * `epicmorg/python` - image, migrated to `epicmorg/debian:bookworm-python`. Look at `linux/ecosystem/epicmorg/debian/12-bookworm/python`. * `epicmorg/apache2:latest` - ONLY `latest` tag. +* `epicmorg/nginx:.` - deprecated tags with build-version. at now - all versions are only `.`. Example: `1.27.1` -> `1.27`. * `epicmorg/torrust-index` - deprecated, deleted as abadoned. Sorry. * `epicmorg/torrust-tracker` - deprecated, deleted as abadoned. Sorry. * `epicmorg/staytus` - deprecated, deleted as abadoned. Sorry. From cb61d49f02d5c94d138e23b9e6ef802c5c72909e Mon Sep 17 00:00:00 2001 From: stam Date: Mon, 28 Apr 2025 22:36:43 +0300 Subject: [PATCH 03/12] astra alse - restored --- .../astra/1.7-alse/develop/Dockerfile | 2 +- .../epicmorg/astra/1.7-alse/develop/Makefile | 44 +++++++ .../astra/1.7-alse/develop/docker-compose.yml | 5 + .../1.7-alse/jdk}/jdk7/docker-compose.yml | 0 .../epicmorg}/astra/1.7-alse/main/Dockerfile | 2 +- .../epicmorg/astra/1.7-alse/main/Makefile | 44 +++++++ .../astra/1.7-alse/main/docker-compose.yml | 5 + .../astra/1.7-alse/main}/requirements.txt | 0 .../epicmorg/astra/1.7-alse/python/README.md | 26 +++++ .../python/python3.13/docker-compose.yml | 5 + .../epicmorg/astra/1.7-alse/rootfs/Dockerfile | 44 +++++++ .../epicmorg/astra/1.7-alse/rootfs/Makefile | 44 +++++++ .../astra/1.7-alse/rootfs/docker-compose.yml | 5 + .../rootfs}/etc/apt/apt.conf.d/96-apt-retries | 0 .../etc/apt/apt.conf.d/97-allow-cert-exp | 0 .../apt/apt.conf.d/98-allow-unauthenticated | 0 .../apt/apt.conf.d/99-no-check-valid-until | 0 .../1.7-alse/rootfs}/etc/apt/sources.list | 0 .../epicmorg}/astra/1.7-alse/slim/Dockerfile | 68 ++++++----- .../epicmorg/astra/1.7-alse/slim/Makefile | 44 +++++++ .../astra/1.7-alse/slim/docker-compose.yml | 5 + .../slim/etc/apt/apt.conf.d/96-apt-retries | 1 + .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 2 + .../apt/apt.conf.d/98-allow-unauthenticated | 1 + .../apt/apt.conf.d/99-no-check-valid-until | 1 + .../astra/1.7-alse/slim/etc/apt/sources.list | 22 ++++ .../astra/1.7-alse/slim/etc/locale.gen | 0 .../astra/1.7-alse/slim/etc/ssl/dhparam.pem | 13 +++ .../slim/usr/local/epicmorg/README.md | 0 .../slim/usr/local/epicmorg/welcome.sh | 68 +++++++++++ .../epicmorg_epicmorg_rootCA.crt | 24 ++++ .../epicmorg_intermediateCA_code.crt | 26 +++++ .../ca-certificates/intermediateCA_https.crt | 25 ++++ .../russian_trusted_root_ca_pem.crt | 0 .../russian_trusted_sub_ca_pem.crt | 0 .../russian_trusted_sub_ca_pem_2024.crt | 39 +++++++ .../epicmorg/astra/1.8-alse/rootfs/Dockerfile | 44 +++++++ .../epicmorg/astra/1.8-alse/rootfs/Makefile | 44 +++++++ .../astra/1.8-alse/rootfs/docker-compose.yml | 5 + .../rootfs/etc/apt/apt.conf.d/96-apt-retries | 1 + .../etc/apt/apt.conf.d/97-allow-cert-exp | 2 + .../apt/apt.conf.d/98-allow-unauthenticated | 1 + .../apt/apt.conf.d/99-no-check-valid-until | 1 + .../1.8-alse/rootfs/etc/apt/sources.list | 11 ++ .../debian/12-bookworm/slim/Dockerfile | 4 +- .../astra/1.7-alse/develop/Makefile | 50 -------- .../astra/1.7-alse/develop/docker-compose.yml | 6 - .../astra/1.7-alse/jdk11/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk11/Dockerfile.develop | 100 ---------------- .../astra/1.7-alse/jdk11/Makefile | 50 -------- .../astra/1.7-alse/jdk11/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk11/requirements.txt | 3 - .../astra/1.7-alse/jdk16/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk16/Dockerfile.develop | 100 ---------------- .../astra/1.7-alse/jdk16/Makefile | 50 -------- .../astra/1.7-alse/jdk16/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk16/requirements.txt | 3 - .../astra/1.7-alse/jdk17/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk17/Dockerfile.develop | 100 ---------------- .../astra/1.7-alse/jdk17/Makefile | 50 -------- .../astra/1.7-alse/jdk17/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk17/requirements.txt | 3 - .../astra/1.7-alse/jdk18/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk18/Dockerfile.develop | 100 ---------------- .../astra/1.7-alse/jdk18/Makefile | 50 -------- .../astra/1.7-alse/jdk18/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk18/requirements.txt | 3 - .../astra/1.7-alse/jdk19/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk19/Dockerfile.develop | 100 ---------------- .../astra/1.7-alse/jdk19/Makefile | 50 -------- .../astra/1.7-alse/jdk19/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk19/requirements.txt | 3 - .../astra/1.7-alse/jdk20/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk20/Dockerfile.develop | 100 ---------------- .../astra/1.7-alse/jdk20/Makefile | 50 -------- .../astra/1.7-alse/jdk20/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk20/requirements.txt | 3 - .../astra/1.7-alse/jdk21/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk21/Dockerfile.develop | 100 ---------------- .../astra/1.7-alse/jdk21/Makefile | 50 -------- .../astra/1.7-alse/jdk21/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk21/requirements.txt | 3 - .../astra/1.7-alse/jdk22/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk22/Dockerfile.develop | 101 ----------------- .../astra/1.7-alse/jdk22/Makefile | 50 -------- .../astra/1.7-alse/jdk22/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk22/requirements.txt | 3 - .../astra/1.7-alse/jdk6/Dockerfile | 91 --------------- .../astra/1.7-alse/jdk6/Dockerfile.develop | 91 --------------- .../experimental/astra/1.7-alse/jdk6/Makefile | 50 -------- .../astra/1.7-alse/jdk6/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk6/requirements.txt | 3 - .../astra/1.7-alse/jdk7/Dockerfile | 91 --------------- .../astra/1.7-alse/jdk7/Dockerfile.develop | 91 --------------- .../experimental/astra/1.7-alse/jdk7/Makefile | 50 -------- .../astra/1.7-alse/jdk7/requirements.txt | 3 - .../astra/1.7-alse/jdk8/Dockerfile | 100 ---------------- .../astra/1.7-alse/jdk8/Dockerfile.develop | 100 ---------------- .../experimental/astra/1.7-alse/jdk8/Makefile | 50 -------- .../astra/1.7-alse/jdk8/docker-compose.yml | 11 -- .../astra/1.7-alse/jdk8/requirements.txt | 3 - .../experimental/astra/1.7-alse/main/Makefile | 50 -------- .../astra/1.7-alse/main/docker-compose.yml | 6 - .../astra/1.7-alse/main/requirements.txt | 3 - .../astra/1.7-alse/python3.10/Dockerfile | 107 ------------------ .../astra/1.7-alse/python3.10/Makefile | 50 -------- .../1.7-alse/python3.10/docker-compose.yml | 6 - .../1.7-alse/python3.10/requirements.txt | 3 - .../astra/1.7-alse/python3.11/Dockerfile | 107 ------------------ .../astra/1.7-alse/python3.11/Makefile | 50 -------- .../1.7-alse/python3.11/docker-compose.yml | 6 - .../1.7-alse/python3.11/requirements.txt | 3 - .../astra/1.7-alse/python3.12/Dockerfile | 107 ------------------ .../astra/1.7-alse/python3.12/Makefile | 50 -------- .../1.7-alse/python3.12/docker-compose.yml | 6 - .../1.7-alse/python3.12/requirements.txt | 3 - .../astra/1.7-alse/python3.13/Dockerfile | 107 ------------------ .../astra/1.7-alse/python3.13/Makefile | 50 -------- .../1.7-alse/python3.13/docker-compose.yml | 6 - .../1.7-alse/python3.13/requirements.txt | 3 - .../experimental/astra/1.7-alse/slim/Makefile | 50 -------- .../astra/1.7-alse/slim/docker-compose.yml | 6 - .../astra/1.7-alse/slim/requirements.txt | 3 - 123 files changed, 646 insertions(+), 3728 deletions(-) rename linux/{experimental => ecosystem/epicmorg}/astra/1.7-alse/develop/Dockerfile (99%) create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/develop/Makefile create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/develop/docker-compose.yml rename linux/{experimental/astra/1.7-alse => ecosystem/epicmorg/astra/1.7-alse/jdk}/jdk7/docker-compose.yml (100%) rename linux/{experimental => ecosystem/epicmorg}/astra/1.7-alse/main/Dockerfile (99%) create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/main/Makefile create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/main/docker-compose.yml rename linux/{experimental/astra/1.7-alse/develop => ecosystem/epicmorg/astra/1.7-alse/main}/requirements.txt (100%) create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/python/README.md create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/python/python3.13/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/Dockerfile create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/Makefile create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/docker-compose.yml rename linux/{experimental/astra/1.7-alse/slim => ecosystem/epicmorg/astra/1.7-alse/rootfs}/etc/apt/apt.conf.d/96-apt-retries (100%) rename linux/{experimental/astra/1.7-alse/slim => ecosystem/epicmorg/astra/1.7-alse/rootfs}/etc/apt/apt.conf.d/97-allow-cert-exp (100%) rename linux/{experimental/astra/1.7-alse/slim => ecosystem/epicmorg/astra/1.7-alse/rootfs}/etc/apt/apt.conf.d/98-allow-unauthenticated (100%) rename linux/{experimental/astra/1.7-alse/slim => ecosystem/epicmorg/astra/1.7-alse/rootfs}/etc/apt/apt.conf.d/99-no-check-valid-until (100%) rename linux/{experimental/astra/1.7-alse/slim => ecosystem/epicmorg/astra/1.7-alse/rootfs}/etc/apt/sources.list (100%) rename linux/{experimental => ecosystem/epicmorg}/astra/1.7-alse/slim/Dockerfile (68%) create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/Makefile create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/96-apt-retries create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/sources.list rename linux/{experimental => ecosystem/epicmorg}/astra/1.7-alse/slim/etc/locale.gen (100%) create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/ssl/dhparam.pem rename linux/{experimental => ecosystem/epicmorg}/astra/1.7-alse/slim/usr/local/epicmorg/README.md (100%) create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/epicmorg/welcome.sh create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/epicmorg_epicmorg_rootCA.crt create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/epicmorg_intermediateCA_code.crt create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/intermediateCA_https.crt rename linux/{experimental => ecosystem/epicmorg}/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt (100%) rename linux/{experimental => ecosystem/epicmorg}/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt (100%) create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem_2024.crt create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/Dockerfile create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/Makefile create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/96-apt-retries create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/97-allow-cert-exp create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/98-allow-unauthenticated create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/99-no-check-valid-until create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/sources.list delete mode 100644 linux/experimental/astra/1.7-alse/develop/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/develop/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk11/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk11/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk11/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk11/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk11/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk16/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk16/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk16/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk16/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk16/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk17/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk17/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk17/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk17/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk17/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk18/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk18/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk18/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk18/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk18/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk19/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk19/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk19/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk19/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk19/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk20/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk20/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk20/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk20/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk20/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk21/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk21/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk21/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk21/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk21/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk22/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk22/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk22/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk22/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk22/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk6/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk6/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk6/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk6/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk6/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk7/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk7/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk7/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk7/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/jdk8/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/jdk8/Dockerfile.develop delete mode 100644 linux/experimental/astra/1.7-alse/jdk8/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/jdk8/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/jdk8/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/main/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/main/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/main/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/python3.10/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/python3.10/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/python3.10/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/python3.10/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/python3.11/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/python3.11/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/python3.11/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/python3.11/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/python3.12/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/python3.12/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/python3.12/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/python3.12/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/python3.13/Dockerfile delete mode 100644 linux/experimental/astra/1.7-alse/python3.13/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/python3.13/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/python3.13/requirements.txt delete mode 100644 linux/experimental/astra/1.7-alse/slim/Makefile delete mode 100644 linux/experimental/astra/1.7-alse/slim/docker-compose.yml delete mode 100644 linux/experimental/astra/1.7-alse/slim/requirements.txt diff --git a/linux/experimental/astra/1.7-alse/develop/Dockerfile b/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Dockerfile similarity index 99% rename from linux/experimental/astra/1.7-alse/develop/Dockerfile rename to linux/ecosystem/epicmorg/astra/1.7-alse/develop/Dockerfile index 616e4d312..420020a2a 100644 --- a/linux/experimental/astra/1.7-alse/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/astralinux:1.7-main +FROM quay.io/epicmorg/astralinux:1.7-main LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Makefile b/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Makefile new file mode 100644 index 000000000..1e4371492 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/develop/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.7-alse/develop/docker-compose.yml new file mode 100644 index 000000000..0601363d2 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/develop/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.7-develop" + build: + context: . \ No newline at end of file diff --git a/linux/experimental/astra/1.7-alse/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.7-alse/jdk/jdk7/docker-compose.yml similarity index 100% rename from linux/experimental/astra/1.7-alse/jdk7/docker-compose.yml rename to linux/ecosystem/epicmorg/astra/1.7-alse/jdk/jdk7/docker-compose.yml diff --git a/linux/experimental/astra/1.7-alse/main/Dockerfile b/linux/ecosystem/epicmorg/astra/1.7-alse/main/Dockerfile similarity index 99% rename from linux/experimental/astra/1.7-alse/main/Dockerfile rename to linux/ecosystem/epicmorg/astra/1.7-alse/main/Dockerfile index 318fc0f00..94a8b2cfb 100644 --- a/linux/experimental/astra/1.7-alse/main/Dockerfile +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/main/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/astralinux:1.7-slim +FROM quay.io/epicmorg/astralinux:1.7-slim ARG DEBIAN_FRONTEND=noninteractive ################################################################## diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/main/Makefile b/linux/ecosystem/epicmorg/astra/1.7-alse/main/Makefile new file mode 100644 index 000000000..1e4371492 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/main/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/main/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.7-alse/main/docker-compose.yml new file mode 100644 index 000000000..361f3b2e6 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/main/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.7-main" + build: + context: . diff --git a/linux/experimental/astra/1.7-alse/develop/requirements.txt b/linux/ecosystem/epicmorg/astra/1.7-alse/main/requirements.txt similarity index 100% rename from linux/experimental/astra/1.7-alse/develop/requirements.txt rename to linux/ecosystem/epicmorg/astra/1.7-alse/main/requirements.txt diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/python/README.md b/linux/ecosystem/epicmorg/astra/1.7-alse/python/README.md new file mode 100644 index 000000000..2df2ca322 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/python/README.md @@ -0,0 +1,26 @@ +# Version Compablity + +## Status of Python versions + +https://devguide.python.org/versions/ + +| Python | OpenSSL | Comments | Status | +| ------------- | ------------- | ----------------- | --------- | +| 2.6 | Not ready | No pip installed | End Of Life | +| 2.7 | Not ready | | End Of Life | +| 3.0 | Not ready | No pip installed | End Of Life | +| 3.1 | Not ready | No pip installed | End Of Life | +| 3.2 | 1.0.2u | | End Of Life | +| 3.3 | 1.0.2u | | End Of Life | +| 3.4 | 1.0.2u | | End Of Life | +| 3.5 | 1.1.1.1w | | End Of Life | +| 3.6 | 1.1.1.1w | | End Of Life | +| 3.7 | 1.1.1.1w | | End Of Life | +| 3.8 | 1.1.1.1w | | End Of Life | +| 3.9 | 1.1.1.1w | | security, 2025-10 | +| 3.10 | 3.4.x | | security, 2026-10 | +| 3.11 | 3.4.x | | security, 2029-10 | +| 3.12 | 3.4.x | | bugfix, 2028-10 | +| 3.13 | 3.4.x | | bugfix, 2029-10 | + +Only supported versions will be automaticly updated at CI. diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/python/python3.13/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.7-alse/python/python3.13/docker-compose.yml new file mode 100644 index 000000000..0e4636024 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/python/python3.13/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.7-python3.13" + build: + context: . diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/Dockerfile b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/Dockerfile new file mode 100644 index 000000000..2c79508ed --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/Dockerfile @@ -0,0 +1,44 @@ +FROM quay.io/epicmorg/astralinux:1.7-rootfs +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +LABEL org.opencontainers.image.vendor="EpicMorg DevTeam, developer@epicm.org" +LABEL org.opencontainers.image.authors="STAM, kasthack, Aleks-Z" +LABEL org.opencontainers.image.source="https://github.com/EpicMorg/docker" +LABEL org.opencontainers.image.url="https://github.com/EpicMorg/docker" +LABEL donate.crypto.TON="EQDvHXRK-K1ZieJhgTD9JZQk7xCnWzRbctYnUkWq1lZq1bUg" +LABEL donate.crypto.ETH="0x26a8443a694f08cdfec966aa6fd72c45068753ec" +LABEL donate.crypto.BTC="bc1querz8ug9asjmsuy6yn4a94a2athgprnu7e5zq2" +LABEL donate.crypto.LTC="ltc1qtwwacq8f0n76fer2y83wxu540hddnmf8cdrlvg" +LABEL donate.crypto.NVC="4SbMynYETyhmKdggu8f38ULU6yQKiJPuo6" +LABEL donate.crypto.DOGE="DHyfE1CZzWtyaQiaMmv6g4KvXVQRUgrYE6" +LABEL donate.crypto.PPC="pQWArPzYoLppNe7ew3QPfto1k1eq66BYUB" +LABEL donate.crypto.RVN="R9t2LKeLhDSZBKNgUzSDZAossA3UqNvbV3" +LABEL donate.crypto.ZEC="t1KRMMmwMSZth8vJcd2ZHtPEFKTQ74yVixE" +LABEL donate.crypto.XMR="884PqZ1gDjWW7fKxtbaeRoBeSh9EGZbkqUyLriWmuKbwLZrAJdYUs4wQxoVfEJoW7LBhdQMP9cFhZQpJr6xvg7esHLdCbb1" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# sources list +################################################################## +RUN rm -rfv /etc/apt/sources.list +RUN rm -rfv /etc/apt/sources.list.d/debian.sources +RUN rm -rfv /etc/locale.gen + +COPY etc/apt/apt.conf.d/99-no-check-valid-until /etc/apt/apt.conf.d/99-no-check-valid-until +COPY etc/apt/apt.conf.d/98-allow-unauthenticated /etc/apt/apt.conf.d/98-allow-unauthenticated +COPY etc/apt/apt.conf.d/97-allow-cert-exp /etc/apt/apt.conf.d/97-allow-cert-exp +COPY etc/apt/apt.conf.d/96-apt-retries /etc/apt/apt.conf.d/96-apt-retries +COPY etc/apt/sources.list /etc/apt/sources.list + +RUN apt-get update && \ + apt-get dist-upgrade -y + +################################################################## +# Cleanup +################################################################## +RUN echo "clean up" && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/Makefile b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/Makefile new file mode 100644 index 000000000..ff56425bb --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build --squash + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/docker-compose.yml new file mode 100644 index 000000000..a9b84c8d4 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.7-rootfs" + build: + context: . diff --git a/linux/experimental/astra/1.7-alse/slim/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/apt.conf.d/96-apt-retries similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/etc/apt/apt.conf.d/96-apt-retries rename to linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/apt.conf.d/96-apt-retries diff --git a/linux/experimental/astra/1.7-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/apt.conf.d/97-allow-cert-exp similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp rename to linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/apt.conf.d/97-allow-cert-exp diff --git a/linux/experimental/astra/1.7-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/apt.conf.d/98-allow-unauthenticated similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated rename to linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/apt.conf.d/98-allow-unauthenticated diff --git a/linux/experimental/astra/1.7-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/apt.conf.d/99-no-check-valid-until similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until rename to linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/apt.conf.d/99-no-check-valid-until diff --git a/linux/experimental/astra/1.7-alse/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/sources.list similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/etc/apt/sources.list rename to linux/ecosystem/epicmorg/astra/1.7-alse/rootfs/etc/apt/sources.list diff --git a/linux/experimental/astra/1.7-alse/slim/Dockerfile b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Dockerfile similarity index 68% rename from linux/experimental/astra/1.7-alse/slim/Dockerfile rename to linux/ecosystem/epicmorg/astra/1.7-alse/slim/Dockerfile index 10d1ba82d..69f1368f3 100644 --- a/linux/experimental/astra/1.7-alse/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Dockerfile @@ -1,30 +1,17 @@ -FROM epicmorg/astralinux:1.7-rootfs +FROM quay.io/epicmorg/astralinux:1.7-rootfs LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -LABEL org.opencontainers.image.vendor="EpicMorg DevTeam, developer@epicm.org" -LABEL org.opencontainers.image.authors="STAM, kasthack, Aleks-Z" -LABEL org.opencontainers.image.source="https://github.com/EpicMorg/docker" -LABEL org.opencontainers.image.url="https://github.com/EpicMorg/docker" -LABEL donate.crypto.TON="EQDvHXRK-K1ZieJhgTD9JZQk7xCnWzRbctYnUkWq1lZq1bUg" -LABEL donate.crypto.ETH="0x26a8443a694f08cdfec966aa6fd72c45068753ec" -LABEL donate.crypto.BTC="bc1querz8ug9asjmsuy6yn4a94a2athgprnu7e5zq2" -LABEL donate.crypto.LTC="ltc1qtwwacq8f0n76fer2y83wxu540hddnmf8cdrlvg" -LABEL donate.crypto.NVC="4SbMynYETyhmKdggu8f38ULU6yQKiJPuo6" -LABEL donate.crypto.DOGE="DHyfE1CZzWtyaQiaMmv6g4KvXVQRUgrYE6" -LABEL donate.crypto.PPC="pQWArPzYoLppNe7ew3QPfto1k1eq66BYUB" -LABEL donate.crypto.RVN="R9t2LKeLhDSZBKNgUzSDZAossA3UqNvbV3" -LABEL donate.crypto.ZEC="t1KRMMmwMSZth8vJcd2ZHtPEFKTQ74yVixE" -LABEL donate.crypto.XMR="884PqZ1gDjWW7fKxtbaeRoBeSh9EGZbkqUyLriWmuKbwLZrAJdYUs4wQxoVfEJoW7LBhdQMP9cFhZQpJr6xvg7esHLdCbb1" -ARG DEBIAN_FRONTEND=noninteractive ################################################################## # prepare system ################################################################## RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done +RUN mkdir -p /etc/apt/keyrings ################################################################## # sources list ################################################################## RUN rm -rfv /etc/apt/sources.list +RUN rm -rfv /etc/apt/sources.list.d/debian.sources RUN rm -rfv /etc/locale.gen COPY etc/apt/apt.conf.d/99-no-check-valid-until /etc/apt/apt.conf.d/99-no-check-valid-until @@ -46,19 +33,27 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ apt-transport-https \ apt-utils \ - gnupg \ - gnupg1 \ - gnupg2 \ aptitude \ bash \ binutils \ ca-certificates \ - locales \ - software-properties-common \ + coreutils \ curl \ - wget \ + dirmngr \ + file \ + gnupg \ + gnupg1 \ + gnupg2 \ + locales \ locate \ - sudo + rar \ + software-properties-common \ + sudo \ + unrar \ + unrar-free \ + unzip \ + wget \ + zip RUN update-ca-certificates --fresh @@ -70,21 +65,36 @@ RUN locale-gen ################################################################## # Create Base directory for various soft ################################################################## -ENV EMG_LOCAL_BASE_DIR=/usr/local/epicmorg +ENV EMG_LOCAL_BASE_DIR=/usr/local/share/epicmorg +ENV EMG_WELCOME_MESSAGE=true +ENV EMG_DONATION_MESSAGE=true RUN mkdir -p ${EMG_LOCAL_BASE_DIR} COPY usr/local/epicmorg ${EMG_LOCAL_BASE_DIR} +RUN chmod +x ${EMG_LOCAL_BASE_DIR}/welcome.sh && \ + echo '[ ! -z "$TERM" -a -x ${EMG_LOCAL_BASE_DIR}/welcome.sh -a -x ${EMG_LOCAL_BASE_DIR}/welcome.sh ] && ${EMG_LOCAL_BASE_DIR}/welcome.sh' >> /etc/bash.bashrc ################################################################## -# cleanup +# Prepare dhparam.pem (4096 bit) +################################################################## +ENV SSL_DHPARAM_FILE=/etc/ssl/dhparam.pem +COPY etc/ssl/dhparam.pem ${SSL_DHPARAM_FILE} +RUN openssl dhparam -in ${SSL_DHPARAM_FILE} -text -noout | grep bit + +################################################################## +# Set default workdir +################################################################## +WORKDIR ${EMG_LOCAL_BASE_DIR} + +################################################################## +# Cleanup ################################################################## RUN echo "clean up" && \ apt-get clean -y && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* ################################################################## # update file db diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Makefile b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Makefile new file mode 100644 index 000000000..ff56425bb --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build --squash + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/docker-compose.yml new file mode 100644 index 000000000..15ee6b533 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.7-slim" + build: + context: . diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/96-apt-retries new file mode 100644 index 000000000..73262ccc3 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/96-apt-retries @@ -0,0 +1 @@ +Acquire::Retries "9"; diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp new file mode 100644 index 000000000..e7ec46810 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -0,0 +1,2 @@ +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated new file mode 100644 index 000000000..b36cd01c8 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated @@ -0,0 +1 @@ +APT::Get::AllowUnauthenticated "true"; diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until new file mode 100644 index 000000000..4e6d9209d --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until @@ -0,0 +1 @@ +Acquire::Check-Valid-Until no; diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/sources.list new file mode 100644 index 000000000..112c8a0bc --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/apt/sources.list @@ -0,0 +1,22 @@ +# Основной репозиторий +deb https://dl.astralinux.ru/astra/stable/1.7_x86-64/repository-main/ 1.7_x86-64 main contrib non-free +deb https://mirror.yandex.ru/mirrors/astralinux/stable/1.7_x86-64/repository-main/ 1.7_x86-64 main contrib non-free + +# Оперативные обновления основного репозитория +deb https://dl.astralinux.ru/astra/stable/1.7_x86-64/repository-update/ 1.7_x86-64 main contrib non-free +deb https://mirror.yandex.ru/mirrors/astralinux/stable/1.7_x86-64/repository-update/ 1.7_x86-64 main contrib non-free + +# Базовый репозиторий +deb https://dl.astralinux.ru/astra/stable/1.7_x86-64/repository-base/ 1.7_x86-64 main contrib non-free +deb https://mirror.yandex.ru/mirrors/astralinux/stable/1.7_x86-64/repository-base/ 1.7_x86-64 main contrib non-free + +# Расширенный репозиторий +deb https://dl.astralinux.ru/astra/stable/1.7_x86-64/repository-extended/ 1.7_x86-64 main contrib non-free +deb https://mirror.yandex.ru/mirrors/astralinux/stable/1.7_x86-64/repository-extended/ 1.7_x86-64 main contrib non-free + +# Расширенный репозиторий (компонент astra-ce) +deb https://dl.astralinux.ru/astra/stable/1.7_x86-64/repository-extended/ 1.7_x86-64 astra-ce + +# Последнее срочное обновление (если доступно): +#deb https://dl.astralinux.ru/astra/stable/1.7_x86-64/uu/last/repository-update/ main contrib non-free + diff --git a/linux/experimental/astra/1.7-alse/slim/etc/locale.gen b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/locale.gen similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/etc/locale.gen rename to linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/locale.gen diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/ssl/dhparam.pem b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/ssl/dhparam.pem new file mode 100644 index 000000000..55f4b8287 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/etc/ssl/dhparam.pem @@ -0,0 +1,13 @@ +-----BEGIN DH PARAMETERS----- +MIICCAKCAgEAm+0RAGNHQ4/g2aE46V193TNcXR3dXxxe5YI2aqinYhxvYt2kv/p9 +sSs/OKRcTm2t6/yJXWH2wo7qLcxydvdFIRb1uMOZxBYSxh4DzZ6lv2saqK32Nf5b +iUS+wuA3mzB+WuUsuv3efyb7C8SQ3gY0JQSuA7jRSGUjfF6UBYIf0A10hW/dPrUl +v+uO5QFhU5z7WyJc09GEh2rPUWnUmRUWiKpP7lwRTasB4Q+egJW2vPkP01ichebB +ol/bz8JN/Q81AE/Ird6cNGDA6fm2t20+XTxeDyhAiEBzLtYjrg/HV8JUCYRmas6z +iyYY70eD03lJqRRdYR1uSNEjB3bGxUtKgKKw/weJti8VnQRlvYNcRZ/OQ3ZXfHmn +uZyXzeVmFcXvyA6qWMQy77IVpXcP7m4CIr0Zy6Ac4Ch9yxl3NmnKA5VEOfEWwTSp +5lX+CGFJrnbIaM9tPemoKohGZ9b5Dft0aFkRRCrY+JdfZON9HtxcdmCVi/CNWBC+ +EqvPAfYLYOGWT7FSJmkamLs+RFzKlFjoNMDv4YrMeOfMbcnFh7KIa75O/bhQkX+0 +3O3iW5QnnsxO7zyo4Yj0eIa1HmRWuJSvW3LSSlLCsULiD3TwQaot8xI+lNpdokIt +yujHFq1QxulLQSucG42s/IMdPIgUkETgjMTybITZiX6E480koVlXk2cCAQI= +-----END DH PARAMETERS----- diff --git a/linux/experimental/astra/1.7-alse/slim/usr/local/epicmorg/README.md b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/epicmorg/README.md similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/usr/local/epicmorg/README.md rename to linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/epicmorg/README.md diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/epicmorg/welcome.sh b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/epicmorg/welcome.sh new file mode 100644 index 000000000..57a314082 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/epicmorg/welcome.sh @@ -0,0 +1,68 @@ +#!/bin/sh + +# Donation message +show_donation_message() { + if [ "${EMG_DONATION_MESSAGE:-true}" != "false" ]; then + echo "╔══════════════════════════════════════════════════════════════════════════╗" + echo "║ ║" + echo "║ Images are developed under the MIT license and are not the result of ║" + echo "║ commercial activity. If you'd like to support us, feel free to donate ║" + echo "║ using the wallet details below. ║" + echo "║ Thank You! ║" + echo "║ ║" + echo "╠═════════════════════╦════════════════════════════════════════════════════╣" + echo "║ TYPE ║ ADDRESS ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ TON ║ EQDvHXRK-K1ZieJhgTD9JZQk7xCnWzRbctYnUkWq1lZq1bUg ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ ETH ║ 0x26a8443a694f08cdfec966aa6fd72c45068753ec ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ BTC ║ bc1querz8ug9asjmsuy6yn4a94a2athgprnu7e5zq2 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ LTC ║ ltc1qtwwacq8f0n76fer2y83wxu540hddnmf8cdrlvg ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ NVC ║ 4SbMynYETyhmKdggu8f38ULU6yQKiJPuo6 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ DOGE ║ DHyfE1CZzWtyaQiaMmv6g4KvXVQRUgrYE6 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ PPC ║ pQWArPzYoLppNe7ew3QPfto1k1eq66BYUB ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ RVN ║ R9t2LKeLhDSZBKNgUzSDZAossA3UqNvbV3 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ ZEC ║ t1KRMMmwMSZth8vJcd2ZHtPEFKTQ74yVixE ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ XMR ║ 884PqZ1gDjWW7fKxtbaeRoBeSh9EGZbkqUyLriWmuKbwLZrAJ ║" + echo "║ ║ dYUs4wQxoVfEJoW7LBhdQMP9cFhZQpJr6xvg7esHLdCbb1 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ ║ https://patreon.com/epicmorg ║" + echo "║ WEB LINKS ║ https://ko-fi.com/epicmorg ║" + echo "║ ║ https://ko-fi.com/alexz696 ║" + echo "╚═════════════════════╩════════════════════════════════════════════════════╝" + fi +} + + +# Welcome message +show_welcome_message() { + if [ "${EMG_WELCOME_MESSAGE:-true}" != "false" ]; then + echo "╔══════════════════════════════════════════════════════════════════════════╗" + echo "║ ║" + echo "║ Welcome to one of the containers of the project. ║" + echo "║ ║" + echo "║ * EpicMorg directory with static binaries: '${EMG_LOCAL_BASE_DIR}' ║" + echo "║ * To disable Welcome message switch 'EMG_WELCOME_MESSAGE' to 'false' ║" + echo "║ * To disable Donation message switch 'EMG_DONATION_MESSAGE' to 'false' ║" + echo "║ ║" + echo "╚══════════════════════════════════════════════════════════════════════════╝" + show_donation_message + echo "╔══════════════════════════════════════════════════════════════════════════╗" + echo "║ Thank you for choosing us. ║" + echo "║ Enjoy using the project! ║" + echo "║ EpicMorg, 2025 ║" + echo "╚══════════════════════════════════════════════════════════════════════════╝" + fi +} + +clear +show_welcome_message +exit 0 diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/epicmorg_epicmorg_rootCA.crt b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/epicmorg_epicmorg_rootCA.crt new file mode 100644 index 000000000..3e868398d --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/epicmorg_epicmorg_rootCA.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEEzCCAvugAwIBAgIUfigpDYicmN8hCXwWg9sHF17jVQ0wDQYJKoZIhvcNAQEN +BQAwgZgxCzAJBgNVBAYTAlJVMQwwCgYDVQQIDANTUEIxDDAKBgNVBAcMA1NQQjES +MBAGA1UECgwJRXBpY00ub3JnMRkwFwYDVQQLDBBFcGljTW9yZyBSb290IENBMRow +GAYDVQQDDBFFcGljTS5vcmcgUm9vdCBDQTEiMCAGCSqGSIb3DQEJARYTZGV2ZWxv +cGVyQGVwaWNtLm9yZzAeFw0yNDA2MDExMjQ3MTlaFw0zNDA1MzAxMjQ3MTlaMIGY +MQswCQYDVQQGEwJSVTEMMAoGA1UECAwDU1BCMQwwCgYDVQQHDANTUEIxEjAQBgNV +BAoMCUVwaWNNLm9yZzEZMBcGA1UECwwQRXBpY01vcmcgUm9vdCBDQTEaMBgGA1UE +AwwRRXBpY00ub3JnIFJvb3QgQ0ExIjAgBgkqhkiG9w0BCQEWE2RldmVsb3BlckBl +cGljbS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCU7/vFW4dm +atoZWEhtFwJ8WhBTWAx0fJzON9kzOM6YIvcu6/gpj++0j9d3hsg4VsTLjqeyRhYN +ts3b71CaW96OHZ+X4GFE87p2dOoBvzCE9iM+WqHJZzjf4Oa2hK/oiQtsbU+q66lw +eASPYRl5AU3gm7bzOLlpEvmabSzowdAU8qLBgrqJkdZf4ZjAcLfOvrVk8WaiUH3J +D19newfGu9LIH76LzOu+w48C+nYqUsHtnxVstQgxFdSGuul2UTqK/Xv+IOwR3tXt +WOhId6rGHxyXXM8Q+3jXcNWLLmGYecPoyQ4v3FNnecQzU76sx5h4Zf6oRA6crdya +3tHoPQqa+td3AgMBAAGjUzBRMB0GA1UdDgQWBBRyeMxzrQllpfSaruwHSo9HEJYE +/zAfBgNVHSMEGDAWgBRyeMxzrQllpfSaruwHSo9HEJYE/zAPBgNVHRMBAf8EBTAD +AQH/MA0GCSqGSIb3DQEBDQUAA4IBAQAXqf8kQqSmFVgRQ9EbwCDzHkjPZq0o7lkU +fZiH6/fshMG63lOLirLYXzQhfkkX2Gm671wAATpyj4GHzaf4+BPxn+1XdqGDV+AP +V6EqKNF5lixdEm9KsSlztQ5+7cN7noLbhfHGFm1ExLdLJi4fY0EgX60ACkwttfkb +OCTSXGK6JHXWE2hGWKhANyFjC62oFWdaptTlLDiSLLjtrMfs7c9Ng+HUh0mMwejS +p2/4a3P0OFbLq/2TnHNTdYSDNM/oilhf0crebElUCYHir1HQF74Sh6G3ut8OO95J +qw2J44n6YPr8LwL4lGCj8+okUvwPqC305zpBjP6c1ztmxQ8+dCKZ +-----END CERTIFICATE----- diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/epicmorg_intermediateCA_code.crt b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/epicmorg_intermediateCA_code.crt new file mode 100644 index 000000000..8aa93749d --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/epicmorg_intermediateCA_code.crt @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIETzCCAzegAwIBAgIUFGpH3osZ3jzR99AL4v3ljyQWtLUwDQYJKoZIhvcNAQEN +BQAwgZgxCzAJBgNVBAYTAlJVMQwwCgYDVQQIDANTUEIxDDAKBgNVBAcMA1NQQjES +MBAGA1UECgwJRXBpY00ub3JnMRkwFwYDVQQLDBBFcGljTW9yZyBSb290IENBMRow +GAYDVQQDDBFFcGljTS5vcmcgUm9vdCBDQTEiMCAGCSqGSIb3DQEJARYTZGV2ZWxv +cGVyQGVwaWNtLm9yZzAeFw0yNDA2MDExMjQ3MjBaFw0zNDA1MzAxMjQ3MjBaMIGv +MQswCQYDVQQGEwJSVTEMMAoGA1UECAwDU1BCMQwwCgYDVQQHDANTUEIxEjAQBgNV +BAoMCUVwaWNNLm9yZzEeMBwGA1UECwwVRXBpY01vcmcgQ29kZSBTaWduaW5nMSww +KgYDVQQDDCNFcGljTS5vcmcgSW50ZXJtZWRpYXRlIENvZGUgU2lnbmluZzEiMCAG +CSqGSIb3DQEJARYTZGV2ZWxvcGVyQGVwaWNtLm9yZzCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAL+Vm2ZwT27KenCyMEujAlmp0c92rCOu3QB/Ji8YR5Fh +EgacatKRQ8kbZfb+uNK8s25oZlYlYd7VxdRp+rwGAjSKjxZ3SoQUj+gt7dGKhgNo +TADMO+17ZC7KS+El4l2esjL4wWSVWT2axnwCbytpe0HG0bfAW3PktSc4X5w+5eoK +YIQ7o00Yp+7tw6MDefQJDjDvigr1BizlCcF3WmygRAP8X+2/gHzzQ2AWqykQ9Vdv +4KPavcCpg7j8rHE4cK2lbET/4vYlexe6GreG6TRvlxntY3BxsERkq8uG5MjriIBl +Z1KKAoGr/0PSjMbqzlzLr0hLeIMZ3JU5AUrIWOZe7iMCAwEAAaN4MHYwHwYDVR0j +BBgwFoAUcnjMc60JZaX0mq7sB0qPRxCWBP8wDwYDVR0TBAgwBgEB/wIBADAOBgNV +HQ8BAf8EBAMCAYYwEwYDVR0lBAwwCgYIKwYBBQUHAwMwHQYDVR0OBBYEFPnuujuW +Y60YVHIXpUV15ioUXU3bMA0GCSqGSIb3DQEBDQUAA4IBAQAJvXBYLcPV6TV0cYt7 +KqQ/d7+BPqE5dHYYNKRGQLrZY05ceVDDAnQoiTO7R6zT75I34D0RjcWbBFcJsfas +gvzgjqEItN7cm051kkthGYFIfASN07n89YqUeQpqQ5tg5MEqNBbNAlTgazgwlMFV +sSh3hZLmeUW6phvU89VineF+IPTEhHWcvoYfmwd4rW0JSEImbr6QmJ8dhw0DSocW +HSSpST9Mk6zEswBbs9Pvpgdewy+DkvApD7bPlfy/8jctAKk2R43jw8XTxWy07phE ++po13WQCC94Ydb2MBh0U6gwTPe+/QAS90IpvhjlDQWWJtaZKNQIHMh9qdrZU/fK1 +pzZh +-----END CERTIFICATE----- diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/intermediateCA_https.crt b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/intermediateCA_https.crt new file mode 100644 index 000000000..f0e7d4027 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/intermediateCA_https.crt @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEQTCCAymgAwIBAgIUFGpH3osZ3jzR99AL4v3ljyQWtLYwDQYJKoZIhvcNAQEN +BQAwgZgxCzAJBgNVBAYTAlJVMQwwCgYDVQQIDANTUEIxDDAKBgNVBAcMA1NQQjES +MBAGA1UECgwJRXBpY00ub3JnMRkwFwYDVQQLDBBFcGljTW9yZyBSb290IENBMRow +GAYDVQQDDBFFcGljTS5vcmcgUm9vdCBDQTEiMCAGCSqGSIb3DQEJARYTZGV2ZWxv +cGVyQGVwaWNtLm9yZzAeFw0yNDA2MDExMjQ3MjBaFw0zNDA1MzAxMjQ3MjBaMIGh +MQswCQYDVQQGEwJSVTEMMAoGA1UECAwDU1BCMQwwCgYDVQQHDANTUEIxEjAQBgNV +BAoMCUVwaWNNLm9yZzEXMBUGA1UECwwORXBpY01vcmcgSFRUUFMxJTAjBgNVBAMM +HEVwaWNNLm9yZyBJbnRlcm1lZGlhdGUgSFRUUFMxIjAgBgkqhkiG9w0BCQEWE2Rl +dmVsb3BlckBlcGljbS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCziMvV2TQ7FRp3SG8ArOre4e34alHUxF7pUFVchMJpEWa6AVFtkPvFs/Zm/KcY +FLxsI8c4UT21lkH6Np1zr8ZUYF/QG32WZTEpeGL3FKI5WO83bSkuaRSGYm9lQ932 +/t+oQ36B+JpLcmnEPr79I4fwU2BG+Yr+1McWqpwOaM10c+2QcXFMUWszno8kxdUG +ixjbxrGGoNJxW+zBhXpC1PBiK5whBe5p/u4cn7i4f8ANTmKd4jn0NSN4K5gnP03J +Wf+ePbbyaXMj4YWamlTMWOFDID9xJHwYaYF8bDVR7cUPKRGJe5D6mc8JcnO8+WHJ +GsvCkRZEA44OEArpXVNwMTgZAgMBAAGjeDB2MB8GA1UdIwQYMBaAFHJ4zHOtCWWl +9Jqu7AdKj0cQlgT/MA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMBMG +A1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTyIWWlrsX5gyd+pGFmYzZVnbXg +GzANBgkqhkiG9w0BAQ0FAAOCAQEAdMkjh0fJI+S1u5efCu0LiwM8SaMz0E8OuaAY +7MNLUu1NeiVqPyxYIxr25OnBzDwTIdsoMNHcgQB+aQFWLH6LFRgheBn6ywqIm/zJ +l3+1tLJhj/NJEI7o0eLDjGwKKoSloj8QdpMc+PIQENQVlwNm1zdHBDQfclAL2t1n +UpLfYrt7Hjta++ZI+8JAgqBb3yijI6fu8KRCQU5SpwEV/ifdFWsPjh68oQFnQafQ +WyiKsy4EPPkCChMI/vD/PTImwes8obyGHD/CshNFvxVnmqNq2o9r5wl6udLMC5NF +fpCbO1B5Sm6SwBhpOAWfaD2SoVP1d0MKCroATB88vpZUCFoaVw== +-----END CERTIFICATE----- diff --git a/linux/experimental/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt rename to linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt diff --git a/linux/experimental/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt similarity index 100% rename from linux/experimental/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt rename to linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem_2024.crt b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem_2024.crt new file mode 100644 index 000000000..1fbc4a47e --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem_2024.crt @@ -0,0 +1,39 @@ +-----BEGIN CERTIFICATE----- +MIIG6DCCBNCgAwIBAgICEAUwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx +PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu +ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg +Q0EwHhcNMjQwNzE1MTI1MDQxWhcNMjkwNzE5MTI1MDQxWjBvMQswCQYDVQQGEwJS +VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg +YW5kIENvbW11bmljYXRpb25zMR8wHQYDVQQDDBZSdXNzaWFuIFRydXN0ZWQgU3Vi +IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1j0rkZECOt1S8o7I +JY+4YKAxuEa5xaHKHXT2EpkuC/0krqMOjUy2oPIRNgR5g8X0Jl6jamxeGLc4Q1tf +ju6or9oSRYThIUhRsFDQNBiBBEXoBgWxTfiKB2eyT97+pz5TBtBiRCPaLGRHYLRb +9Jz2HkJlxbtNPjtDrF5DPHym+mZ1M1z3hIQYAqJwLpsEBnsw/VxWMlxqHoeewd0h +uJMd71KQ5vOKlz7KrIZ6EobNNa6wItuvsfj3kYCK7O78uLHGXXFxdr8Hae9lMUmC +8F7AFwa+bO1LRlTlqW7rE3rLf+jj70N01N8T3o22v14YBaFBWQWncAVYD2JuL3tH +252+kdNOERf1fLbLRigJAbd+hOhWYlNf963TFDgnNPliHNIW72SygVBnI2V3JwO1 +dp1hVKpK/zt8ziGdHW4gmOLTsH50YKdR4jNqUgQv4wASlKn9OpN6zHYc5G8h86fY +BM+zxE5ikGI+I/vIqBuI0eaDU92AWN/YjFLpu8tMu9kLRSCf1vug6FIfDPWVo7iP +ac/SI2v8jnnpaW7ph/Pz3WkzaG7ZZJsfFs+8dploWc6LOoDtbFBhMdGMxu024msC +0PSjZb5ODXPIaO2NsA7fMiAtZcoK6anTUJh4zOP/stA9qsJGNxdrEmiPXSmBZY/N +Y0wkZgZ6JTDhw7038bPvctkblJkCAwEAAaOCAYswggGHMB0GA1UdDgQWBBR3Pdk5 +r0K93FvKduru/c4+YSkwXzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qws +hzAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADCBmAYIKwYBBQUH +AQEEgYswgYgwQAYIKwYBBQUHMAKGNGh0dHA6Ly9udWMtY2RwLnZvc2tob2QucnUv +Y2RwL3Jvb3RjYV9zc2xfcnNhMjAyMi5jcnQwRAYIKwYBBQUHMAKGOGh0dHA6Ly9u +dWMtY2RwLmRpZ2l0YWwuZ292LnJ1L2NkcC9yb290Y2Ffc3NsX3JzYTIwMjIuY3J0 +MIGFBgNVHR8EfjB8MDqgOKA2hjRodHRwOi8vbnVjLWNkcC52b3NraG9kLnJ1L2Nk +cC9yb290Y2Ffc3NsX3JzYTIwMjIuY3JsMD6gPKA6hjhodHRwOi8vbnVjLWNkcC5k +aWdpdGFsLmdvdi5ydS9jZHAvcm9vdGNhX3NzbF9yc2EyMDIyLmNybDANBgkqhkiG +9w0BAQsFAAOCAgEAmsINXtQ7wwUWvIeOr80MdJS/5G4xhyZOVEmeUorThquT672y +cCg3XCxc4fwbiZqSSbBqntQ7RtiTAKMYMvBageKoVHbzz+R4jX01tKcTx8cDePrz +dJ73bLNUorE7RU9QsW4KyiUeRmjMDV23AUlEvuQFTwgkHXvbac1BBdPn9CrssQuF +5EGohZKcQPFiAAc4SHbRNhlr7uAwgpc/erzI9EAcvA6BVAXcVKoeGpV01uexUgZ6 +St5RP9UmDWNA7T4yVXWJ233N0Q8bl+6AswINQ3PosPu6yQQHQjr65YS06epK+AeI +6j+oGR4xI7EhTQhQvaobnGmX/8QQ7XDRYCP2HXYxiffnn/CfZ/BVyKLYeY1ZipjE +nzqdQIC2+Q3WtY8jsVRQMP38WFRmtsIt5snehnPTs5bKGVIcYzj3o3Ex/K7agEz0 +zAJ0JR5ivXZOvNkT0g9x1v+S1IkU3e/nX1a+tpRquMtnHX0L2lXArNHUbaOO9EJt +d57WaIpofV5cVhhwShOgAuBc9UMJF3/n4t4RKiPxtsK8P67gcmphMhslj7AMYrYM +ej2NvQZY4m3ub3CPC/PrTjDONvb+8g5xrKtxBjYqC74HSB4dg9G3WimSDUuP2Su6 +G2y2TUeyJuCvCLz289VoO0vg7cNdMobE3KCqAiiNhN2VBFxHAUKmUoRcRdw= +-----END CERTIFICATE----- diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/Dockerfile b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/Dockerfile new file mode 100644 index 000000000..1f0790628 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/Dockerfile @@ -0,0 +1,44 @@ +FROM quay.io/epicmorg/astralinux:1.8-rootfs +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +LABEL org.opencontainers.image.vendor="EpicMorg DevTeam, developer@epicm.org" +LABEL org.opencontainers.image.authors="STAM, kasthack, Aleks-Z" +LABEL org.opencontainers.image.source="https://github.com/EpicMorg/docker" +LABEL org.opencontainers.image.url="https://github.com/EpicMorg/docker" +LABEL donate.crypto.TON="EQDvHXRK-K1ZieJhgTD9JZQk7xCnWzRbctYnUkWq1lZq1bUg" +LABEL donate.crypto.ETH="0x26a8443a694f08cdfec966aa6fd72c45068753ec" +LABEL donate.crypto.BTC="bc1querz8ug9asjmsuy6yn4a94a2athgprnu7e5zq2" +LABEL donate.crypto.LTC="ltc1qtwwacq8f0n76fer2y83wxu540hddnmf8cdrlvg" +LABEL donate.crypto.NVC="4SbMynYETyhmKdggu8f38ULU6yQKiJPuo6" +LABEL donate.crypto.DOGE="DHyfE1CZzWtyaQiaMmv6g4KvXVQRUgrYE6" +LABEL donate.crypto.PPC="pQWArPzYoLppNe7ew3QPfto1k1eq66BYUB" +LABEL donate.crypto.RVN="R9t2LKeLhDSZBKNgUzSDZAossA3UqNvbV3" +LABEL donate.crypto.ZEC="t1KRMMmwMSZth8vJcd2ZHtPEFKTQ74yVixE" +LABEL donate.crypto.XMR="884PqZ1gDjWW7fKxtbaeRoBeSh9EGZbkqUyLriWmuKbwLZrAJdYUs4wQxoVfEJoW7LBhdQMP9cFhZQpJr6xvg7esHLdCbb1" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# sources list +################################################################## +RUN rm -rfv /etc/apt/sources.list +RUN rm -rfv /etc/apt/sources.list.d/debian.sources +RUN rm -rfv /etc/locale.gen + +COPY etc/apt/apt.conf.d/99-no-check-valid-until /etc/apt/apt.conf.d/99-no-check-valid-until +COPY etc/apt/apt.conf.d/98-allow-unauthenticated /etc/apt/apt.conf.d/98-allow-unauthenticated +COPY etc/apt/apt.conf.d/97-allow-cert-exp /etc/apt/apt.conf.d/97-allow-cert-exp +COPY etc/apt/apt.conf.d/96-apt-retries /etc/apt/apt.conf.d/96-apt-retries +COPY etc/apt/sources.list /etc/apt/sources.list + +RUN apt-get update && \ + apt-get dist-upgrade -y + +################################################################## +# Cleanup +################################################################## +RUN echo "clean up" && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/Makefile b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/Makefile new file mode 100644 index 000000000..ff56425bb --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build --squash + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/docker-compose.yml new file mode 100644 index 000000000..7b0e26e21 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.8-rootfs" + build: + context: . diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/96-apt-retries new file mode 100644 index 000000000..73262ccc3 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/96-apt-retries @@ -0,0 +1 @@ +Acquire::Retries "9"; diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/97-allow-cert-exp new file mode 100644 index 000000000..e7ec46810 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/97-allow-cert-exp @@ -0,0 +1,2 @@ +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/98-allow-unauthenticated b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/98-allow-unauthenticated new file mode 100644 index 000000000..b36cd01c8 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/98-allow-unauthenticated @@ -0,0 +1 @@ +APT::Get::AllowUnauthenticated "true"; diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/99-no-check-valid-until b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/99-no-check-valid-until new file mode 100644 index 000000000..4e6d9209d --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/apt.conf.d/99-no-check-valid-until @@ -0,0 +1 @@ +Acquire::Check-Valid-Until no; diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/sources.list b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/sources.list new file mode 100644 index 000000000..66d8ffd3f --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/rootfs/etc/apt/sources.list @@ -0,0 +1,11 @@ +# Основной репозиторий, включающий актуальное оперативное или срочное обновление +deb https://dl.astralinux.ru/astra/stable/1.8_x86-64/repository-main/ 1.8_x86-64 main contrib non-free non-free-firmware + +# Расширенный репозиторий, соответствующий актуальному оперативному обновлению +deb https://dl.astralinux.ru/astra/stable/1.8_x86-64/extended-repository/ 1.8_x86-64 main contrib non-free non-free-firmware + +deb https://dl.astralinux.ru/astra/frozen/1.8_x86-64/1.8.1/main-repository/ 1.8_x86-64 main contrib non-free non-free-firmware +deb https://dl.astralinux.ru/astra/frozen/1.8_x86-64/1.8.1/extended-repository/ 1.8_x86-64 main contrib non-free non-free-firmware + +deb https://dl.astralinux.ru/astra/frozen/1.8_x86-64/1.8.2/main-repository/ 1.8_x86-64 contrib main non-free non-free-firmware +deb https://dl.astralinux.ru/astra/frozen/1.8_x86-64/1.8.2/extended-repository/ 1.8_x86-64 contrib main non-free non-free-firmware diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile index 356675d61..6c738df41 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile @@ -53,8 +53,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg1 \ gnupg2 \ @@ -91,7 +93,7 @@ RUN chmod +x ${EMG_LOCAL_BASE_DIR}/welcome.sh && \ echo '[ ! -z "$TERM" -a -x ${EMG_LOCAL_BASE_DIR}/welcome.sh -a -x ${EMG_LOCAL_BASE_DIR}/welcome.sh ] && ${EMG_LOCAL_BASE_DIR}/welcome.sh' >> /etc/bash.bashrc ################################################################## -# Preparew dhparam.pem (4096 bit) +# Prepare dhparam.pem (4096 bit) ################################################################## ENV SSL_DHPARAM_FILE=/etc/ssl/dhparam.pem COPY etc/ssl/dhparam.pem ${SSL_DHPARAM_FILE} diff --git a/linux/experimental/astra/1.7-alse/develop/Makefile b/linux/experimental/astra/1.7-alse/develop/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/develop/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/develop/docker-compose.yml b/linux/experimental/astra/1.7-alse/develop/docker-compose.yml deleted file mode 100644 index 9965ef411..000000000 --- a/linux/experimental/astra/1.7-alse/develop/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-develop" - build: - context: . \ No newline at end of file diff --git a/linux/experimental/astra/1.7-alse/jdk11/Dockerfile b/linux/experimental/astra/1.7-alse/jdk11/Dockerfile deleted file mode 100644 index 3ddf50975..000000000 --- a/linux/experimental/astra/1.7-alse/jdk11/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=11 -ARG K_JDK_FULL_VERSION=jdk-11.0.23 -ARG K_JDK_VERSION=11.0.23 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java11 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk11/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk11/Dockerfile.develop deleted file mode 100644 index fd5ebc2bc..000000000 --- a/linux/experimental/astra/1.7-alse/jdk11/Dockerfile.develop +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=11 -ARG K_JDK_FULL_VERSION=jdk-11.0.23 -ARG K_JDK_VERSION=11.0.23 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java11 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk11/Makefile b/linux/experimental/astra/1.7-alse/jdk11/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk11/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk11/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk11/docker-compose.yml deleted file mode 100644 index 5875ee1cc..000000000 --- a/linux/experimental/astra/1.7-alse/jdk11/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk11" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk11" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk11/requirements.txt b/linux/experimental/astra/1.7-alse/jdk11/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk11/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk16/Dockerfile b/linux/experimental/astra/1.7-alse/jdk16/Dockerfile deleted file mode 100644 index 383814e4b..000000000 --- a/linux/experimental/astra/1.7-alse/jdk16/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=16 -ARG K_JDK_FULL_VERSION=jdk-16.0.2 -ARG K_JDK_VERSION=16.0.2 -ARG K_JDK_BUILD_VERSION=7 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk16/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk16/Dockerfile.develop deleted file mode 100644 index b98de95e9..000000000 --- a/linux/experimental/astra/1.7-alse/jdk16/Dockerfile.develop +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=16 -ARG K_JDK_FULL_VERSION=jdk-16.0.2 -ARG K_JDK_VERSION=16.0.2 -ARG K_JDK_BUILD_VERSION=7 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java16 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk16/Makefile b/linux/experimental/astra/1.7-alse/jdk16/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk16/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk16/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk16/docker-compose.yml deleted file mode 100644 index d74a40e70..000000000 --- a/linux/experimental/astra/1.7-alse/jdk16/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk16" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk16" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk16/requirements.txt b/linux/experimental/astra/1.7-alse/jdk16/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk16/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk17/Dockerfile b/linux/experimental/astra/1.7-alse/jdk17/Dockerfile deleted file mode 100644 index 8367e68c6..000000000 --- a/linux/experimental/astra/1.7-alse/jdk17/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=17 -ARG K_JDK_FULL_VERSION=jdk-17.0.11 -ARG K_JDK_VERSION=17.0.11 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk17/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk17/Dockerfile.develop deleted file mode 100644 index 352cca3ae..000000000 --- a/linux/experimental/astra/1.7-alse/jdk17/Dockerfile.develop +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=17 -ARG K_JDK_FULL_VERSION=jdk-17.0.11 -ARG K_JDK_VERSION=17.0.11 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk17/Makefile b/linux/experimental/astra/1.7-alse/jdk17/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk17/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk17/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk17/docker-compose.yml deleted file mode 100644 index 6152cbe46..000000000 --- a/linux/experimental/astra/1.7-alse/jdk17/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk17" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk17" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk17/requirements.txt b/linux/experimental/astra/1.7-alse/jdk17/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk17/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk18/Dockerfile b/linux/experimental/astra/1.7-alse/jdk18/Dockerfile deleted file mode 100644 index 8fd5d59b8..000000000 --- a/linux/experimental/astra/1.7-alse/jdk18/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=18 -ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 -ARG K_JDK_VERSION=18.0.2.1 -ARG K_JDK_BUILD_VERSION=1 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk18/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk18/Dockerfile.develop deleted file mode 100644 index e1fc440d4..000000000 --- a/linux/experimental/astra/1.7-alse/jdk18/Dockerfile.develop +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=18 -ARG K_JDK_FULL_VERSION=jdk-18.0.2.1 -ARG K_JDK_VERSION=18.0.2.1 -ARG K_JDK_BUILD_VERSION=1 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java16 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk18/Makefile b/linux/experimental/astra/1.7-alse/jdk18/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk18/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk18/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk18/docker-compose.yml deleted file mode 100644 index c3968045c..000000000 --- a/linux/experimental/astra/1.7-alse/jdk18/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk18" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk18" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk18/requirements.txt b/linux/experimental/astra/1.7-alse/jdk18/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk18/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk19/Dockerfile b/linux/experimental/astra/1.7-alse/jdk19/Dockerfile deleted file mode 100644 index 4c2ba1131..000000000 --- a/linux/experimental/astra/1.7-alse/jdk19/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=19 -ARG K_JDK_FULL_VERSION=jdk-19.0.2 -ARG K_JDK_VERSION=19.0.2 -ARG K_JDK_BUILD_VERSION=7 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java17 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk19/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk19/Dockerfile.develop deleted file mode 100644 index 240c5e8ac..000000000 --- a/linux/experimental/astra/1.7-alse/jdk19/Dockerfile.develop +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=19 -ARG K_JDK_FULL_VERSION=jdk-19.0.2 -ARG K_JDK_VERSION=19.0.2 -ARG K_JDK_BUILD_VERSION=7 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java16 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk19/Makefile b/linux/experimental/astra/1.7-alse/jdk19/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk19/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk19/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk19/docker-compose.yml deleted file mode 100644 index 8b49f2804..000000000 --- a/linux/experimental/astra/1.7-alse/jdk19/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk19" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk19" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk19/requirements.txt b/linux/experimental/astra/1.7-alse/jdk19/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk19/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk20/Dockerfile b/linux/experimental/astra/1.7-alse/jdk20/Dockerfile deleted file mode 100644 index 04b294dc3..000000000 --- a/linux/experimental/astra/1.7-alse/jdk20/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=20 -ARG K_JDK_FULL_VERSION=jdk-20.0.2 -ARG K_JDK_VERSION=20.0.2 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java20 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk20/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk20/Dockerfile.develop deleted file mode 100644 index ace636b7f..000000000 --- a/linux/experimental/astra/1.7-alse/jdk20/Dockerfile.develop +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=20 -ARG K_JDK_FULL_VERSION=jdk-20.0.2 -ARG K_JDK_VERSION=20.0.2 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java20 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk20/Makefile b/linux/experimental/astra/1.7-alse/jdk20/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk20/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk20/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk20/docker-compose.yml deleted file mode 100644 index c6259d13d..000000000 --- a/linux/experimental/astra/1.7-alse/jdk20/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk20" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk20" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk20/requirements.txt b/linux/experimental/astra/1.7-alse/jdk20/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk20/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk21/Dockerfile b/linux/experimental/astra/1.7-alse/jdk21/Dockerfile deleted file mode 100644 index ae3db331d..000000000 --- a/linux/experimental/astra/1.7-alse/jdk21/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.3 -ARG K_JDK_VERSION=21.0.3 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java21 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk21/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk21/Dockerfile.develop deleted file mode 100644 index 661d42f21..000000000 --- a/linux/experimental/astra/1.7-alse/jdk21/Dockerfile.develop +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=21 -ARG K_JDK_FULL_VERSION=jdk-21.0.3 -ARG K_JDK_VERSION=21.0.3 -ARG K_JDK_BUILD_VERSION=9 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java21 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk21/Makefile b/linux/experimental/astra/1.7-alse/jdk21/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk21/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk21/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk21/docker-compose.yml deleted file mode 100644 index cc863b424..000000000 --- a/linux/experimental/astra/1.7-alse/jdk21/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk21" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk21" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk21/requirements.txt b/linux/experimental/astra/1.7-alse/jdk21/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk21/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk22/Dockerfile b/linux/experimental/astra/1.7-alse/jdk22/Dockerfile deleted file mode 100644 index 2750de2a0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk22/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=22 -ARG K_JDK_FULL_VERSION=jdk-22.0.1 -ARG K_JDK_VERSION=22.0.1 -ARG K_JDK_BUILD_VERSION=8 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java21 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk22/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk22/Dockerfile.develop deleted file mode 100644 index 1c982ec9c..000000000 --- a/linux/experimental/astra/1.7-alse/jdk22/Dockerfile.develop +++ /dev/null @@ -1,101 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=22 -ARG K_JDK_FULL_VERSION=jdk-22.0.1 -ARG K_JDK_VERSION=22.0.1 -ARG K_JDK_BUILD_VERSION=8 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}_${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}+${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java21 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN ls -las /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk22/Makefile b/linux/experimental/astra/1.7-alse/jdk22/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk22/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk22/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk22/docker-compose.yml deleted file mode 100644 index 9e8415c25..000000000 --- a/linux/experimental/astra/1.7-alse/jdk22/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk22" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk22" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk22/requirements.txt b/linux/experimental/astra/1.7-alse/jdk22/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk22/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk6/Dockerfile b/linux/experimental/astra/1.7-alse/jdk6/Dockerfile deleted file mode 100644 index 853036a83..000000000 --- a/linux/experimental/astra/1.7-alse/jdk6/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 -ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz - -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java6 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -#ENV MAVEN_VERSION=3.9.8 -#ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -#ENV MAVEN_ROOT=/usr/local/maven -#ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -#ENV MAVEN_BIN=${MAVEN_PATH}/bin -#ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -#ENV GRADLE_VERSION=7.6.4 -#ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -#ENV GRADLE_ROOT=/usr/local/gradle -#ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -#ENV GRADLE_BIN=${GRADLE_PATH}/bin -#ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -#ENV KTC_VERSION=2.0.0 -#ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -#ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -#ENV KTC_ROOT=/usr/local/kotlin -#ENV KTC_PATH=${KTC_ROOT}/kotlinc -#ENV KTC_BIN=${KTC_PATH}/bin - -#RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -#ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -#ENV MAVEN_HOME=${MAVEN_ROOT} -#ENV M2_HOME=${MAVEN_ROOT} - -#ADD ${MAVEN_LINK} /tmp -#RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -#RUN chmod +x -R ${MAVEN_BIN} -#RUN mvn -v - -################################################################## -# GRADLE -################################################################## -#ADD ${GRADLE_LINK} /tmp -#RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -#RUN chmod +x -R ${GRADLE_BIN} -#RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -#ADD ${KTC_LINK} /tmp -#RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -#RUN chmod +x -R ${KTC_BIN} -#RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -#ADD ${KNPL_LINK} /tmp -#RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -#RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk6/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk6/Dockerfile.develop deleted file mode 100644 index febeeee7d..000000000 --- a/linux/experimental/astra/1.7-alse/jdk6/Dockerfile.develop +++ /dev/null @@ -1,91 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_VERSION=6.22.0.3 -ARG K_JDK_BUILD_VERSION=6.0.119 -ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz - -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64 -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java6 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf /tmp/zulu${K_JDK_VERSION}-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -#ENV MAVEN_VERSION=3.9.8 -#ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -#ENV MAVEN_ROOT=/usr/local/maven -#ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -#ENV MAVEN_BIN=${MAVEN_PATH}/bin -#ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -#ENV GRADLE_VERSION=7.6.4 -#ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -#ENV GRADLE_ROOT=/usr/local/gradle -#ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -#ENV GRADLE_BIN=${GRADLE_PATH}/bin -#ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -#ENV KTC_VERSION=2.0.0 -#ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -#ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -#ENV KTC_ROOT=/usr/local/kotlin -#ENV KTC_PATH=${KTC_ROOT}/kotlinc -#ENV KTC_BIN=${KTC_PATH}/bin - -#RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -#ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -#ENV MAVEN_HOME=${MAVEN_ROOT} -#ENV M2_HOME=${MAVEN_ROOT} - -#ADD ${MAVEN_LINK} /tmp -#RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -#RUN chmod +x -R ${MAVEN_BIN} -#RUN mvn -v - -################################################################## -# GRADLE -################################################################## -#ADD ${GRADLE_LINK} /tmp -#RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -#RUN chmod +x -R ${GRADLE_BIN} -#RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -#ADD ${KTC_LINK} /tmp -#RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -#RUN chmod +x -R ${KTC_BIN} -#RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -#ADD ${KNPL_LINK} /tmp -#RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -#RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk6/Makefile b/linux/experimental/astra/1.7-alse/jdk6/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk6/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk6/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk6/docker-compose.yml deleted file mode 100644 index 3b4d74656..000000000 --- a/linux/experimental/astra/1.7-alse/jdk6/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk6" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk6" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk6/requirements.txt b/linux/experimental/astra/1.7-alse/jdk6/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk6/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk7/Dockerfile b/linux/experimental/astra/1.7-alse/jdk7/Dockerfile deleted file mode 100644 index ea9b02907..000000000 --- a/linux/experimental/astra/1.7-alse/jdk7/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 -ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz - -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java7 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -#ENV MAVEN_VERSION=3.9.8 -#ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -#ENV MAVEN_ROOT=/usr/local/maven -#ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -#ENV MAVEN_BIN=${MAVEN_PATH}/bin -#ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -#ENV GRADLE_VERSION=7.6.4 -#ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -#ENV GRADLE_ROOT=/usr/local/gradle -#ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -#ENV GRADLE_BIN=${GRADLE_PATH}/bin -#ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -#ENV KTC_VERSION=2.0.0 -#ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -#ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -#ENV KTC_ROOT=/usr/local/kotlin -#ENV KTC_PATH=${KTC_ROOT}/kotlinc -#ENV KTC_BIN=${KTC_PATH}/bin - -#RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -#ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -#ENV MAVEN_HOME=${MAVEN_ROOT} -#ENV M2_HOME=${MAVEN_ROOT} - -#ADD ${MAVEN_LINK} /tmp -#RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -#RUN chmod +x -R ${MAVEN_BIN} -#RUN mvn -v - -################################################################## -# GRADLE -################################################################## -#ADD ${GRADLE_LINK} /tmp -#RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -#RUN chmod +x -R ${GRADLE_BIN} -#RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -#ADD ${KTC_LINK} /tmp -#RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -#RUN chmod +x -R ${KTC_BIN} -#RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -#ADD ${KNPL_LINK} /tmp -#RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -#RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk7/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk7/Dockerfile.develop deleted file mode 100644 index 7920e2801..000000000 --- a/linux/experimental/astra/1.7-alse/jdk7/Dockerfile.develop +++ /dev/null @@ -1,91 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_VERSION=7.56.0.11 -ARG K_JDK_BUILD_VERSION=7.0.352 -ARG K_JDK_URL=http://cdn.azul.com/zulu/bin/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz -ARG K_JDK_TEMP=/tmp/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64.tar.gz - -ENV JAVA_HOME=/usr/local/zulu${K_JDK_VERSION}-ca-jdk${K_JDK_BUILD_VERSION}-linux_x64 -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java7 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -#ENV MAVEN_VERSION=3.9.8 -#ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -#ENV MAVEN_ROOT=/usr/local/maven -#ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -#ENV MAVEN_BIN=${MAVEN_PATH}/bin -#ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -#ENV GRADLE_VERSION=7.6.4 -#ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -#ENV GRADLE_ROOT=/usr/local/gradle -#ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -#ENV GRADLE_BIN=${GRADLE_PATH}/bin -#ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -#ENV KTC_VERSION=2.0.0 -#ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -#ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -#ENV KTC_ROOT=/usr/local/kotlin -#ENV KTC_PATH=${KTC_ROOT}/kotlinc -#ENV KTC_BIN=${KTC_PATH}/bin - -#RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -#ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -#ENV MAVEN_HOME=${MAVEN_ROOT} -#ENV M2_HOME=${MAVEN_ROOT} - -#ADD ${MAVEN_LINK} /tmp -#RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -#RUN chmod +x -R ${MAVEN_BIN} -#RUN mvn -v - -################################################################## -# GRADLE -################################################################## -#ADD ${GRADLE_LINK} /tmp -#RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -#RUN chmod +x -R ${GRADLE_BIN} -#RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -#ADD ${KTC_LINK} /tmp -#RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -#RUN chmod +x -R ${KTC_BIN} -#RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -#ADD ${KNPL_LINK} /tmp -#RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -#RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk7/Makefile b/linux/experimental/astra/1.7-alse/jdk7/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk7/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk7/requirements.txt b/linux/experimental/astra/1.7-alse/jdk7/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk7/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/jdk8/Dockerfile b/linux/experimental/astra/1.7-alse/jdk8/Dockerfile deleted file mode 100644 index e4577ce7b..000000000 --- a/linux/experimental/astra/1.7-alse/jdk8/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=8 -ARG K_JDK_FULL_VERSION=jdk8u412 -ARG K_JDK_VERSION=8u412 -ARG K_JDK_BUILD_VERSION=b08 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java8 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk8/Dockerfile.develop b/linux/experimental/astra/1.7-alse/jdk8/Dockerfile.develop deleted file mode 100644 index 45292a61a..000000000 --- a/linux/experimental/astra/1.7-alse/jdk8/Dockerfile.develop +++ /dev/null @@ -1,100 +0,0 @@ -FROM epicmorg/astralinux:1.7-develop -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_JDK_MAJOR_VERSION=8 -ARG K_JDK_FULL_VERSION=jdk8u412 -ARG K_JDK_VERSION=8u412 -ARG K_JDK_BUILD_VERSION=b08 -ARG K_JDK_URL=https://github.com/adoptium/temurin${K_JDK_MAJOR_VERSION}-binaries/releases/download/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION}/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}${K_JDK_BUILD_VERSION}.tar.gz -ARG K_JDK_TEMP=/tmp/OpenJDK${K_JDK_MAJOR_VERSION}U-jdk_x64_linux_hotspot_${K_JDK_VERSION}${K_JDK_BUILD_VERSION}.tar.gz - -ENV JAVA_HOME=/usr/local/${K_JDK_FULL_VERSION}-${K_JDK_BUILD_VERSION} -ENV PATH=$PATH:${JAVA_HOME}/bin - -################################################################## -# installing java8 -################################################################## -ADD ${K_JDK_URL} /tmp -RUN tar -xvzf ${K_JDK_TEMP} --directory /usr/local && \ - java -version - -################################################################## -# Additional settings -################################################################## -ENV MAVEN_VERSION=3.9.8 -ENV MAVEN_LINK=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -ENV MAVEN_ROOT=/usr/local/maven -ENV MAVEN_PATH=${MAVEN_ROOT}/apache-maven-${MAVEN_VERSION} -ENV MAVEN_BIN=${MAVEN_PATH}/bin -ARG MAVEN_TEMP=/tmp/apache-maven-${MAVEN_VERSION}-bin.zip - -ENV GRADLE_VERSION=8.8 -ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip -ENV GRADLE_ROOT=/usr/local/gradle -ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} -ENV GRADLE_BIN=${GRADLE_PATH}/bin -ARG GRADLE_TEMP=/tmp/gradle-${GRADLE_VERSION}-all.zip - -ENV KTC_VERSION=2.0.0 -ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip -ARG KTC_TEMP=/tmp/kotlin-compiler-${KTC_VERSION}.zip -ENV KTC_ROOT=/usr/local/kotlin -ENV KTC_PATH=${KTC_ROOT}/kotlinc -ENV KTC_BIN=${KTC_PATH}/bin - -ENV KNPL_VERSION=${KTC_VERSION} -ENV KNPL_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KNPL_VERSION}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ARG KNPL_TEMP=/tmp/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION}.tar.gz -ENV KNPL_ROOT=/usr/local/kotlin -ENV KNPL_PATH=${KNPL_ROOT}/kotlin-native-prebuilt-linux-x86_64-${KNPL_VERSION} -ENV KNPL_BIN=${KNPL_PATH}/bin - -RUN mkdir -p ${MAVEN_PATH} ${KTC_PATH} ${KNPL_PATH} ${GRADLE_PATH} -ENV PATH=${PATH}:${MAVEN_BIN}:${GRADLE_BIN}:${KTC_BIN}:${KNPL_BIN} - -################################################################## -# Maven -################################################################## -ENV MAVEN_HOME=${MAVEN_ROOT} -ENV M2_HOME=${MAVEN_ROOT} - -ADD ${MAVEN_LINK} /tmp -RUN 7zz x ${MAVEN_TEMP} -o${MAVEN_ROOT} -RUN chmod +x -R ${MAVEN_BIN} -RUN mvn -v - -################################################################## -# GRADLE -################################################################## -ADD ${GRADLE_LINK} /tmp -RUN 7zz x ${GRADLE_TEMP} -o${GRADLE_ROOT} -RUN chmod +x -R ${GRADLE_BIN} -RUN gradle -v - -################################################################## -# kotlin-compiler -################################################################## -ADD ${KTC_LINK} /tmp -RUN 7zz x ${KTC_TEMP} -o${KTC_ROOT} -RUN chmod +x -R ${KTC_BIN} -RUN kotlin -version - -################################################################## -# kotlin-native-prebuilt-linux -################################################################## -ADD ${KNPL_LINK} /tmp -RUN tar -xvzf ${KNPL_TEMP} --directory ${KTC_ROOT} -RUN chmod +x -R ${KNPL_BIN} - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/jdk8/Makefile b/linux/experimental/astra/1.7-alse/jdk8/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/jdk8/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/jdk8/docker-compose.yml b/linux/experimental/astra/1.7-alse/jdk8/docker-compose.yml deleted file mode 100644 index f2565e0d6..000000000 --- a/linux/experimental/astra/1.7-alse/jdk8/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-jdk8" - build: - context: . - app-develop: - image: "epicmorg/astralinux:1.7-develop-jdk8" - build: - context: . - dockerfile: ./Dockerfile.develop diff --git a/linux/experimental/astra/1.7-alse/jdk8/requirements.txt b/linux/experimental/astra/1.7-alse/jdk8/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/jdk8/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/main/Makefile b/linux/experimental/astra/1.7-alse/main/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/main/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/main/docker-compose.yml b/linux/experimental/astra/1.7-alse/main/docker-compose.yml deleted file mode 100644 index 542fb1c25..000000000 --- a/linux/experimental/astra/1.7-alse/main/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-main" - build: - context: . diff --git a/linux/experimental/astra/1.7-alse/main/requirements.txt b/linux/experimental/astra/1.7-alse/main/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/main/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/python3.10/Dockerfile b/linux/experimental/astra/1.7-alse/python3.10/Dockerfile deleted file mode 100644 index 19029ade0..000000000 --- a/linux/experimental/astra/1.7-alse/python3.10/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_PYTHON_VERSION=3.10.14 - -################################################################## -# update lists -################################################################## -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update - -################################################################## -# Version before install -################################################################## -RUN echo "=============================================" && \ - echo $(python3 --version) && \ - echo $(pip3 --version) && \ - echo "=============================================" && \ - echo $(python --version) && \ - echo $(pip --version) && \ - echo "=============================================" - -################################################################## -# Install prerequierments to Python compile -################################################################## -RUN apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - automake \ - build-essential \ - gcc \ - g++ \ - cmake \ - dpkg-dev \ - fakeroot \ - libdpkg-perl \ - zlib1g-dev \ - zlib1g \ - libssl-dev \ - libffi-dev \ - libncurses*-dev \ - libsqlite3-dev \ - libbz2-dev \ - libreadline-dev \ - uuid-dev liblz-dev \ - liblzma-dev lzma-dev \ - liblz-dev \ - libsqlite3-dev \ - libgdbm-dev \ - tk-dev \ - libgdbm-compat-dev - -################################################################## -# Python compilation -################################################################## -RUN cd /tmp && \ - wget -O /tmp/Python-${K_PYTHON_VERSION}.tgz https://www.python.org/ftp/python/${K_PYTHON_VERSION}/Python-${K_PYTHON_VERSION}.tgz && \ - tar -zxf Python-${K_PYTHON_VERSION}.tgz && \ - cd /tmp/Python-${K_PYTHON_VERSION} && \ - ./configure \ - --enable-optimizations \ - --with-lto \ - --with-system-expat \ - --enable-loadable-sqlite-extensions \ - --enable-profiling \ - --enable-option-checking=fatal \ -# --enable-shared \ - --with-computed-gotos \ - --with-openssl-rpath=auto && \ -# make -j$(nproc) test && \ - make -j$(nproc) && \ - make -j$(nproc) altinstall && \ - ldconfig && \ - rm -rfv /tmp/Python-${K_PYTHON_VERSION} && \ - rm /tmp/Python-${K_PYTHON_VERSION}.tgz - -################################################################## -# Python Setup -################################################################## -RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.10 0 && \ - /usr/local/bin/python3.10 -m pip install --upgrade pip && \ - update-alternatives --remove pip3 /usr/local/bin/pip3.10 && \ - sudo ln -sfv /usr/local/bin/pip3.10 /usr/local/bin/pip && \ - rm -rfv /usr/local/bin/pip3 /usr/bin/pip3 && \ - apt-get install -y python3-pip - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo $(python3 --version) && \ - echo $(pip3 --version) && \ - echo "=============================================" && \ - echo $(python --version) && \ - echo $(pip --version) && \ - echo "=============================================" - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/python3.10/Makefile b/linux/experimental/astra/1.7-alse/python3.10/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/python3.10/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/python3.10/docker-compose.yml b/linux/experimental/astra/1.7-alse/python3.10/docker-compose.yml deleted file mode 100644 index 8af1fc4bc..000000000 --- a/linux/experimental/astra/1.7-alse/python3.10/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-python3.10" - build: - context: . diff --git a/linux/experimental/astra/1.7-alse/python3.10/requirements.txt b/linux/experimental/astra/1.7-alse/python3.10/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/python3.10/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/python3.11/Dockerfile b/linux/experimental/astra/1.7-alse/python3.11/Dockerfile deleted file mode 100644 index 0c080472d..000000000 --- a/linux/experimental/astra/1.7-alse/python3.11/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_PYTHON_VERSION=3.11.9 - -################################################################## -# update lists -################################################################## -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update - -################################################################## -# Version before install -################################################################## -RUN echo "=============================================" && \ - echo $(python3 --version) && \ - echo $(pip3 --version) && \ - echo "=============================================" && \ - echo $(python --version) && \ - echo $(pip --version) && \ - echo "=============================================" - -################################################################## -# Install prerequierments to Python compile -################################################################## -RUN apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - automake \ - build-essential \ - gcc \ - g++ \ - cmake \ - dpkg-dev \ - fakeroot \ - libdpkg-perl \ - zlib1g-dev \ - zlib1g \ - libssl-dev \ - libffi-dev \ - libncurses*-dev \ - libsqlite3-dev \ - libbz2-dev \ - libreadline-dev \ - uuid-dev liblz-dev \ - liblzma-dev lzma-dev \ - liblz-dev \ - libsqlite3-dev \ - libgdbm-dev \ - tk-dev \ - libgdbm-compat-dev - -################################################################## -# Python compilation -################################################################## -RUN cd /tmp && \ - wget -O /tmp/Python-${K_PYTHON_VERSION}.tgz https://www.python.org/ftp/python/${K_PYTHON_VERSION}/Python-${K_PYTHON_VERSION}.tgz && \ - tar -zxf Python-${K_PYTHON_VERSION}.tgz && \ - cd /tmp/Python-${K_PYTHON_VERSION} && \ - ./configure \ - --enable-optimizations \ - --with-lto \ - --with-system-expat \ - --enable-loadable-sqlite-extensions \ - --enable-profiling \ - --enable-option-checking=fatal \ -# --enable-shared \ - --with-computed-gotos \ - --with-openssl-rpath=auto && \ -# make -j$(nproc) test && \ - make -j$(nproc) && \ - make -j$(nproc) altinstall && \ - ldconfig && \ - rm -rfv /tmp/Python-${K_PYTHON_VERSION} && \ - rm /tmp/Python-${K_PYTHON_VERSION}.tgz - -################################################################## -# Python Setup -################################################################## -RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.11 0 && \ - /usr/local/bin/python3.11 -m pip install --upgrade pip && \ - update-alternatives --remove pip3 /usr/local/bin/pip3.11 && \ - rm -rfv /usr/local/bin/pip3 /usr/bin/pip3 && \ - sudo ln -sfv /usr/local/bin/pip3.11 /usr/local/bin/pip && \ - apt-get install -y python3-pip - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo $(python3 --version) && \ - echo $(pip3 --version) && \ - echo "=============================================" && \ - echo $(python --version) && \ - echo $(pip --version) && \ - echo "=============================================" - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/python3.11/Makefile b/linux/experimental/astra/1.7-alse/python3.11/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/python3.11/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/python3.11/docker-compose.yml b/linux/experimental/astra/1.7-alse/python3.11/docker-compose.yml deleted file mode 100644 index 1b6a2c561..000000000 --- a/linux/experimental/astra/1.7-alse/python3.11/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-python3.11" - build: - context: . diff --git a/linux/experimental/astra/1.7-alse/python3.11/requirements.txt b/linux/experimental/astra/1.7-alse/python3.11/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/python3.11/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/python3.12/Dockerfile b/linux/experimental/astra/1.7-alse/python3.12/Dockerfile deleted file mode 100644 index 0cb1b46d7..000000000 --- a/linux/experimental/astra/1.7-alse/python3.12/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_PYTHON_VERSION=3.12.4 - -################################################################## -# update lists -################################################################## -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update - -################################################################## -# Version before install -################################################################## -RUN echo "=============================================" && \ - echo $(python3 --version) && \ - echo $(pip3 --version) && \ - echo "=============================================" && \ - echo $(python --version) && \ - echo $(pip --version) && \ - echo "=============================================" - -################################################################## -# Install prerequierments to Python compile -################################################################## -RUN apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - automake \ - build-essential \ - gcc \ - g++ \ - cmake \ - dpkg-dev \ - fakeroot \ - libdpkg-perl \ - zlib1g-dev \ - zlib1g \ - libssl-dev \ - libffi-dev \ - libncurses*-dev \ - libsqlite3-dev \ - libbz2-dev \ - libreadline-dev \ - uuid-dev liblz-dev \ - liblzma-dev lzma-dev \ - liblz-dev \ - libsqlite3-dev \ - libgdbm-dev \ - tk-dev \ - libgdbm-compat-dev - -################################################################## -# Python compilation -################################################################## -RUN cd /tmp && \ - wget -O /tmp/Python-${K_PYTHON_VERSION}.tgz https://www.python.org/ftp/python/${K_PYTHON_VERSION}/Python-${K_PYTHON_VERSION}.tgz && \ - tar -zxf Python-${K_PYTHON_VERSION}.tgz && \ - cd /tmp/Python-${K_PYTHON_VERSION} && \ - ./configure \ - --enable-optimizations \ - --with-lto \ - --with-system-expat \ - --enable-loadable-sqlite-extensions \ - --enable-profiling \ - --enable-option-checking=fatal \ -# --enable-shared \ - --with-computed-gotos \ - --with-openssl-rpath=auto && \ -# make -j$(nproc) test && \ - make -j$(nproc) && \ - make -j$(nproc) altinstall && \ - ldconfig && \ - rm -rfv /tmp/Python-${K_PYTHON_VERSION} && \ - rm /tmp/Python-${K_PYTHON_VERSION}.tgz - -################################################################## -# Python Setup -################################################################## -RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.12 0 && \ - /usr/local/bin/python3.12 -m pip install --upgrade pip && \ - update-alternatives --remove pip3 /usr/local/bin/pip3.12 && \ - sudo ln -sfv /usr/local/bin/pip3.12 /usr/local/bin/pip && \ - rm -rfv /usr/local/bin/pip3 /usr/bin/pip3 && \ - apt-get install -y python3-pip - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo $(python3 --version) && \ - echo $(pip3 --version) && \ - echo "=============================================" && \ - echo $(python --version) && \ - echo $(pip --version) && \ - echo "=============================================" - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/python3.12/Makefile b/linux/experimental/astra/1.7-alse/python3.12/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/python3.12/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/python3.12/docker-compose.yml b/linux/experimental/astra/1.7-alse/python3.12/docker-compose.yml deleted file mode 100644 index 76e00c72d..000000000 --- a/linux/experimental/astra/1.7-alse/python3.12/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-python3.12" - build: - context: . diff --git a/linux/experimental/astra/1.7-alse/python3.12/requirements.txt b/linux/experimental/astra/1.7-alse/python3.12/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/python3.12/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/python3.13/Dockerfile b/linux/experimental/astra/1.7-alse/python3.13/Dockerfile deleted file mode 100644 index 09cb6fb50..000000000 --- a/linux/experimental/astra/1.7-alse/python3.13/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -FROM epicmorg/astralinux:1.7-main -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -ARG K_PYTHON_VERSION=3.13.0 - -################################################################## -# update lists -################################################################## -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update - -################################################################## -# Version before install -################################################################## -RUN echo "=============================================" && \ - echo $(python3 --version) && \ - echo $(pip3 --version) && \ - echo "=============================================" && \ - echo $(python --version) && \ - echo $(pip --version) && \ - echo "=============================================" - -################################################################## -# Install prerequierments to Python compile -################################################################## -RUN apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - automake \ - build-essential \ - gcc \ - g++ \ - cmake \ - dpkg-dev \ - fakeroot \ - libdpkg-perl \ - zlib1g-dev \ - zlib1g \ - libssl-dev \ - libffi-dev \ - libncurses*-dev \ - libsqlite3-dev \ - libbz2-dev \ - libreadline-dev \ - uuid-dev liblz-dev \ - liblzma-dev lzma-dev \ - liblz-dev \ - libsqlite3-dev \ - libgdbm-dev \ - tk-dev \ - libgdbm-compat-dev - -################################################################## -# Python compilation -################################################################## -RUN cd /tmp && \ - wget -O /tmp/Python-${K_PYTHON_VERSION}b2.tgz https://www.python.org/ftp/python/${K_PYTHON_VERSION}/Python-${K_PYTHON_VERSION}b2.tgz && \ - tar -zxf Python-${K_PYTHON_VERSION}b2.tgz && \ - cd /tmp/Python-${K_PYTHON_VERSION}b2 && \ - ./configure \ - --enable-optimizations \ - --with-lto \ - --with-system-expat \ - --enable-loadable-sqlite-extensions \ - --enable-profiling \ - --enable-option-checking=fatal \ -# --enable-shared \ - --with-computed-gotos \ - --with-openssl-rpath=auto && \ -# make -j$(nproc) test && \ - make -j$(nproc) && \ - make -j$(nproc) altinstall && \ - ldconfig && \ - rm -rfv /tmp/Python-${K_PYTHON_VERSION}b2 && \ - rm /tmp/Python-${K_PYTHON_VERSION}b2.tgz - -################################################################## -# Python Setup -################################################################## -RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.13 0 && \ - /usr/local/bin/python3.13 -m pip install --upgrade pip && \ - update-alternatives --remove pip3 /usr/local/bin/pip3.13 && \ - rm -rfv /usr/local/bin/pip3 /usr/bin/pip3 && \ - sudo ln -sfv /usr/local/bin/pip3.13 /usr/local/bin/pip && \ - apt-get install -y python3-pip - -################################################################## -# Version after install -################################################################## -RUN echo "=============================================" && \ - echo $(python3 --version) && \ - echo $(pip3 --version) && \ - echo "=============================================" && \ - echo $(python --version) && \ - echo $(pip --version) && \ - echo "=============================================" - -################################################################## -# cleanup -################################################################## -RUN echo "clean up" && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb diff --git a/linux/experimental/astra/1.7-alse/python3.13/Makefile b/linux/experimental/astra/1.7-alse/python3.13/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/python3.13/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/python3.13/docker-compose.yml b/linux/experimental/astra/1.7-alse/python3.13/docker-compose.yml deleted file mode 100644 index bafd49bc8..000000000 --- a/linux/experimental/astra/1.7-alse/python3.13/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-python3.13" - build: - context: . diff --git a/linux/experimental/astra/1.7-alse/python3.13/requirements.txt b/linux/experimental/astra/1.7-alse/python3.13/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/python3.13/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper diff --git a/linux/experimental/astra/1.7-alse/slim/Makefile b/linux/experimental/astra/1.7-alse/slim/Makefile deleted file mode 100644 index 5e0d54db0..000000000 --- a/linux/experimental/astra/1.7-alse/slim/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PIP_BREAK_SYSTEM_PACKAGES=1 - -all: app - -app: - make build - make deploy - make clean - -build: - make pip - kaniko-wrapper --version - -dry: - make dry-run - -test: - make dry-run - -dry-run: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run - -pip: - rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.7/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.8/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.9/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED - rm -rf /usr/lib/python3.13/EXTERNALLY-MANAGED - pip3 install -r requirements.txt - pip install -r requirements.txt - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy: - make pip - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/experimental/astra/1.7-alse/slim/docker-compose.yml b/linux/experimental/astra/1.7-alse/slim/docker-compose.yml deleted file mode 100644 index 29465a7b2..000000000 --- a/linux/experimental/astra/1.7-alse/slim/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -#version: '3' -services: - app: - image: "epicmorg/astralinux:1.7-slim" - build: - context: . diff --git a/linux/experimental/astra/1.7-alse/slim/requirements.txt b/linux/experimental/astra/1.7-alse/slim/requirements.txt deleted file mode 100644 index 568608d59..000000000 --- a/linux/experimental/astra/1.7-alse/slim/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -PyYAML -python-dotenv -kaniko-wrapper From 7319c0d56345929a29d5ffeece3fb0e6d318c75d Mon Sep 17 00:00:00 2001 From: stam Date: Mon, 28 Apr 2025 23:43:44 +0300 Subject: [PATCH 04/12] debian base images update --- linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile | 2 ++ linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile | 2 ++ linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile | 2 ++ linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile | 2 ++ linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile | 2 ++ linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile | 2 ++ linux/ecosystem/epicmorg/debian/13-trixie/slim/Dockerfile | 2 ++ linux/ecosystem/epicmorg/debian/sid/slim/Dockerfile | 2 ++ 8 files changed, 16 insertions(+) diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile index 4a98be9a8..c1b4088bc 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/Dockerfile @@ -52,8 +52,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg2 \ locales \ diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile index d015bd920..cd14bb4f3 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/slim/Dockerfile @@ -52,8 +52,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg2 \ locales \ diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile index b1c19763d..956605df3 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile @@ -52,8 +52,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg2 \ locales \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile index 34e3be69b..8236b0c49 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/slim/Dockerfile @@ -52,8 +52,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg1 \ gnupg2 \ diff --git a/linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile index 70cbc6ba2..6250dc8a7 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/slim/Dockerfile @@ -52,8 +52,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg1 \ gnupg2 \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile index 251745037..5325292ba 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/Dockerfile @@ -52,8 +52,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg1 \ gnupg2 \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/slim/Dockerfile index 9323cca4b..08005144f 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/slim/Dockerfile @@ -53,8 +53,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg1 \ gnupg2 \ diff --git a/linux/ecosystem/epicmorg/debian/sid/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/slim/Dockerfile index 58d665b47..d5cc09bd8 100644 --- a/linux/ecosystem/epicmorg/debian/sid/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/slim/Dockerfile @@ -53,8 +53,10 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio bash \ binutils \ ca-certificates \ + coreutils \ curl \ dirmngr \ + file \ gnupg \ gnupg1 \ gnupg2 \ From 7917bf1ab2be2eeab855d8fbed6d3deaebfbb426 Mon Sep 17 00:00:00 2001 From: stam Date: Mon, 28 Apr 2025 23:50:03 +0300 Subject: [PATCH 05/12] asrtra astra workflow --- .../epicmorg.base.images.astra.17.yml | 136 ++----- .../epicmorg.base.images.astra.18.yml | 92 +++++ .../epicmorg.base.images.astra.rootfs.yml | 85 +++++ .../epicmorg.base.images.debian.12.yml | 1 + .../epicmorg/astra/1.7-alse/main/Dockerfile | 255 ++++++++++--- .../apt/sources.list.d/github_git-lfs.list | 2 + .../launchpad_git-mainline.list | 5 + .../sources.list.d/launchpad_git-stable.list | 3 + .../epicmorg/astra/1.7-alse/slim/Dockerfile | 2 +- .../epicmorg/astra/1.8-alse/main/Dockerfile | 342 ++++++++++++++++++ .../epicmorg/astra/1.8-alse/main/Makefile | 44 +++ .../astra/1.8-alse/main/docker-compose.yml | 5 + .../apt/sources.list.d/github_git-lfs.list | 2 + .../launchpad_git-mainline.list | 5 + .../sources.list.d/launchpad_git-stable.list | 3 + .../astra/1.8-alse/main/requirements.txt | 3 + .../epicmorg/astra/1.8-alse/slim/Dockerfile | 102 ++++++ .../epicmorg/astra/1.8-alse/slim/Makefile | 44 +++ .../astra/1.8-alse/slim/docker-compose.yml | 5 + .../slim/etc/apt/apt.conf.d/96-apt-retries | 1 + .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 2 + .../apt/apt.conf.d/98-allow-unauthenticated | 1 + .../apt/apt.conf.d/99-no-check-valid-until | 1 + .../astra/1.8-alse/slim/etc/apt/sources.list | 11 + .../astra/1.8-alse/slim/etc/locale.gen | 12 + .../astra/1.8-alse/slim/etc/ssl/dhparam.pem | 13 + .../slim/usr/local/epicmorg/README.md | 48 +++ .../slim/usr/local/epicmorg/welcome.sh | 68 ++++ .../epicmorg_epicmorg_rootCA.crt | 24 ++ .../epicmorg_intermediateCA_code.crt | 26 ++ .../ca-certificates/intermediateCA_https.crt | 25 ++ .../russian_trusted_root_ca_pem.crt | 33 ++ .../russian_trusted_sub_ca_pem.crt | 41 +++ .../russian_trusted_sub_ca_pem_2024.crt | 39 ++ 34 files changed, 1312 insertions(+), 169 deletions(-) create mode 100644 .github/workflows/epicmorg.base.images.astra.18.yml create mode 100644 .github/workflows/epicmorg.base.images.astra.rootfs.yml create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/github_git-lfs.list create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/main/Dockerfile create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/main/Makefile create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/main/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/github_git-lfs.list create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/main/requirements.txt create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/Dockerfile create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/Makefile create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/96-apt-retries create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/sources.list create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/locale.gen create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/ssl/dhparam.pem create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/epicmorg/README.md create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/epicmorg/welcome.sh create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/epicmorg_epicmorg_rootCA.crt create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/epicmorg_intermediateCA_code.crt create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/intermediateCA_https.crt create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem_2024.crt diff --git a/.github/workflows/epicmorg.base.images.astra.17.yml b/.github/workflows/epicmorg.base.images.astra.17.yml index 7cb7af1e3..8053cfdea 100644 --- a/.github/workflows/epicmorg.base.images.astra.17.yml +++ b/.github/workflows/epicmorg.base.images.astra.17.yml @@ -2,12 +2,12 @@ name: EpicMorg Astra 1.7 SE Images on: workflow_dispatch: -# schedule: -# - cron: '2 2 * * 1,3,5' + schedule: + - cron: '2 2 * * 1,3,5' jobs: - build-10-images: + build-alse-images: name: Build EpicMorg Astra 1.7 SE Images runs-on: [ ubuntu-24.04 ] @@ -60,115 +60,33 @@ jobs: - name: "Build and Deploy Astra 1.7 SE slim Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/slim && pwd && make build && make deploy + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: cd linux/ecosystem/epicmorg/astra/1.7-alse/slim && pwd && make build && make deploy - name: "Build and Deploy Astra 1.7 SE main Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/main && pwd && make build && make deploy + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: cd linux/ecosystem/epicmorg/astra/1.7-alse/main && pwd && make build && make deploy - name: "Build and Deploy Astra 1.7 SE develop Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/develop && pwd && make build && make deploy - -################################################################################## + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: cd linux/ecosystem/epicmorg/astra/1.7-alse/develop && pwd && make build && make deploy - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Astra 1.7 SE jdk6 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk6 && pwd && make build && make deploy - - - name: "Build and Deploy Astra 1.7 SE jdk7 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk7 && pwd && make build && make deploy - - - name: "Build and Deploy Astra 1.7 SE jdk8 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk8 && pwd && make build && make deploy - - - name: "Build and Deploy Astra 1.7 SE jdk11 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk11 && pwd && make build && make deploy - - - name: "Build and Deploy Astra 1.7 SE jdk16 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk16 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - - name: "Build and Deploy Astra 1.7 SE jdk17 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk17 && pwd && make build && make deploy - - - name: "Build and Deploy Astra 1.7 SE jdk18 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk18 && pwd && make build && make deploy - - - name: "Build and Deploy Astra 1.7 SE jdk19 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk19 && pwd && make build && make deploy - - - name: "Build and Deploy Astra 1.7 SE jdk20 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk20 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Astra 1.7 SE jdk21 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/jdk21 && pwd && make build && make deploy - - - name: "Build and Deploy Astra 1.7 SE jdk22 Image:" - run: cd /linux/ecosystem/epicmorg/astra/1.7-alse/jdk22 && pwd && make build && make deploy - - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - - name: "Build and Deploy Astra 1.7 SE python3.10 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/python3.10 && pwd && make build && make deploy - - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Astra 1.7 SE python3.11 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/python3.11 && pwd && make build && make deploy -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Astra 1.7 SE python3.12 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/python3.12 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - - - name: "Build and Deploy Astra 1.7 SE python3.13 Image:" - run: cd linux/ecosystem/epicmorg/astra/1.7-alse/python3.13 && pwd && make build && make deploy - -################################################################################## - - - name: Cleanup - run: make docker-clean - -################################################################################## - \ No newline at end of file + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make clean diff --git a/.github/workflows/epicmorg.base.images.astra.18.yml b/.github/workflows/epicmorg.base.images.astra.18.yml new file mode 100644 index 000000000..814b02294 --- /dev/null +++ b/.github/workflows/epicmorg.base.images.astra.18.yml @@ -0,0 +1,92 @@ +name: EpicMorg Astra 1.8 SE Images + +on: + workflow_dispatch: + schedule: + - cron: '3 3 * * 1,3,5' + +jobs: + + build-alse-images: + name: Build EpicMorg Astra 1.8 SE Images + runs-on: [ ubuntu-24.04 ] + + steps: + - uses: actions/checkout@v4 + with: + clean: true + show-progress: true + submodules: true + + - name: Log into docker registry + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin + + - name: Log into Quay.IO registry + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: echo "${{ secrets.QUAY_SERVER_KEY }}" | docker login -u "${{ secrets.QUAY_SERVER_LOGIN }}" --password-stdin "${{ secrets.QUAY_SERVER_URL }}" + + - name: Check buildah + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: buildah --version + + - name: Test Make + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make + + - name: Install requirements.txt + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make pip + + + - name: "Build and Deploy Astra 1.8 SE slim Image:" + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: cd linux/ecosystem/epicmorg/astra/1.8-alse/slim && pwd && make build && make deploy + + - name: "Build and Deploy Astra 1.8 SE main Image:" + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: cd linux/ecosystem/epicmorg/astra/1.8-alse/main && pwd && make build && make deploy + + - name: "Build and Deploy Astra 1.8 SE develop Image:" + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: cd linux/ecosystem/epicmorg/astra/1.8-alse/develop && pwd && make build && make deploy + + - name: Cleanup + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make clean diff --git a/.github/workflows/epicmorg.base.images.astra.rootfs.yml b/.github/workflows/epicmorg.base.images.astra.rootfs.yml new file mode 100644 index 000000000..12fbe902a --- /dev/null +++ b/.github/workflows/epicmorg.base.images.astra.rootfs.yml @@ -0,0 +1,85 @@ +name: EpicMorg Astra rootFS Images + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * 1,3,5' + +jobs: + + build-alse-images: + name: Build EpicMorg Astra rootFS Images + runs-on: [ ubuntu-24.04 ] + strategy: + matrix: + version: [ + '1.7', + '1.8', + ] + steps: + - uses: actions/checkout@v4 + with: + clean: true + show-progress: true + submodules: true + + - name: Log into docker registry + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin + + - name: Log into Quay.IO registry + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: echo "${{ secrets.QUAY_SERVER_KEY }}" | docker login -u "${{ secrets.QUAY_SERVER_LOGIN }}" --password-stdin "${{ secrets.QUAY_SERVER_URL }}" + + - name: Check buildah + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: buildah --version + + - name: Test Make + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make + + - name: Install requirements.txt + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make pip + + + - name: "Build and Deploy Astra ${{ matrix.version }} rootFS Image:" + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: cd linux/ecosystem/epicmorg/astra/${{ matrix.version }}-alse/rootfs && pwd && make build && make deploy + +################################################################################## + + - name: Cleanup + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 45 + timeout_minutes: 600 + max_attempts: 15 + command: make docker-clean + +################################################################################## diff --git a/.github/workflows/epicmorg.base.images.debian.12.yml b/.github/workflows/epicmorg.base.images.debian.12.yml index 524f13425..fa2bf3d94 100644 --- a/.github/workflows/epicmorg.base.images.debian.12.yml +++ b/.github/workflows/epicmorg.base.images.debian.12.yml @@ -86,6 +86,7 @@ jobs: timeout_minutes: 600 max_attempts: 15 command: make clean + build-node-images: name: Build Debian 12 Node.js Images runs-on: [ ubuntu-24.04 ] diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/main/Dockerfile b/linux/ecosystem/epicmorg/astra/1.7-alse/main/Dockerfile index 94a8b2cfb..11ee67c84 100644 --- a/linux/ecosystem/epicmorg/astra/1.7-alse/main/Dockerfile +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/main/Dockerfile @@ -1,38 +1,48 @@ FROM quay.io/epicmorg/astralinux:1.7-slim - +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive + ################################################################## # ARGuments ################################################################## +RUN echo "Default folder for installation of customized soft is: ${EMG_LOCAL_BASE_DIR}" -ARG P4_VERSION=r23.2 +ARG P4_VERSION=r24.2 +ARG P4_BIN_DIR=${EMG_LOCAL_BASE_DIR}/p4/${P4_VERSION}/bin ARG P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 -ARG SZ_VERSION=7z2407 +ARG SZ_VERSION=7z2409 +ARG SZ_BIN_DIR=${EMG_LOCAL_BASE_DIR}/7z/${SZ_VERSION}/bin ARG SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz ARG SZ_TEMP=/tmp/${SZ_VERSION}-linux-x64.tar.xz ARG LAZYGIT_VERSION=0.42.0 +ARG LAZYGIT_BIN_DIR=${EMG_LOCAL_BASE_DIR}/lazygit/${LAZYGIT_VERSION}/bin ARG LAZYGIT_DOWNLOAD_URL=https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz ARG LAZYGIT_TEMP=/tmp/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz ARG LAZYCLI_VERSION=0.1.15 +ARG LAZYCLI_BIN_DIR=${EMG_LOCAL_BASE_DIR}/lazycli/${LAZYCLI_VERSION}/bin ARG LAZYCLI_DOWNLOAD_URL=https://github.com/jesseduffield/lazycli/releases/download/v${LAZYCLI_VERSION}/lazycli-linux-x64.tar.gz ARG LAZYCLI_TEMP=/tmp/lazycli-linux-x64.tar.gz ARG LAZYNPM_VERSION=0.1.4 +ARG LAZYNPM_BIN_DIR=${EMG_LOCAL_BASE_DIR}/lazynpm/${LAZYNPM_VERSION}/bin ARG LAZYNPM_DOWNLOAD_URL=https://github.com/jesseduffield/lazynpm/releases/download/v${LAZYNPM_VERSION}/lazynpm_${LAZYNPM_VERSION}_Linux_x86_64.tar.gz ARG LAZYNPM_TEMP=/tmp/lazynpm_${LAZYNPM_VERSION}_Linux_x86_64.tar.gz ARG LAZYDOCKER_VERSION=0.23.3 +ARG LAZYDOCKER_BIN_DIR=${EMG_LOCAL_BASE_DIR}/lazydocker/${LAZYDOCKER_VERSION}/bin ARG LAZYDOCKER_DOWNLOAD_URL=https://github.com/jesseduffield/lazydocker/releases/download/v${LAZYDOCKER_VERSION}/lazydocker_${LAZYDOCKER_VERSION}_Linux_x86_64.tar.gz ARG LAZYDOCKER_TEMP=/tmp/lazydocker_${LAZYDOCKER_VERSION}_Linux_x86_64.tar.gz ARG DUMB_INIT_VERSION=1.2.5 +ARG DUMB_INIT_BIN_DIR=${EMG_LOCAL_BASE_DIR}/dumb-init/${DUMB_INIT_VERSION}/bin ARG DUMB_INIT_DOWNLOAD_URL=https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_x86_64 -ARG GOSU_VER=1.17 -ARG GOSU_DOWNLOAD_URL=https://github.com/tianon/gosu/releases/download/${GOSU_VER}/gosu-amd64 +ARG GOSU_VERSION=1.17 +ARG GOSU_BIN_DIR=${EMG_LOCAL_BASE_DIR}/gosu/${GOSU_VERSION}/bin +ARG GOSU_DOWNLOAD_URL=https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 ################################################################## # update lists @@ -45,66 +55,179 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio ################################################################## RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - acl \ bzip2 \ - cifs-utils \ +# cmatrix \ +# cmatrix-xfont \ cron \ curl \ +# clzip \ dos2unix \ + ffmpeg \ fontconfig \ git \ +# git-extras \ + git-flow \ + git-cvs \ + git-doc \ + git-email \ +# git-mediawiki \ +# git-crypt \ + git-lfs \ +# git-ftp \ + gnupg \ + gnupg2 \ + graphicsmagick \ gzip \ htop \ iftop \ - iotop \ +# iotop \ + iperf \ + iperf3 \ iputils-ping \ jq \ + kmod \ + libxml2-dev \ libxml2-utils \ - libzip4 \ +# lbzip2 \ + libsvn-java \ locales \ - logrotate \ lsb-release \ lsof \ - lzip \ + lynx \ lzma \ + lzip \ lzop \ mc \ + mercurial \ nano \ +# nload \ nmap \ openssl \ + perl \ + procps \ +# pbzip2 \ +# plzip \ p7zip-full \ p7zip-rar \ - perl \ - portmap \ - procps \ - rename \ rsync \ - ssl-cert \ +# rar \ +# screenfetch \ + smbclient \ + subversion \ telnet \ - tini \ + tmux \ tree \ - unrar \ util-linux \ uuid-runtime \ - wget \ + unrar \ xz-utils \ - zip + wget \ + zip \ + tini \ + libzip4 \ + acl \ + aptitude \ + sudo \ + cvs \ + python3-pip \ + python3-all \ +# rclone \ + logrotate \ + subversion-tools +# pev + +################################################################## +# installing fs-tools +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + btrfs-progs \ + e2fsprogs \ + f2fs-tools \ + dosfstools \ +# hfsutils \ +# hfsprogs \ + jfsutils \ + mdadm \ + util-linux \ + cryptsetup \ + lvm2 \ + nilfs-tools \ + ntfs-3g \ +# reiser4progs \ + reiserfsprogs \ + udftools \ + xfsprogs \ + xfsdump + +################################################################## +# git fresh binary +################################################################## +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \ + gpg --export --output /etc/apt/keyrings/launchpad-git.gpg F911AB184317630C59970973E363C90F8F1B6217 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + git + +RUN echo "=============================================" && \ + echo git $(git --version) && \ + echo "=============================================" + +################################################################## +# git-lfs official binary +################################################################## +RUN curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | gpg --dearmor > /etc/apt/keyrings/github_git-lfs-archive-keyring.gpg && \ + rm -rfv /etc/apt/sources.list.d/github_git-lfs.list +COPY etc/apt/sources.list.d/github_git-lfs.list /etc/apt/sources.list.d/github_git-lfs.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + git \ + git-lfs && \ + git-lfs install --skip-repo + +RUN echo "=============================================" && \ + echo git $(git --version) && \ + echo git-lfs $(git-lfs --version) && \ + echo "=============================================" + +################################################################## +# gh official binary +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --batch --yes --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" ################################################################## # Install p4client ################################################################## -ADD ${P4_DOWNLOAD_URL} /usr/local/bin -RUN chmod +x /usr/local/bin/p4 +RUN mkdir -p ${P4_BIN_DIR} +ADD ${P4_DOWNLOAD_URL} ${P4_BIN_DIR} +RUN chmod +x ${P4_BIN_DIR}/p4 +ENV PATH="${P4_BIN_DIR}:${PATH}" ################################################################## # Install 7z official binary ################################################################## +RUN mkdir -p ${SZ_BIN_DIR} ADD ${SZ_DOWNLOAD_URL} /tmp -RUN mkdir -p /usr/local/7z-${SZ_VERSION} && \ - tar -xf ${SZ_TEMP} --directory /usr/local/7z-${SZ_VERSION} && \ - chmod +x -R /usr/local/7z-${SZ_VERSION}&& \ - ln -sfv /usr/local/7z-${SZ_VERSION}/7zz /usr/local/bin/7zz && \ - ln -sfv /usr/local/7z-${SZ_VERSION}/7zzs /usr/local/bin/7zzs + +RUN tar -xf ${SZ_TEMP} --directory ${SZ_BIN_DIR} && \ + chmod +x ${SZ_BIN_DIR}/7zz && \ + chmod +x ${SZ_BIN_DIR}/7zzs && \ + find ${SZ_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name '7zz' ! -name '7zzs' -exec mv {} ${SZ_BIN_DIR}/.. \; + +ENV PATH="${SZ_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo 7zz $(7zz | head -4) && \ @@ -114,11 +237,14 @@ RUN echo "=============================================" && \ ################################################################## # Install LazyGit official binary ################################################################## +RUN mkdir -p ${LAZYGIT_BIN_DIR} ADD ${LAZYGIT_DOWNLOAD_URL} /tmp -RUN mkdir -p /usr/local/lazygit-${LAZYGIT_VERSION} && \ - tar -xzf ${LAZYGIT_TEMP} --directory /usr/local/lazygit-${LAZYGIT_VERSION} && \ - chmod +x -R /usr/local/lazygit-${LAZYGIT_VERSION} && \ - ln -sfv /usr/local/lazygit-${LAZYGIT_VERSION}/lazygit /usr/local/bin/lazygit + +RUN tar -xzf ${LAZYGIT_TEMP} --directory ${LAZYGIT_BIN_DIR} && \ + chmod +x ${LAZYGIT_BIN_DIR}/lazygit && \ + find ${LAZYGIT_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name 'lazygit' -exec mv {} ${LAZYGIT_BIN_DIR}/.. \; + +ENV PATH="${LAZYGIT_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo lazygit $(lazygit --version) && \ @@ -127,11 +253,14 @@ RUN echo "=============================================" && \ ################################################################## # Install LazyCLI official binary ################################################################## +RUN mkdir -p ${LAZYCLI_BIN_DIR} ADD ${LAZYCLI_DOWNLOAD_URL} /tmp -RUN mkdir -p /usr/local/lazycli-${LAZYCLI_VERSION} && \ - tar -xzf ${LAZYCLI_TEMP} --directory /usr/local/lazycli-${LAZYCLI_VERSION} && \ - chmod +x -R /usr/local/lazycli-${LAZYCLI_VERSION} && \ - ln -sfv /usr/local/lazycli-${LAZYCLI_VERSION}/lazycli /usr/local/bin/lazycli + +RUN tar -xzf ${LAZYCLI_TEMP} --directory ${LAZYCLI_BIN_DIR} && \ + chmod +x ${LAZYCLI_BIN_DIR}/lazycli && \ + find ${LAZYCLI_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name 'lazycli' -exec mv {} ${LAZYCLI_BIN_DIR}/.. \; + +ENV PATH="${LAZYCLI_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo lazycli $(lazycli --version) && \ @@ -140,11 +269,14 @@ RUN echo "=============================================" && \ ################################################################## # Install LazyNPM official binary ################################################################## +RUN mkdir -p ${LAZYNPM_BIN_DIR} ADD ${LAZYNPM_DOWNLOAD_URL} /tmp -RUN mkdir -p /usr/local/lazynpm-${LAZYNPM_VERSION} && \ - tar -xzf ${LAZYNPM_TEMP} --directory /usr/local/lazynpm-${LAZYNPM_VERSION} && \ - chmod +x -R /usr/local/lazynpm-${LAZYNPM_VERSION} && \ - ln -sfv /usr/local/lazynpm-${LAZYNPM_VERSION}/lazynpm /usr/local/bin/lazynpm + +RUN tar -xzf ${LAZYNPM_TEMP} --directory ${LAZYNPM_BIN_DIR} && \ + chmod +x ${LAZYNPM_BIN_DIR}/lazynpm && \ + find ${LAZYNPM_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name 'lazynpm' -exec mv {} ${LAZYNPM_BIN_DIR}/.. \; + +ENV PATH="${LAZYNPM_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo lazynpm $(lazynpm --version) && \ @@ -153,11 +285,14 @@ RUN echo "=============================================" && \ ################################################################## # Install LazyDocker official binary ################################################################## +RUN mkdir -p ${LAZYDOCKER_BIN_DIR} ADD ${LAZYDOCKER_DOWNLOAD_URL} /tmp -RUN mkdir -p /usr/local/lazydocker-${LAZYDOCKER_VERSION} && \ - tar -xzf ${LAZYDOCKER_TEMP} --directory /usr/local/lazydocker-${LAZYDOCKER_VERSION} && \ - chmod +x -R /usr/local/lazydocker-${LAZYDOCKER_VERSION} && \ - ln -sfv /usr/local/lazydocker-${LAZYDOCKER_VERSION}/lazydocker /usr/local/bin/lazydocker + +RUN tar -xzf ${LAZYDOCKER_TEMP} --directory ${LAZYDOCKER_BIN_DIR} && \ + chmod +x -R ${LAZYDOCKER_BIN_DIR}/lazydocker && \ + find ${LAZYDOCKER_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name 'lazydocker' -exec mv {} ${LAZYDOCKER_BIN_DIR}/.. \; + +ENV PATH="${LAZYDOCKER_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo lazydocker $(lazydocker --version) && \ @@ -166,10 +301,13 @@ RUN echo "=============================================" && \ ################################################################## # dumb init ################################################################## -RUN mkdir -p /usr/local/dumb-init-${DUMB_INIT_VERSION}/ -ADD ${DUMB_INIT_DOWNLOAD_URL} /usr/local/dumb-init-${DUMB_INIT_VERSION}/ -RUN chmod +x -R /usr/local/dumb-init-${DUMB_INIT_VERSION}/ && \ - ln -sfv /usr/local/dumb-init-${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_x86_64 /usr/local/bin/dumb-init +RUN mkdir -p ${DUMB_INIT_BIN_DIR} +ADD ${DUMB_INIT_DOWNLOAD_URL} ${DUMB_INIT_BIN_DIR} + +RUN mv -fv ${DUMB_INIT_BIN_DIR}/dumb-init_${DUMB_INIT_VERSION}_x86_64 ${DUMB_INIT_BIN_DIR}/dumb-init && \ + chmod +x ${DUMB_INIT_BIN_DIR}/dumb-init + +ENV PATH="${DUMB_INIT_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo dumb-init $(dumb-init --version) && \ @@ -178,28 +316,27 @@ RUN echo "=============================================" && \ ################################################################## # gosu for easy step-down from root ################################################################## -RUN mkdir -p /usr/local/gosu-${GOSU_VER}/ -ADD ${GOSU_DOWNLOAD_URL} /usr/local/gosu-${GOSU_VER}/ -RUN chmod +x -R /usr/local/gosu-${GOSU_VER}/ && \ - ln -sfv /usr/local/gosu-${GOSU_VER}/gosu-amd64 /usr/local/bin/gosu +RUN mkdir -p ${GOSU_BIN_DIR} +ADD ${GOSU_DOWNLOAD_URL} ${GOSU_BIN_DIR} + +RUN mv -fv ${GOSU_BIN_DIR}/gosu-amd64 ${GOSU_BIN_DIR}/gosu && \ + chmod +x -R ${GOSU_BIN_DIR}/gosu + +ENV PATH="${GOSU_BIN_DIR}:${PATH}" RUN echo "=============================================" && \ echo gosu $(gosu --version) && \ echo "=============================================" ################################################################## -# Generate ssl key -################################################################## -RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 - -################################################################## -# cleanup +# Cleanup ################################################################## RUN echo "clean up" && \ apt-get clean -y && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* RUN updatedb diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/github_git-lfs.list new file mode 100644 index 000000000..02d1f6d13 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/github_git-lfs.list @@ -0,0 +1,2 @@ +deb [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/debian/ buster main +deb-src [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/debian/ buster main diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..09dc5aa02 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,5 @@ +# mainline +deb [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/candidate/ubuntu jammy main +deb-src [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/candidate/ubuntu jammy main + + diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..17a2907e4 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/main/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main +deb-src [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Dockerfile b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Dockerfile index 69f1368f3..a15f4ee16 100644 --- a/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/slim/Dockerfile @@ -46,7 +46,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio gnupg2 \ locales \ locate \ - rar \ +# rar \ software-properties-common \ sudo \ unrar \ diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/main/Dockerfile b/linux/ecosystem/epicmorg/astra/1.8-alse/main/Dockerfile new file mode 100644 index 000000000..6ac1f3f2c --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/main/Dockerfile @@ -0,0 +1,342 @@ +FROM quay.io/epicmorg/astralinux:1.8-slim +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +RUN echo "Default folder for installation of customized soft is: ${EMG_LOCAL_BASE_DIR}" + +ARG P4_VERSION=r24.2 +ARG P4_BIN_DIR=${EMG_LOCAL_BASE_DIR}/p4/${P4_VERSION}/bin +ARG P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 + +ARG SZ_VERSION=7z2409 +ARG SZ_BIN_DIR=${EMG_LOCAL_BASE_DIR}/7z/${SZ_VERSION}/bin +ARG SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz +ARG SZ_TEMP=/tmp/${SZ_VERSION}-linux-x64.tar.xz + +ARG LAZYGIT_VERSION=0.42.0 +ARG LAZYGIT_BIN_DIR=${EMG_LOCAL_BASE_DIR}/lazygit/${LAZYGIT_VERSION}/bin +ARG LAZYGIT_DOWNLOAD_URL=https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz +ARG LAZYGIT_TEMP=/tmp/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz + +ARG LAZYCLI_VERSION=0.1.15 +ARG LAZYCLI_BIN_DIR=${EMG_LOCAL_BASE_DIR}/lazycli/${LAZYCLI_VERSION}/bin +ARG LAZYCLI_DOWNLOAD_URL=https://github.com/jesseduffield/lazycli/releases/download/v${LAZYCLI_VERSION}/lazycli-linux-x64.tar.gz +ARG LAZYCLI_TEMP=/tmp/lazycli-linux-x64.tar.gz + +ARG LAZYNPM_VERSION=0.1.4 +ARG LAZYNPM_BIN_DIR=${EMG_LOCAL_BASE_DIR}/lazynpm/${LAZYNPM_VERSION}/bin +ARG LAZYNPM_DOWNLOAD_URL=https://github.com/jesseduffield/lazynpm/releases/download/v${LAZYNPM_VERSION}/lazynpm_${LAZYNPM_VERSION}_Linux_x86_64.tar.gz +ARG LAZYNPM_TEMP=/tmp/lazynpm_${LAZYNPM_VERSION}_Linux_x86_64.tar.gz + +ARG LAZYDOCKER_VERSION=0.23.3 +ARG LAZYDOCKER_BIN_DIR=${EMG_LOCAL_BASE_DIR}/lazydocker/${LAZYDOCKER_VERSION}/bin +ARG LAZYDOCKER_DOWNLOAD_URL=https://github.com/jesseduffield/lazydocker/releases/download/v${LAZYDOCKER_VERSION}/lazydocker_${LAZYDOCKER_VERSION}_Linux_x86_64.tar.gz +ARG LAZYDOCKER_TEMP=/tmp/lazydocker_${LAZYDOCKER_VERSION}_Linux_x86_64.tar.gz + +ARG DUMB_INIT_VERSION=1.2.5 +ARG DUMB_INIT_BIN_DIR=${EMG_LOCAL_BASE_DIR}/dumb-init/${DUMB_INIT_VERSION}/bin +ARG DUMB_INIT_DOWNLOAD_URL=https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_x86_64 + +ARG GOSU_VERSION=1.17 +ARG GOSU_BIN_DIR=${EMG_LOCAL_BASE_DIR}/gosu/${GOSU_VERSION}/bin +ARG GOSU_DOWNLOAD_URL=https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 + +################################################################## +# update lists +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get update + +################################################################## +# installing utils +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + bzip2 \ +# cmatrix \ +# cmatrix-xfont \ + cron \ + curl \ +# clzip \ + dos2unix \ + ffmpeg \ + fontconfig \ + git \ +# git-extras \ + git-flow \ + git-cvs \ + git-doc \ + git-email \ +# git-mediawiki \ +# git-crypt \ + git-lfs \ +# git-ftp \ + gnupg \ + gnupg2 \ + graphicsmagick \ + gzip \ + htop \ + iftop \ +# iotop \ + iperf \ + iperf3 \ + iputils-ping \ + jq \ + kmod \ + libxml2-dev \ + libxml2-utils \ +# lbzip2 \ + libsvn-java \ + locales \ + lsb-release \ + lsof \ + lynx \ + lzma \ + lzip \ + lzop \ + mc \ + mercurial \ + nano \ +# nload \ + nmap \ + openssl \ + perl \ + procps \ +# pbzip2 \ +# plzip \ + p7zip-full \ + p7zip-rar \ + rsync \ +# rar \ +# screenfetch \ + smbclient \ + subversion \ + telnet \ + tmux \ + tree \ + util-linux \ + uuid-runtime \ + unrar \ + xz-utils \ + wget \ + zip \ + tini \ + libzip4 \ + acl \ + aptitude \ + sudo \ + cvs \ + python3-pip \ + python3-all \ +# rclone \ + logrotate \ + subversion-tools +# pev + +################################################################## +# installing fs-tools +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + btrfs-progs \ + e2fsprogs \ + f2fs-tools \ + dosfstools \ +# hfsutils \ +# hfsprogs \ + jfsutils \ + mdadm \ + util-linux \ + cryptsetup \ + lvm2 \ + nilfs-tools \ + ntfs-3g \ +# reiser4progs \ + reiserfsprogs \ + udftools \ + xfsprogs \ + xfsdump + +################################################################## +# git fresh binary +################################################################## +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \ + gpg --export --output /etc/apt/keyrings/launchpad-git.gpg F911AB184317630C59970973E363C90F8F1B6217 && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list +COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list +COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + git + +RUN echo "=============================================" && \ + echo git $(git --version) && \ + echo "=============================================" + +################################################################## +# git-lfs official binary +################################################################## +RUN curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | gpg --dearmor > /etc/apt/keyrings/github_git-lfs-archive-keyring.gpg && \ + rm -rfv /etc/apt/sources.list.d/github_git-lfs.list +COPY etc/apt/sources.list.d/github_git-lfs.list /etc/apt/sources.list.d/github_git-lfs.list +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + git \ + git-lfs && \ + git-lfs install --skip-repo + +RUN echo "=============================================" && \ + echo git $(git --version) && \ + echo git-lfs $(git-lfs --version) && \ + echo "=============================================" + +################################################################## +# gh official binary +################################################################## +RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --batch --yes --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + gh + +RUN echo "=============================================" && \ + echo gh $(gh --version) && \ + echo "=============================================" + +################################################################## +# Install p4client +################################################################## +RUN mkdir -p ${P4_BIN_DIR} +ADD ${P4_DOWNLOAD_URL} ${P4_BIN_DIR} +RUN chmod +x ${P4_BIN_DIR}/p4 +ENV PATH="${P4_BIN_DIR}:${PATH}" + +################################################################## +# Install 7z official binary +################################################################## +RUN mkdir -p ${SZ_BIN_DIR} +ADD ${SZ_DOWNLOAD_URL} /tmp + +RUN tar -xf ${SZ_TEMP} --directory ${SZ_BIN_DIR} && \ + chmod +x ${SZ_BIN_DIR}/7zz && \ + chmod +x ${SZ_BIN_DIR}/7zzs && \ + find ${SZ_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name '7zz' ! -name '7zzs' -exec mv {} ${SZ_BIN_DIR}/.. \; + +ENV PATH="${SZ_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo 7zz $(7zz | head -4) && \ + echo 7z $(7z | head -4) && \ + echo "=============================================" + +################################################################## +# Install LazyGit official binary +################################################################## +RUN mkdir -p ${LAZYGIT_BIN_DIR} +ADD ${LAZYGIT_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LAZYGIT_TEMP} --directory ${LAZYGIT_BIN_DIR} && \ + chmod +x ${LAZYGIT_BIN_DIR}/lazygit && \ + find ${LAZYGIT_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name 'lazygit' -exec mv {} ${LAZYGIT_BIN_DIR}/.. \; + +ENV PATH="${LAZYGIT_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo lazygit $(lazygit --version) && \ + echo "=============================================" + +################################################################## +# Install LazyCLI official binary +################################################################## +RUN mkdir -p ${LAZYCLI_BIN_DIR} +ADD ${LAZYCLI_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LAZYCLI_TEMP} --directory ${LAZYCLI_BIN_DIR} && \ + chmod +x ${LAZYCLI_BIN_DIR}/lazycli && \ + find ${LAZYCLI_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name 'lazycli' -exec mv {} ${LAZYCLI_BIN_DIR}/.. \; + +ENV PATH="${LAZYCLI_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo lazycli $(lazycli --version) && \ + echo "=============================================" + +################################################################## +# Install LazyNPM official binary +################################################################## +RUN mkdir -p ${LAZYNPM_BIN_DIR} +ADD ${LAZYNPM_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LAZYNPM_TEMP} --directory ${LAZYNPM_BIN_DIR} && \ + chmod +x ${LAZYNPM_BIN_DIR}/lazynpm && \ + find ${LAZYNPM_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name 'lazynpm' -exec mv {} ${LAZYNPM_BIN_DIR}/.. \; + +ENV PATH="${LAZYNPM_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo lazynpm $(lazynpm --version) && \ + echo "=============================================" + +################################################################## +# Install LazyDocker official binary +################################################################## +RUN mkdir -p ${LAZYDOCKER_BIN_DIR} +ADD ${LAZYDOCKER_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LAZYDOCKER_TEMP} --directory ${LAZYDOCKER_BIN_DIR} && \ + chmod +x -R ${LAZYDOCKER_BIN_DIR}/lazydocker && \ + find ${LAZYDOCKER_BIN_DIR} -maxdepth 1 -mindepth 1 ! -name 'lazydocker' -exec mv {} ${LAZYDOCKER_BIN_DIR}/.. \; + +ENV PATH="${LAZYDOCKER_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo lazydocker $(lazydocker --version) && \ + echo "=============================================" + +################################################################## +# dumb init +################################################################## +RUN mkdir -p ${DUMB_INIT_BIN_DIR} +ADD ${DUMB_INIT_DOWNLOAD_URL} ${DUMB_INIT_BIN_DIR} + +RUN mv -fv ${DUMB_INIT_BIN_DIR}/dumb-init_${DUMB_INIT_VERSION}_x86_64 ${DUMB_INIT_BIN_DIR}/dumb-init && \ + chmod +x ${DUMB_INIT_BIN_DIR}/dumb-init + +ENV PATH="${DUMB_INIT_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo dumb-init $(dumb-init --version) && \ + echo "=============================================" + +################################################################## +# gosu for easy step-down from root +################################################################## +RUN mkdir -p ${GOSU_BIN_DIR} +ADD ${GOSU_DOWNLOAD_URL} ${GOSU_BIN_DIR} + +RUN mv -fv ${GOSU_BIN_DIR}/gosu-amd64 ${GOSU_BIN_DIR}/gosu && \ + chmod +x -R ${GOSU_BIN_DIR}/gosu + +ENV PATH="${GOSU_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo gosu $(gosu --version) && \ + echo "=============================================" + +################################################################## +# Cleanup +################################################################## +RUN echo "clean up" && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/main/Makefile b/linux/ecosystem/epicmorg/astra/1.8-alse/main/Makefile new file mode 100644 index 000000000..1e4371492 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/main/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/main/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.8-alse/main/docker-compose.yml new file mode 100644 index 000000000..eed31b2ff --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/main/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.8-main" + build: + context: . diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/github_git-lfs.list new file mode 100644 index 000000000..bf8b9bbaf --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/github_git-lfs.list @@ -0,0 +1,2 @@ +deb [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/debian/ bookworm main +deb-src [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/debian/ bookworm main diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/launchpad_git-mainline.list new file mode 100644 index 000000000..09dc5aa02 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -0,0 +1,5 @@ +# mainline +deb [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/candidate/ubuntu jammy main +deb-src [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/candidate/ubuntu jammy main + + diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/launchpad_git-stable.list new file mode 100644 index 000000000..17a2907e4 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/main/etc/apt/sources.list.d/launchpad_git-stable.list @@ -0,0 +1,3 @@ +# stable +deb [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main +deb-src [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/main/requirements.txt b/linux/ecosystem/epicmorg/astra/1.8-alse/main/requirements.txt new file mode 100644 index 000000000..568608d59 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/main/requirements.txt @@ -0,0 +1,3 @@ +PyYAML +python-dotenv +kaniko-wrapper diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/Dockerfile b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/Dockerfile new file mode 100644 index 000000000..c81bbced7 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/Dockerfile @@ -0,0 +1,102 @@ +FROM quay.io/epicmorg/astralinux:1.8-rootfs +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" + +################################################################## +# prepare system +################################################################## +RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done +RUN mkdir -p /etc/apt/keyrings + +################################################################## +# sources list +################################################################## +RUN rm -rfv /etc/apt/sources.list +RUN rm -rfv /etc/apt/sources.list.d/debian.sources +RUN rm -rfv /etc/locale.gen + +COPY etc/apt/apt.conf.d/99-no-check-valid-until /etc/apt/apt.conf.d/99-no-check-valid-until +COPY etc/apt/apt.conf.d/98-allow-unauthenticated /etc/apt/apt.conf.d/98-allow-unauthenticated +COPY etc/apt/apt.conf.d/97-allow-cert-exp /etc/apt/apt.conf.d/97-allow-cert-exp +COPY etc/apt/apt.conf.d/96-apt-retries /etc/apt/apt.conf.d/96-apt-retries +COPY etc/apt/sources.list /etc/apt/sources.list +COPY etc/locale.gen /etc/locale.gen +COPY usr/local/share/ca-certificates /usr/local/share/ca-certificates + +RUN mkdir -p /etc/apt/keyrings +RUN apt-get update && \ + apt-get dist-upgrade -y + +################################################################## +# installing utils +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ + apt-transport-https \ + apt-utils \ + aptitude \ + bash \ + binutils \ + ca-certificates \ + coreutils \ + curl \ + dirmngr \ + file \ + gnupg \ + gnupg1 \ + gnupg2 \ + locales \ + locate \ +# rar \ + software-properties-common \ + sudo \ + unrar \ + unrar-free \ + unzip \ + wget \ + zip + +RUN update-ca-certificates --fresh + +################################################################## +# update locales +################################################################## +RUN locale-gen + +################################################################## +# Create Base directory for various soft +################################################################## +ENV EMG_LOCAL_BASE_DIR=/usr/local/share/epicmorg +ENV EMG_WELCOME_MESSAGE=true +ENV EMG_DONATION_MESSAGE=true +RUN mkdir -p ${EMG_LOCAL_BASE_DIR} +COPY usr/local/epicmorg ${EMG_LOCAL_BASE_DIR} +RUN chmod +x ${EMG_LOCAL_BASE_DIR}/welcome.sh && \ + echo '[ ! -z "$TERM" -a -x ${EMG_LOCAL_BASE_DIR}/welcome.sh -a -x ${EMG_LOCAL_BASE_DIR}/welcome.sh ] && ${EMG_LOCAL_BASE_DIR}/welcome.sh' >> /etc/bash.bashrc + +################################################################## +# Prepare dhparam.pem (4096 bit) +################################################################## +ENV SSL_DHPARAM_FILE=/etc/ssl/dhparam.pem +COPY etc/ssl/dhparam.pem ${SSL_DHPARAM_FILE} +RUN openssl dhparam -in ${SSL_DHPARAM_FILE} -text -noout | grep bit + +################################################################## +# Set default workdir +################################################################## +WORKDIR ${EMG_LOCAL_BASE_DIR} + +################################################################## +# Cleanup +################################################################## +RUN echo "clean up" && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +################################################################## +# update file db +################################################################## +RUN updatedb diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/Makefile b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/Makefile new file mode 100644 index 000000000..ff56425bb --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build --squash + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/docker-compose.yml new file mode 100644 index 000000000..73961a9ae --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.8-slim" + build: + context: . diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/96-apt-retries new file mode 100644 index 000000000..73262ccc3 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/96-apt-retries @@ -0,0 +1 @@ +Acquire::Retries "9"; diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp new file mode 100644 index 000000000..e7ec46810 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -0,0 +1,2 @@ +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated new file mode 100644 index 000000000..b36cd01c8 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/98-allow-unauthenticated @@ -0,0 +1 @@ +APT::Get::AllowUnauthenticated "true"; diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until new file mode 100644 index 000000000..4e6d9209d --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/apt.conf.d/99-no-check-valid-until @@ -0,0 +1 @@ +Acquire::Check-Valid-Until no; diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/sources.list new file mode 100644 index 000000000..66d8ffd3f --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/apt/sources.list @@ -0,0 +1,11 @@ +# Основной репозиторий, включающий актуальное оперативное или срочное обновление +deb https://dl.astralinux.ru/astra/stable/1.8_x86-64/repository-main/ 1.8_x86-64 main contrib non-free non-free-firmware + +# Расширенный репозиторий, соответствующий актуальному оперативному обновлению +deb https://dl.astralinux.ru/astra/stable/1.8_x86-64/extended-repository/ 1.8_x86-64 main contrib non-free non-free-firmware + +deb https://dl.astralinux.ru/astra/frozen/1.8_x86-64/1.8.1/main-repository/ 1.8_x86-64 main contrib non-free non-free-firmware +deb https://dl.astralinux.ru/astra/frozen/1.8_x86-64/1.8.1/extended-repository/ 1.8_x86-64 main contrib non-free non-free-firmware + +deb https://dl.astralinux.ru/astra/frozen/1.8_x86-64/1.8.2/main-repository/ 1.8_x86-64 contrib main non-free non-free-firmware +deb https://dl.astralinux.ru/astra/frozen/1.8_x86-64/1.8.2/extended-repository/ 1.8_x86-64 contrib main non-free non-free-firmware diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/locale.gen b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/locale.gen new file mode 100644 index 000000000..02f100afa --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/locale.gen @@ -0,0 +1,12 @@ +en_GB.UTF-8 UTF-8 +en_GB ISO-8859-1 +en_GB.ISO-8859-15 ISO-8859-15 +en_US.UTF-8 UTF-8 +en_US ISO-8859-1 +en_US.ISO-8859-15 ISO-8859-15 +ru_RU.UTF-8 UTF-8 +ru_RU.KOI8-R KOI8-R +ru_RU ISO-8859-5 +ru_RU.CP1251 CP1251 +ru_UA.UTF-8 UTF-8 +ru_UA KOI8-U diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/ssl/dhparam.pem b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/ssl/dhparam.pem new file mode 100644 index 000000000..55f4b8287 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/etc/ssl/dhparam.pem @@ -0,0 +1,13 @@ +-----BEGIN DH PARAMETERS----- +MIICCAKCAgEAm+0RAGNHQ4/g2aE46V193TNcXR3dXxxe5YI2aqinYhxvYt2kv/p9 +sSs/OKRcTm2t6/yJXWH2wo7qLcxydvdFIRb1uMOZxBYSxh4DzZ6lv2saqK32Nf5b +iUS+wuA3mzB+WuUsuv3efyb7C8SQ3gY0JQSuA7jRSGUjfF6UBYIf0A10hW/dPrUl +v+uO5QFhU5z7WyJc09GEh2rPUWnUmRUWiKpP7lwRTasB4Q+egJW2vPkP01ichebB +ol/bz8JN/Q81AE/Ird6cNGDA6fm2t20+XTxeDyhAiEBzLtYjrg/HV8JUCYRmas6z +iyYY70eD03lJqRRdYR1uSNEjB3bGxUtKgKKw/weJti8VnQRlvYNcRZ/OQ3ZXfHmn +uZyXzeVmFcXvyA6qWMQy77IVpXcP7m4CIr0Zy6Ac4Ch9yxl3NmnKA5VEOfEWwTSp +5lX+CGFJrnbIaM9tPemoKohGZ9b5Dft0aFkRRCrY+JdfZON9HtxcdmCVi/CNWBC+ +EqvPAfYLYOGWT7FSJmkamLs+RFzKlFjoNMDv4YrMeOfMbcnFh7KIa75O/bhQkX+0 +3O3iW5QnnsxO7zyo4Yj0eIa1HmRWuJSvW3LSSlLCsULiD3TwQaot8xI+lNpdokIt +yujHFq1QxulLQSucG42s/IMdPIgUkETgjMTybITZiX6E480koVlXk2cCAQI= +-----END DH PARAMETERS----- diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/epicmorg/README.md b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/epicmorg/README.md new file mode 100644 index 000000000..83071e9ca --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/epicmorg/README.md @@ -0,0 +1,48 @@ +# About +Hello. This folder contains sub-folders with custom tools such as `gosu`, `dumb-init` and etc. + +Some child images could install to this folder custom compilled products. Example: `nginx`, `php`, etc. + +All directories that contains binaryes (``) will be added to `$PATH`. + +# Structure +pattern: `/usr/local/epicmorg///<..some data and files..>` + +example: +``` +/usr/local/epicmorg/ +|-- 7z +| `-- 7z2407 +| |-- History.txt +| |-- License.txt +| |-- MANUAL +| |-- bin +| `-- readme.txt +|-- dumb-init +| `-- 1.2.5 +| `-- bin +|-- gosu +| `-- 1.17 +| `-- bin +|-- lazycli +| `-- 0.1.15 +| `-- bin +|-- lazydocker +| `-- 0.23.3 +| |-- LICENSE +| |-- README.md +| `-- bin +|-- lazygit +| `-- 0.42.0 +| |-- LICENSE +| |-- README.md +| `-- bin +|-- lazynpm +| `-- 0.1.4 +| |-- LICENSE +| |-- README.md +| `-- bin +`-- p4 + `-- r23.2 + `-- bin +``` diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/epicmorg/welcome.sh b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/epicmorg/welcome.sh new file mode 100644 index 000000000..57a314082 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/epicmorg/welcome.sh @@ -0,0 +1,68 @@ +#!/bin/sh + +# Donation message +show_donation_message() { + if [ "${EMG_DONATION_MESSAGE:-true}" != "false" ]; then + echo "╔══════════════════════════════════════════════════════════════════════════╗" + echo "║ ║" + echo "║ Images are developed under the MIT license and are not the result of ║" + echo "║ commercial activity. If you'd like to support us, feel free to donate ║" + echo "║ using the wallet details below. ║" + echo "║ Thank You! ║" + echo "║ ║" + echo "╠═════════════════════╦════════════════════════════════════════════════════╣" + echo "║ TYPE ║ ADDRESS ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ TON ║ EQDvHXRK-K1ZieJhgTD9JZQk7xCnWzRbctYnUkWq1lZq1bUg ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ ETH ║ 0x26a8443a694f08cdfec966aa6fd72c45068753ec ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ BTC ║ bc1querz8ug9asjmsuy6yn4a94a2athgprnu7e5zq2 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ LTC ║ ltc1qtwwacq8f0n76fer2y83wxu540hddnmf8cdrlvg ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ NVC ║ 4SbMynYETyhmKdggu8f38ULU6yQKiJPuo6 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ DOGE ║ DHyfE1CZzWtyaQiaMmv6g4KvXVQRUgrYE6 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ PPC ║ pQWArPzYoLppNe7ew3QPfto1k1eq66BYUB ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ RVN ║ R9t2LKeLhDSZBKNgUzSDZAossA3UqNvbV3 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ ZEC ║ t1KRMMmwMSZth8vJcd2ZHtPEFKTQ74yVixE ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ XMR ║ 884PqZ1gDjWW7fKxtbaeRoBeSh9EGZbkqUyLriWmuKbwLZrAJ ║" + echo "║ ║ dYUs4wQxoVfEJoW7LBhdQMP9cFhZQpJr6xvg7esHLdCbb1 ║" + echo "╠═════════════════════╬════════════════════════════════════════════════════╣" + echo "║ ║ https://patreon.com/epicmorg ║" + echo "║ WEB LINKS ║ https://ko-fi.com/epicmorg ║" + echo "║ ║ https://ko-fi.com/alexz696 ║" + echo "╚═════════════════════╩════════════════════════════════════════════════════╝" + fi +} + + +# Welcome message +show_welcome_message() { + if [ "${EMG_WELCOME_MESSAGE:-true}" != "false" ]; then + echo "╔══════════════════════════════════════════════════════════════════════════╗" + echo "║ ║" + echo "║ Welcome to one of the containers of the project. ║" + echo "║ ║" + echo "║ * EpicMorg directory with static binaries: '${EMG_LOCAL_BASE_DIR}' ║" + echo "║ * To disable Welcome message switch 'EMG_WELCOME_MESSAGE' to 'false' ║" + echo "║ * To disable Donation message switch 'EMG_DONATION_MESSAGE' to 'false' ║" + echo "║ ║" + echo "╚══════════════════════════════════════════════════════════════════════════╝" + show_donation_message + echo "╔══════════════════════════════════════════════════════════════════════════╗" + echo "║ Thank you for choosing us. ║" + echo "║ Enjoy using the project! ║" + echo "║ EpicMorg, 2025 ║" + echo "╚══════════════════════════════════════════════════════════════════════════╝" + fi +} + +clear +show_welcome_message +exit 0 diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/epicmorg_epicmorg_rootCA.crt b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/epicmorg_epicmorg_rootCA.crt new file mode 100644 index 000000000..3e868398d --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/epicmorg_epicmorg_rootCA.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEEzCCAvugAwIBAgIUfigpDYicmN8hCXwWg9sHF17jVQ0wDQYJKoZIhvcNAQEN +BQAwgZgxCzAJBgNVBAYTAlJVMQwwCgYDVQQIDANTUEIxDDAKBgNVBAcMA1NQQjES +MBAGA1UECgwJRXBpY00ub3JnMRkwFwYDVQQLDBBFcGljTW9yZyBSb290IENBMRow +GAYDVQQDDBFFcGljTS5vcmcgUm9vdCBDQTEiMCAGCSqGSIb3DQEJARYTZGV2ZWxv +cGVyQGVwaWNtLm9yZzAeFw0yNDA2MDExMjQ3MTlaFw0zNDA1MzAxMjQ3MTlaMIGY +MQswCQYDVQQGEwJSVTEMMAoGA1UECAwDU1BCMQwwCgYDVQQHDANTUEIxEjAQBgNV +BAoMCUVwaWNNLm9yZzEZMBcGA1UECwwQRXBpY01vcmcgUm9vdCBDQTEaMBgGA1UE +AwwRRXBpY00ub3JnIFJvb3QgQ0ExIjAgBgkqhkiG9w0BCQEWE2RldmVsb3BlckBl +cGljbS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCU7/vFW4dm +atoZWEhtFwJ8WhBTWAx0fJzON9kzOM6YIvcu6/gpj++0j9d3hsg4VsTLjqeyRhYN +ts3b71CaW96OHZ+X4GFE87p2dOoBvzCE9iM+WqHJZzjf4Oa2hK/oiQtsbU+q66lw +eASPYRl5AU3gm7bzOLlpEvmabSzowdAU8qLBgrqJkdZf4ZjAcLfOvrVk8WaiUH3J +D19newfGu9LIH76LzOu+w48C+nYqUsHtnxVstQgxFdSGuul2UTqK/Xv+IOwR3tXt +WOhId6rGHxyXXM8Q+3jXcNWLLmGYecPoyQ4v3FNnecQzU76sx5h4Zf6oRA6crdya +3tHoPQqa+td3AgMBAAGjUzBRMB0GA1UdDgQWBBRyeMxzrQllpfSaruwHSo9HEJYE +/zAfBgNVHSMEGDAWgBRyeMxzrQllpfSaruwHSo9HEJYE/zAPBgNVHRMBAf8EBTAD +AQH/MA0GCSqGSIb3DQEBDQUAA4IBAQAXqf8kQqSmFVgRQ9EbwCDzHkjPZq0o7lkU +fZiH6/fshMG63lOLirLYXzQhfkkX2Gm671wAATpyj4GHzaf4+BPxn+1XdqGDV+AP +V6EqKNF5lixdEm9KsSlztQ5+7cN7noLbhfHGFm1ExLdLJi4fY0EgX60ACkwttfkb +OCTSXGK6JHXWE2hGWKhANyFjC62oFWdaptTlLDiSLLjtrMfs7c9Ng+HUh0mMwejS +p2/4a3P0OFbLq/2TnHNTdYSDNM/oilhf0crebElUCYHir1HQF74Sh6G3ut8OO95J +qw2J44n6YPr8LwL4lGCj8+okUvwPqC305zpBjP6c1ztmxQ8+dCKZ +-----END CERTIFICATE----- diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/epicmorg_intermediateCA_code.crt b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/epicmorg_intermediateCA_code.crt new file mode 100644 index 000000000..8aa93749d --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/epicmorg_intermediateCA_code.crt @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIETzCCAzegAwIBAgIUFGpH3osZ3jzR99AL4v3ljyQWtLUwDQYJKoZIhvcNAQEN +BQAwgZgxCzAJBgNVBAYTAlJVMQwwCgYDVQQIDANTUEIxDDAKBgNVBAcMA1NQQjES +MBAGA1UECgwJRXBpY00ub3JnMRkwFwYDVQQLDBBFcGljTW9yZyBSb290IENBMRow +GAYDVQQDDBFFcGljTS5vcmcgUm9vdCBDQTEiMCAGCSqGSIb3DQEJARYTZGV2ZWxv +cGVyQGVwaWNtLm9yZzAeFw0yNDA2MDExMjQ3MjBaFw0zNDA1MzAxMjQ3MjBaMIGv +MQswCQYDVQQGEwJSVTEMMAoGA1UECAwDU1BCMQwwCgYDVQQHDANTUEIxEjAQBgNV +BAoMCUVwaWNNLm9yZzEeMBwGA1UECwwVRXBpY01vcmcgQ29kZSBTaWduaW5nMSww +KgYDVQQDDCNFcGljTS5vcmcgSW50ZXJtZWRpYXRlIENvZGUgU2lnbmluZzEiMCAG +CSqGSIb3DQEJARYTZGV2ZWxvcGVyQGVwaWNtLm9yZzCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAL+Vm2ZwT27KenCyMEujAlmp0c92rCOu3QB/Ji8YR5Fh +EgacatKRQ8kbZfb+uNK8s25oZlYlYd7VxdRp+rwGAjSKjxZ3SoQUj+gt7dGKhgNo +TADMO+17ZC7KS+El4l2esjL4wWSVWT2axnwCbytpe0HG0bfAW3PktSc4X5w+5eoK +YIQ7o00Yp+7tw6MDefQJDjDvigr1BizlCcF3WmygRAP8X+2/gHzzQ2AWqykQ9Vdv +4KPavcCpg7j8rHE4cK2lbET/4vYlexe6GreG6TRvlxntY3BxsERkq8uG5MjriIBl +Z1KKAoGr/0PSjMbqzlzLr0hLeIMZ3JU5AUrIWOZe7iMCAwEAAaN4MHYwHwYDVR0j +BBgwFoAUcnjMc60JZaX0mq7sB0qPRxCWBP8wDwYDVR0TBAgwBgEB/wIBADAOBgNV +HQ8BAf8EBAMCAYYwEwYDVR0lBAwwCgYIKwYBBQUHAwMwHQYDVR0OBBYEFPnuujuW +Y60YVHIXpUV15ioUXU3bMA0GCSqGSIb3DQEBDQUAA4IBAQAJvXBYLcPV6TV0cYt7 +KqQ/d7+BPqE5dHYYNKRGQLrZY05ceVDDAnQoiTO7R6zT75I34D0RjcWbBFcJsfas +gvzgjqEItN7cm051kkthGYFIfASN07n89YqUeQpqQ5tg5MEqNBbNAlTgazgwlMFV +sSh3hZLmeUW6phvU89VineF+IPTEhHWcvoYfmwd4rW0JSEImbr6QmJ8dhw0DSocW +HSSpST9Mk6zEswBbs9Pvpgdewy+DkvApD7bPlfy/8jctAKk2R43jw8XTxWy07phE ++po13WQCC94Ydb2MBh0U6gwTPe+/QAS90IpvhjlDQWWJtaZKNQIHMh9qdrZU/fK1 +pzZh +-----END CERTIFICATE----- diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/intermediateCA_https.crt b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/intermediateCA_https.crt new file mode 100644 index 000000000..f0e7d4027 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/intermediateCA_https.crt @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEQTCCAymgAwIBAgIUFGpH3osZ3jzR99AL4v3ljyQWtLYwDQYJKoZIhvcNAQEN +BQAwgZgxCzAJBgNVBAYTAlJVMQwwCgYDVQQIDANTUEIxDDAKBgNVBAcMA1NQQjES +MBAGA1UECgwJRXBpY00ub3JnMRkwFwYDVQQLDBBFcGljTW9yZyBSb290IENBMRow +GAYDVQQDDBFFcGljTS5vcmcgUm9vdCBDQTEiMCAGCSqGSIb3DQEJARYTZGV2ZWxv +cGVyQGVwaWNtLm9yZzAeFw0yNDA2MDExMjQ3MjBaFw0zNDA1MzAxMjQ3MjBaMIGh +MQswCQYDVQQGEwJSVTEMMAoGA1UECAwDU1BCMQwwCgYDVQQHDANTUEIxEjAQBgNV +BAoMCUVwaWNNLm9yZzEXMBUGA1UECwwORXBpY01vcmcgSFRUUFMxJTAjBgNVBAMM +HEVwaWNNLm9yZyBJbnRlcm1lZGlhdGUgSFRUUFMxIjAgBgkqhkiG9w0BCQEWE2Rl +dmVsb3BlckBlcGljbS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCziMvV2TQ7FRp3SG8ArOre4e34alHUxF7pUFVchMJpEWa6AVFtkPvFs/Zm/KcY +FLxsI8c4UT21lkH6Np1zr8ZUYF/QG32WZTEpeGL3FKI5WO83bSkuaRSGYm9lQ932 +/t+oQ36B+JpLcmnEPr79I4fwU2BG+Yr+1McWqpwOaM10c+2QcXFMUWszno8kxdUG +ixjbxrGGoNJxW+zBhXpC1PBiK5whBe5p/u4cn7i4f8ANTmKd4jn0NSN4K5gnP03J +Wf+ePbbyaXMj4YWamlTMWOFDID9xJHwYaYF8bDVR7cUPKRGJe5D6mc8JcnO8+WHJ +GsvCkRZEA44OEArpXVNwMTgZAgMBAAGjeDB2MB8GA1UdIwQYMBaAFHJ4zHOtCWWl +9Jqu7AdKj0cQlgT/MA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMBMG +A1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTyIWWlrsX5gyd+pGFmYzZVnbXg +GzANBgkqhkiG9w0BAQ0FAAOCAQEAdMkjh0fJI+S1u5efCu0LiwM8SaMz0E8OuaAY +7MNLUu1NeiVqPyxYIxr25OnBzDwTIdsoMNHcgQB+aQFWLH6LFRgheBn6ywqIm/zJ +l3+1tLJhj/NJEI7o0eLDjGwKKoSloj8QdpMc+PIQENQVlwNm1zdHBDQfclAL2t1n +UpLfYrt7Hjta++ZI+8JAgqBb3yijI6fu8KRCQU5SpwEV/ifdFWsPjh68oQFnQafQ +WyiKsy4EPPkCChMI/vD/PTImwes8obyGHD/CshNFvxVnmqNq2o9r5wl6udLMC5NF +fpCbO1B5Sm6SwBhpOAWfaD2SoVP1d0MKCroATB88vpZUCFoaVw== +-----END CERTIFICATE----- diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt new file mode 100644 index 000000000..4c143a21f --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_root_ca_pem.crt @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFwjCCA6qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx +PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu +ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg +Q0EwHhcNMjIwMzAxMjEwNDE1WhcNMzIwMjI3MjEwNDE1WjBwMQswCQYDVQQGEwJS +VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg +YW5kIENvbW11bmljYXRpb25zMSAwHgYDVQQDDBdSdXNzaWFuIFRydXN0ZWQgUm9v +dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMfFOZ8pUAL3+r2n +qqE0Zp52selXsKGFYoG0GM5bwz1bSFtCt+AZQMhkWQheI3poZAToYJu69pHLKS6Q +XBiwBC1cvzYmUYKMYZC7jE5YhEU2bSL0mX7NaMxMDmH2/NwuOVRj8OImVa5s1F4U +zn4Kv3PFlDBjjSjXKVY9kmjUBsXQrIHeaqmUIsPIlNWUnimXS0I0abExqkbdrXbX +YwCOXhOO2pDUx3ckmJlCMUGacUTnylyQW2VsJIyIGA8V0xzdaeUXg0VZ6ZmNUr5Y +Ber/EAOLPb8NYpsAhJe2mXjMB/J9HNsoFMBFJ0lLOT/+dQvjbdRZoOT8eqJpWnVD +U+QL/qEZnz57N88OWM3rabJkRNdU/Z7x5SFIM9FrqtN8xewsiBWBI0K6XFuOBOTD +4V08o4TzJ8+Ccq5XlCUW2L48pZNCYuBDfBh7FxkB7qDgGDiaftEkZZfApRg2E+M9 +G8wkNKTPLDc4wH0FDTijhgxR3Y4PiS1HL2Zhw7bD3CbslmEGgfnnZojNkJtcLeBH +BLa52/dSwNU4WWLubaYSiAmA9IUMX1/RpfpxOxd4Ykmhz97oFbUaDJFipIggx5sX +ePAlkTdWnv+RWBxlJwMQ25oEHmRguNYf4Zr/Rxr9cS93Y+mdXIZaBEE0KS2iLRqa +OiWBki9IMQU4phqPOBAaG7A+eP8PAgMBAAGjZjBkMB0GA1UdDgQWBBTh0YHlzlpf +BKrS6badZrHF+qwshzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzAS +BgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF +AAOCAgEAALIY1wkilt/urfEVM5vKzr6utOeDWCUczmWX/RX4ljpRdgF+5fAIS4vH +tmXkqpSCOVeWUrJV9QvZn6L227ZwuE15cWi8DCDal3Ue90WgAJJZMfTshN4OI8cq +W9E4EG9wglbEtMnObHlms8F3CHmrw3k6KmUkWGoa+/ENmcVl68u/cMRl1JbW2bM+ +/3A+SAg2c6iPDlehczKx2oa95QW0SkPPWGuNA/CE8CpyANIhu9XFrj3RQ3EqeRcS +AQQod1RNuHpfETLU/A2gMmvn/w/sx7TB3W5BPs6rprOA37tutPq9u6FTZOcG1Oqj +C/B7yTqgI7rbyvox7DEXoX7rIiEqyNNUguTk/u3SZ4VXE2kmxdmSh3TQvybfbnXV +4JbCZVaqiZraqc7oZMnRoWrXRG3ztbnbes/9qhRGI7PqXqeKJBztxRTEVj8ONs1d +WN5szTwaPIvhkhO3CO5ErU2rVdUr89wKpNXbBODFKRtgxUT70YpmJ46VVaqdAhOZ +D9EUUn4YaeLaS8AjSF/h7UkjOibNc4qVDiPP+rkehFWM66PVnP1Msh93tc+taIfC +EYVMxjh8zNbFuoc7fzvvrFILLe7ifvEIUqSVIC/AzplM/Jxw7buXFeGP1qVCBEHq +391d/9RAfaZ12zkwFsl+IKwE/OZxW8AHa9i1p4GO0YSNuczzEm4= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt new file mode 100644 index 000000000..2e3f8285d --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem.crt @@ -0,0 +1,41 @@ +-----BEGIN CERTIFICATE----- +MIIHQjCCBSqgAwIBAgICEAIwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx +PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu +ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg +Q0EwHhcNMjIwMzAyMTEyNTE5WhcNMjcwMzA2MTEyNTE5WjBvMQswCQYDVQQGEwJS +VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg +YW5kIENvbW11bmljYXRpb25zMR8wHQYDVQQDDBZSdXNzaWFuIFRydXN0ZWQgU3Vi +IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9YPqBKOk19NFymrE +wehzrhBEgT2atLezpduB24mQ7CiOa/HVpFCDRZzdxqlh8drku408/tTmWzlNH/br +HuQhZ/miWKOf35lpKzjyBd6TPM23uAfJvEOQ2/dnKGGJbsUo1/udKSvxQwVHpVv3 +S80OlluKfhWPDEXQpgyFqIzPoxIQTLZ0deirZwMVHarZ5u8HqHetRuAtmO2ZDGQn +vVOJYAjls+Hiueq7Lj7Oce7CQsTwVZeP+XQx28PAaEZ3y6sQEt6rL06ddpSdoTMp +BnCqTbxW+eWMyjkIn6t9GBtUV45yB1EkHNnj2Ex4GwCiN9T84QQjKSr+8f0psGrZ +vPbCbQAwNFJjisLixnjlGPLKa5vOmNwIh/LAyUW5DjpkCx004LPDuqPpFsKXNKpa +L2Dm6uc0x4Jo5m+gUTVORB6hOSzWnWDj2GWfomLzzyjG81DRGFBpco/O93zecsIN +3SL2Ysjpq1zdoS01CMYxie//9zWvYwzI25/OZigtnpCIrcd2j1Y6dMUFQAzAtHE+ +qsXflSL8HIS+IJEFIQobLlYhHkoE3avgNx5jlu+OLYe0dF0Ykx1PGNjbwqvTX37R +Cn32NMjlotW2QcGEZhDKj+3urZizp5xdTPZitA+aEjZM/Ni71VOdiOP0igbw6asZ +2fxdozZ1TnSSYNYvNATwthNmZysCAwEAAaOCAeUwggHhMBIGA1UdEwEB/wQIMAYB +Af8CAQAwDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTR4XENCy2BTm6KSo9MI7NM +XqtpCzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzCBxwYIKwYBBQUH +AQEEgbowgbcwOwYIKwYBBQUHMAKGL2h0dHA6Ly9yb3N0ZWxlY29tLnJ1L2NkcC9y +b290Y2Ffc3NsX3JzYTIwMjIuY3J0MDsGCCsGAQUFBzAChi9odHRwOi8vY29tcGFu +eS5ydC5ydS9jZHAvcm9vdGNhX3NzbF9yc2EyMDIyLmNydDA7BggrBgEFBQcwAoYv +aHR0cDovL3JlZXN0ci1wa2kucnUvY2RwL3Jvb3RjYV9zc2xfcnNhMjAyMi5jcnQw +gbAGA1UdHwSBqDCBpTA1oDOgMYYvaHR0cDovL3Jvc3RlbGVjb20ucnUvY2RwL3Jv +b3RjYV9zc2xfcnNhMjAyMi5jcmwwNaAzoDGGL2h0dHA6Ly9jb21wYW55LnJ0LnJ1 +L2NkcC9yb290Y2Ffc3NsX3JzYTIwMjIuY3JsMDWgM6Axhi9odHRwOi8vcmVlc3Ry +LXBraS5ydS9jZHAvcm9vdGNhX3NzbF9yc2EyMDIyLmNybDANBgkqhkiG9w0BAQsF +AAOCAgEARBVzZls79AdiSCpar15dA5Hr/rrT4WbrOfzlpI+xrLeRPrUG6eUWIW4v +Sui1yx3iqGLCjPcKb+HOTwoRMbI6ytP/ndp3TlYua2advYBEhSvjs+4vDZNwXr/D +anbwIWdurZmViQRBDFebpkvnIvru/RpWud/5r624Wp8voZMRtj/cm6aI9LtvBfT9 +cfzhOaexI/99c14dyiuk1+6QhdwKaCRTc1mdfNQmnfWNRbfWhWBlK3h4GGE9JK33 +Gk8ZS8DMrkdAh0xby4xAQ/mSWAfWrBmfzlOqGyoB1U47WTOeqNbWkkoAP2ys94+s +Jg4NTkiDVtXRF6nr6fYi0bSOvOFg0IQrMXO2Y8gyg9ARdPJwKtvWX8VPADCYMiWH +h4n8bZokIrImVKLDQKHY4jCsND2HHdJfnrdL2YJw1qFskNO4cSNmZydw0Wkgjv9k +F+KxqrDKlB8MZu2Hclph6v/CZ0fQ9YuE8/lsHZ0Qc2HyiSMnvjgK5fDc3TD4fa8F +E8gMNurM+kV8PT8LNIM+4Zs+LKEV8nqRWBaxkIVJGekkVKO8xDBOG/aN62AZKHOe +GcyIdu7yNMMRihGVZCYr8rYiJoKiOzDqOkPkLOPdhtVlgnhowzHDxMHND/E2WA5p +ZHuNM/m0TXt2wTTPL7JH2YC0gPz/BvvSzjksgzU5rLbRyUKQkgU= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem_2024.crt b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem_2024.crt new file mode 100644 index 000000000..1fbc4a47e --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/slim/usr/local/share/ca-certificates/russian_trusted_sub_ca_pem_2024.crt @@ -0,0 +1,39 @@ +-----BEGIN CERTIFICATE----- +MIIG6DCCBNCgAwIBAgICEAUwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx +PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu +ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg +Q0EwHhcNMjQwNzE1MTI1MDQxWhcNMjkwNzE5MTI1MDQxWjBvMQswCQYDVQQGEwJS +VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg +YW5kIENvbW11bmljYXRpb25zMR8wHQYDVQQDDBZSdXNzaWFuIFRydXN0ZWQgU3Vi +IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1j0rkZECOt1S8o7I +JY+4YKAxuEa5xaHKHXT2EpkuC/0krqMOjUy2oPIRNgR5g8X0Jl6jamxeGLc4Q1tf +ju6or9oSRYThIUhRsFDQNBiBBEXoBgWxTfiKB2eyT97+pz5TBtBiRCPaLGRHYLRb +9Jz2HkJlxbtNPjtDrF5DPHym+mZ1M1z3hIQYAqJwLpsEBnsw/VxWMlxqHoeewd0h +uJMd71KQ5vOKlz7KrIZ6EobNNa6wItuvsfj3kYCK7O78uLHGXXFxdr8Hae9lMUmC +8F7AFwa+bO1LRlTlqW7rE3rLf+jj70N01N8T3o22v14YBaFBWQWncAVYD2JuL3tH +252+kdNOERf1fLbLRigJAbd+hOhWYlNf963TFDgnNPliHNIW72SygVBnI2V3JwO1 +dp1hVKpK/zt8ziGdHW4gmOLTsH50YKdR4jNqUgQv4wASlKn9OpN6zHYc5G8h86fY +BM+zxE5ikGI+I/vIqBuI0eaDU92AWN/YjFLpu8tMu9kLRSCf1vug6FIfDPWVo7iP +ac/SI2v8jnnpaW7ph/Pz3WkzaG7ZZJsfFs+8dploWc6LOoDtbFBhMdGMxu024msC +0PSjZb5ODXPIaO2NsA7fMiAtZcoK6anTUJh4zOP/stA9qsJGNxdrEmiPXSmBZY/N +Y0wkZgZ6JTDhw7038bPvctkblJkCAwEAAaOCAYswggGHMB0GA1UdDgQWBBR3Pdk5 +r0K93FvKduru/c4+YSkwXzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qws +hzAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADCBmAYIKwYBBQUH +AQEEgYswgYgwQAYIKwYBBQUHMAKGNGh0dHA6Ly9udWMtY2RwLnZvc2tob2QucnUv +Y2RwL3Jvb3RjYV9zc2xfcnNhMjAyMi5jcnQwRAYIKwYBBQUHMAKGOGh0dHA6Ly9u +dWMtY2RwLmRpZ2l0YWwuZ292LnJ1L2NkcC9yb290Y2Ffc3NsX3JzYTIwMjIuY3J0 +MIGFBgNVHR8EfjB8MDqgOKA2hjRodHRwOi8vbnVjLWNkcC52b3NraG9kLnJ1L2Nk +cC9yb290Y2Ffc3NsX3JzYTIwMjIuY3JsMD6gPKA6hjhodHRwOi8vbnVjLWNkcC5k +aWdpdGFsLmdvdi5ydS9jZHAvcm9vdGNhX3NzbF9yc2EyMDIyLmNybDANBgkqhkiG +9w0BAQsFAAOCAgEAmsINXtQ7wwUWvIeOr80MdJS/5G4xhyZOVEmeUorThquT672y +cCg3XCxc4fwbiZqSSbBqntQ7RtiTAKMYMvBageKoVHbzz+R4jX01tKcTx8cDePrz +dJ73bLNUorE7RU9QsW4KyiUeRmjMDV23AUlEvuQFTwgkHXvbac1BBdPn9CrssQuF +5EGohZKcQPFiAAc4SHbRNhlr7uAwgpc/erzI9EAcvA6BVAXcVKoeGpV01uexUgZ6 +St5RP9UmDWNA7T4yVXWJ233N0Q8bl+6AswINQ3PosPu6yQQHQjr65YS06epK+AeI +6j+oGR4xI7EhTQhQvaobnGmX/8QQ7XDRYCP2HXYxiffnn/CfZ/BVyKLYeY1ZipjE +nzqdQIC2+Q3WtY8jsVRQMP38WFRmtsIt5snehnPTs5bKGVIcYzj3o3Ex/K7agEz0 +zAJ0JR5ivXZOvNkT0g9x1v+S1IkU3e/nX1a+tpRquMtnHX0L2lXArNHUbaOO9EJt +d57WaIpofV5cVhhwShOgAuBc9UMJF3/n4t4RKiPxtsK8P67gcmphMhslj7AMYrYM +ej2NvQZY4m3ub3CPC/PrTjDONvb+8g5xrKtxBjYqC74HSB4dg9G3WimSDUuP2Su6 +G2y2TUeyJuCvCLz289VoO0vg7cNdMobE3KCqAiiNhN2VBFxHAUKmUoRcRdw= +-----END CERTIFICATE----- From 0e12aced908cabda2ede0c108f2ee92894801eaf Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 29 Apr 2025 00:36:59 +0300 Subject: [PATCH 06/12] perforce --- .../epicmorg.ecosystem.images.perforce.yml | 2 +- .../epicmorg/debian/10-buster/main/Dockerfile | 2 +- .../debian/11-bullseye/main/Dockerfile | 2 +- .../debian/12-bookworm/main/Dockerfile | 2 +- .../epicmorg/debian/13-trixie/main/Dockerfile | 2 +- .../epicmorg/debian/sid/main/Dockerfile | 2 +- .../ecosystem/perforce/base/r24.1/Dockerfile | 94 +++++++++++++++++++ linux/ecosystem/perforce/base/r24.1/Makefile | 44 +++++++++ .../perforce/base/r24.1/docker-compose.yml | 5 + .../ecosystem/perforce/base/r24.2/Dockerfile | 26 ++--- linux/ecosystem/perforce/p4p/r24.1/Dockerfile | 12 +++ linux/ecosystem/perforce/p4p/r24.1/Makefile | 44 +++++++++ .../perforce/p4p/r24.1/docker-compose.yml | 5 + .../perforce/p4p/r24.1/docker-entrypoint.sh | 20 ++++ 14 files changed, 243 insertions(+), 19 deletions(-) create mode 100644 linux/ecosystem/perforce/base/r24.1/Dockerfile create mode 100644 linux/ecosystem/perforce/base/r24.1/Makefile create mode 100644 linux/ecosystem/perforce/base/r24.1/docker-compose.yml create mode 100644 linux/ecosystem/perforce/p4p/r24.1/Dockerfile create mode 100644 linux/ecosystem/perforce/p4p/r24.1/Makefile create mode 100644 linux/ecosystem/perforce/p4p/r24.1/docker-compose.yml create mode 100644 linux/ecosystem/perforce/p4p/r24.1/docker-entrypoint.sh diff --git a/.github/workflows/epicmorg.ecosystem.images.perforce.yml b/.github/workflows/epicmorg.ecosystem.images.perforce.yml index bc5af8480..afcea0360 100644 --- a/.github/workflows/epicmorg.ecosystem.images.perforce.yml +++ b/.github/workflows/epicmorg.ecosystem.images.perforce.yml @@ -20,7 +20,7 @@ jobs: 'r21.1', 'r21.2', 'r22.1', 'r23.1', 'r23.2', - 'r24.2' + 'r24.1', 'r24.2', ] steps: diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile index 564489fa6..498177892 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## RUN echo "Default folder for installation of customized soft is: ${EMG_LOCAL_BASE_DIR}" -ARG P4_VERSION=r23.2 +ARG P4_VERSION=r24.2 ARG P4_BIN_DIR=${EMG_LOCAL_BASE_DIR}/p4/${P4_VERSION}/bin ARG P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile index 5d518ca14..556caaebb 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## RUN echo "Default folder for installation of customized soft is: ${EMG_LOCAL_BASE_DIR}" -ARG P4_VERSION=r23.2 +ARG P4_VERSION=r24.2 ARG P4_BIN_DIR=${EMG_LOCAL_BASE_DIR}/p4/${P4_VERSION}/bin ARG P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile index ac96ed877..f71f68e2f 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## RUN echo "Default folder for installation of customized soft is: ${EMG_LOCAL_BASE_DIR}" -ARG P4_VERSION=r23.2 +ARG P4_VERSION=r24.2 ARG P4_BIN_DIR=${EMG_LOCAL_BASE_DIR}/p4/${P4_VERSION}/bin ARG P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile index 0ed68eff2..829d0ab6d 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## RUN echo "Default folder for installation of customized soft is: ${EMG_LOCAL_BASE_DIR}" -ARG P4_VERSION=r23.2 +ARG P4_VERSION=r24.2 ARG P4_BIN_DIR=${EMG_LOCAL_BASE_DIR}/p4/${P4_VERSION}/bin ARG P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 diff --git a/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile index f0cef9bc1..e0fb47f14 100644 --- a/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## RUN echo "Default folder for installation of customized soft is: ${EMG_LOCAL_BASE_DIR}" -ARG P4_VERSION=r23.2 +ARG P4_VERSION=r24.2 ARG P4_BIN_DIR=${EMG_LOCAL_BASE_DIR}/p4/${P4_VERSION}/bin ARG P4_DOWNLOAD_URL=https://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64/p4 diff --git a/linux/ecosystem/perforce/base/r24.1/Dockerfile b/linux/ecosystem/perforce/base/r24.1/Dockerfile new file mode 100644 index 000000000..6a8dc63cd --- /dev/null +++ b/linux/ecosystem/perforce/base/r24.1/Dockerfile @@ -0,0 +1,94 @@ +FROM quay.io/epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# perforce default envs +################################################################## +ENV P4_VERSION=r24.1 +ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 +ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 +ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker +ENV P4D_DOWNLOAD_URL=${P4_CDN_URL}/p4d +ENV P4DCTL_DOWNLOAD_URL=${P4_CDN_URL}/p4dctl +ENV P4MIGRATE_DOWNLOAD_URL=${P4_CDN_URL}/p4migrate +ENV P4MONPE_DOWNLOAD_URL=${P4_CDN_URL}/p4mon-prometheus-exporter +ENV P4P_DOWNLOAD_URL=${P4_CDN_URL}/p4p +ENV PERFMERGE_DOWNLOAD_URL=${P4_CDN_URL}/perfmerge +ENV PERFSPLIT_DOWNLOAD_URL=${P4_CDN_URL}/perfsplit + +ENV P4DEBUG= +ENV P4PROOT= +ENV P4PCACHE=/perforce/cache +ENV P4LOG=/perforce/logs/p4p.log +ENV P4TARGET= +ENV P4PORT=1666 +ENV P4ARGS= + +ENV P4_BIN=/usr/bin/p4 +ENV P4BROKER_BIN=/usr/bin/p4broker +ENV P4D_BIN=/usr/bin/p4d +ENV P4DCTL_BIN=/usr/bin/p4dctl +ENV P4MIGRATE_BIN=/usr/bin/p4migrate +ENV P4MONPE_BIN=/usr/bin/p4mon-prometheus-exporter +ENV P4P_BIN=/usr/bin/p4p +ENV PERFMERGE_BIN=/usr/bin/perfmerge +ENV PERFSPLIT_BIN=/usr/bin/perfsplit + +################################################################## +# Install perforce binaries +################################################################## +RUN rm -rfv \ + ${P4_BIN} \ + ${P4BROKER_BIN} \ + ${P4D_BIN} \ + ${P4DCTL_BIN} \ + ${P4MIGRATE_BIN} \ + ${P4MONPE_BIN} \ + ${P4P_BIN} \ + ${PERFMERGE_BIN} \ + ${PERFSPLIT_BIN} + +RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue -P /usr/bin \ + ${P4_DOWNLOAD_URL} \ + ${P4BROKER_DOWNLOAD_URL} \ + ${P4D_DOWNLOAD_URL} \ + ${P4DCTL_DOWNLOAD_URL} \ + ${P4MIGRATE_DOWNLOAD_URL} \ + ${P4MONPE_DOWNLOAD_URL} \ + ${P4P_DOWNLOAD_URL} \ + ${PERFMERGE_DOWNLOAD_URL} \ + ${PERFSPLIT_DOWNLOAD_URL} + +RUN chmod +x \ + ${P4_BIN} \ + ${P4BROKER_BIN} \ + ${P4D_BIN} \ + ${P4DCTL_BIN} \ + ${P4MIGRATE_BIN} \ + ${P4MONPE_BIN} \ + ${P4P_BIN} \ + ${PERFMERGE_BIN} \ + ${PERFSPLIT_BIN} + +# RUN echo "##################################################################" && \ +# ${P4_BIN} -V && \ +# echo "##################################################################" && \ +# ${P4BROKER_BIN} -V && \ +# echo "##################################################################" && \ +# ${P4D_BIN} -V && \ +# echo "##################################################################" && \ +# ${P4DCTL_BIN} -V && \ +# echo "##################################################################" && \ +# ${P4MIGRATE_BIN} -V && \ +# echo "##################################################################" && \ +# ${P4MONPE_BIN} -V && \ +# echo "##################################################################" && \ +# ${P4P_BIN} -V && \ +# echo "##################################################################" && \ +# ${PERFMERGE_BIN} -V && \ +# echo "##################################################################" && \ +# ${PERFSPLIT_BIN} -V && \ +# echo "##################################################################" + +WORKDIR /perforce diff --git a/linux/ecosystem/perforce/base/r24.1/Makefile b/linux/ecosystem/perforce/base/r24.1/Makefile new file mode 100644 index 000000000..1e4371492 --- /dev/null +++ b/linux/ecosystem/perforce/base/r24.1/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/perforce/base/r24.1/docker-compose.yml b/linux/ecosystem/perforce/base/r24.1/docker-compose.yml new file mode 100644 index 000000000..c25db108f --- /dev/null +++ b/linux/ecosystem/perforce/base/r24.1/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/perforce:r24.1" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/perforce/base/r24.2/Dockerfile b/linux/ecosystem/perforce/base/r24.2/Dockerfile index 99a963f89..ad1066d67 100644 --- a/linux/ecosystem/perforce/base/r24.2/Dockerfile +++ b/linux/ecosystem/perforce/base/r24.2/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # perforce default envs ################################################################## -ENV P4_VERSION=r23.1 +ENV P4_VERSION=r24.2 ENV P4_CDN_URL=http://filehost.perforce.com/perforce/${P4_VERSION}/bin.linux26x86_64 ENV P4_DOWNLOAD_URL=${P4_CDN_URL}/p4 ENV P4BROKER_DOWNLOAD_URL=${P4_CDN_URL}/p4broker @@ -29,11 +29,11 @@ ENV P4_BIN=/usr/bin/p4 ENV P4BROKER_BIN=/usr/bin/p4broker ENV P4D_BIN=/usr/bin/p4d ENV P4DCTL_BIN=/usr/bin/p4dctl -#ENV P4MIGRATE_BIN=/usr/bin/p4migrate +ENV P4MIGRATE_BIN=/usr/bin/p4migrate ENV P4MONPE_BIN=/usr/bin/p4mon-prometheus-exporter ENV P4P_BIN=/usr/bin/p4p -#ENV PERFMERGE_BIN=/usr/bin/perfmerge -#ENV PERFSPLIT_BIN=/usr/bin/perfsplit +ENV PERFMERGE_BIN=/usr/bin/perfmerge +ENV PERFSPLIT_BIN=/usr/bin/perfsplit ################################################################## # Install perforce binaries @@ -43,7 +43,7 @@ RUN rm -rfv \ ${P4BROKER_BIN} \ ${P4D_BIN} \ ${P4DCTL_BIN} \ -# ${P4MIGRATE_BIN} \ + ${P4MIGRATE_BIN} \ ${P4MONPE_BIN} \ ${P4P_BIN} \ ${PERFMERGE_BIN} \ @@ -54,22 +54,22 @@ RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${P4BROKER_DOWNLOAD_URL} \ ${P4D_DOWNLOAD_URL} \ ${P4DCTL_DOWNLOAD_URL} \ -# ${P4MIGRATE_DOWNLOAD_URL} \ + ${P4MIGRATE_DOWNLOAD_URL} \ ${P4MONPE_DOWNLOAD_URL} \ - ${P4P_DOWNLOAD_URL} -# ${PERFMERGE_DOWNLOAD_URL} \ -# ${PERFSPLIT_DOWNLOAD_URL} + ${P4P_DOWNLOAD_URL} \ + ${PERFMERGE_DOWNLOAD_URL} \ + ${PERFSPLIT_DOWNLOAD_URL} RUN chmod +x \ ${P4_BIN} \ ${P4BROKER_BIN} \ ${P4D_BIN} \ ${P4DCTL_BIN} \ -# ${P4MIGRATE_BIN} \ + ${P4MIGRATE_BIN} \ ${P4MONPE_BIN} \ - ${P4P_BIN} -# ${PERFMERGE_BIN} \ -# ${PERFSPLIT_BIN} + ${P4P_BIN} \ + ${PERFMERGE_BIN} \ + ${PERFSPLIT_BIN} # RUN echo "##################################################################" && \ # ${P4_BIN} -V && \ diff --git a/linux/ecosystem/perforce/p4p/r24.1/Dockerfile b/linux/ecosystem/perforce/p4p/r24.1/Dockerfile new file mode 100644 index 000000000..81c10b7a0 --- /dev/null +++ b/linux/ecosystem/perforce/p4p/r24.1/Dockerfile @@ -0,0 +1,12 @@ +FROM quay.io/epicmorg/perforce:r24.1 +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +VOLUME /perforce/cache +VOLUME /perforce/logs +WORKDIR /perforce + +EXPOSE 1666 + +ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"] +CMD ["docker-entrypoint.sh"] diff --git a/linux/ecosystem/perforce/p4p/r24.1/Makefile b/linux/ecosystem/perforce/p4p/r24.1/Makefile new file mode 100644 index 000000000..1e4371492 --- /dev/null +++ b/linux/ecosystem/perforce/p4p/r24.1/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/perforce/p4p/r24.1/docker-compose.yml b/linux/ecosystem/perforce/p4p/r24.1/docker-compose.yml new file mode 100644 index 000000000..8db2e4d9e --- /dev/null +++ b/linux/ecosystem/perforce/p4p/r24.1/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/p4p:r24.1" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/perforce/p4p/r24.1/docker-entrypoint.sh b/linux/ecosystem/perforce/p4p/r24.1/docker-entrypoint.sh new file mode 100644 index 000000000..1db87f256 --- /dev/null +++ b/linux/ecosystem/perforce/p4p/r24.1/docker-entrypoint.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +: ${P4ARGS:=} +: ${P4DEBUG:=} +: ${P4PROOT:=} +: ${P4PCACHE:=/perforce/cache} +: ${P4LOG:=/perforce/logs/p4p.log} +: ${P4TARGET:=} +: ${P4PORT:=1666} + +if [[ -z "${P4TARGET}" ]]; then + echo "[p4p] FATAL: env P4TARGET is not set. Please, set it and try again. Shutting down." + exit 1 +fi + +echo "======================================================" +echo "[p4p] Starting up..." +echo "======================================================" + +p4p -p ${P4PORT} -r ${P4CACHE} -t ${P4TARGET} -L ${P4LOG} ${P4ARGS} From 254b3d061a849c2d57cda559377e2ce76c78ba47 Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 29 Apr 2025 00:45:12 +0300 Subject: [PATCH 07/12] astra develop --- .../astra/1.7-alse/develop/Dockerfile | 1352 +++++++++++++++-- .../astra/1.8-alse/develop/Dockerfile | 1264 +++++++++++++++ .../epicmorg/astra/1.8-alse/develop/Makefile | 44 + .../astra/1.8-alse/develop/docker-compose.yml | 5 + .../epicmorg/astra/1.8-alse/main/Dockerfile | 4 +- 5 files changed, 2554 insertions(+), 115 deletions(-) create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/develop/Dockerfile create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/develop/Makefile create mode 100644 linux/ecosystem/epicmorg/astra/1.8-alse/develop/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Dockerfile b/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Dockerfile index 420020a2a..8ab28e8e5 100644 --- a/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/astra/1.7-alse/develop/Dockerfile @@ -5,147 +5,1273 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ENV BuildDocker true -ENV GOPATH=/usr/local/go -ENV CARGOPATH=/root/.cargo -ENV FLUTTERPATH=/usr/local/flutter -ENV PATH="${FLUTTERPATH}/bin:${CARGOPATH}/bin:${GOPATH}/bin:${PATH}" -ARG BUILDS_DIR=/builds -ARG SRC_DIR=${BUILDS_DIR}/src -ARG EXPORT_DIR=${BUILDS_DIR}/export -ARG NINJA_ARCH=linux -ARG NINJA_VERSION=latest -ARG NINJA_RELEASE_URL=https://api.github.com/repos/ninja-build/ninja/releases/${NINJA_VERSION} +# /etc/ld.so.conf.d/ +ARG LD_CONF_DIR=/etc/ld.so.conf.d/ + +# steam runtime sdk +ENV STEAM_RUNTIME_SDK_DIR=${EMG_LOCAL_BASE_DIR}/valve/steam/runtime-sdk/latest +ARG STEAM_RUNTIME_SDK_BIN_DIR=${STEAM_RUNTIME_SDK_DIR}/bin +ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-runtime-sdk_latest.tar.xz +ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz + +# cmake compiller +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz + +# flutter source tarball +ENV FLUTTER_VERSION=3.29.3 +ENV FLUTTER_CHANNEL=stable +ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} +ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin +ARG FLUTTER_DOWNLOAD_URL=https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz +ARG FLUTTER_TEMP=/tmp/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz + +# ninja source tarball +ENV NINJA_VERSION=1.12.1 +ENV NINJA_DIR=${EMG_LOCAL_BASE_DIR}/ninja/${NINJA_VERSION} +ARG NINJA_BIN_DIR=${NINJA_DIR}/bin +ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-linux.zip +ARG NINJA_TEMP=/tmp/ninja-linux.zip + +# GO source tarball +ENV GO_VERSION=1.24.2 +ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} +ARG GO_BIN_DIR=${GO_DIR}/bin +ARG GO_PATH_DIR=${GO_DIR}/gopath +ARG GO_PATH_BIN_DIR=${GO_PATH_DIR}/bin +ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz +ARG GO_TEMP=/tmp/go${GO_VERSION}.linux-amd64.tar.gz + +# PCRE source tarball +ENV PCRE_VERSION=10.45 +ENV PCRE_DIR=${EMG_LOCAL_BASE_DIR}/pcre2/${PCRE_VERSION} +ENV PCRE_BIN_DIR=${PCRE_DIR}/bin +ENV PCRE_LIB_DIR=${PCRE_DIR}/lib +ENV PCRE_INC_DIR=${PCRE_DIR}/include +ENV PCRE_SRC_DIR=/usr/local/src/pcre2/${PCRE_VERSION} +ARG PCRE_DOWNLOAD_URL=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/pcre2-${PCRE_VERSION}.tar.gz +ARG PCRE_TEMP=/tmp/pcre2-${PCRE_VERSION}.tar.gz +ARG PCRE_TEMP_SRC=/tmp/pcre2-${PCRE_VERSION} + +# luajit2-openresty source tarball +ENV LUAJIT2OR_VERSION=2.1 +ENV LUAJIT2OR_DIR=${EMG_LOCAL_BASE_DIR}/luajit2/${LUAJIT2OR_VERSION} +ENV LUAJIT2OR_BIN_DIR=${PCRE_DIR}/bin +ENV LUAJIT2OR_LIB_DIR=${LUAJIT2OR_DIR}/lib +ENV LUAJIT2OR_INC_DIR=${LUAJIT2OR_DIR}/include +ENV LUAJIT2OR_SRC_DIR=/usr/local/src/luajit2/${LUAJIT2OR_VERSION} +ARG LUAJIT2OR_DOWNLOAD_URL=https://github.com/openresty/luajit2.git +ARG LUAJIT2OR_TEMP_SRC=/tmp/luajit2 + +# zlib source tarball +ENV ZLIB_VERSION=1.3.1 +ENV ZLIB_DIR=${EMG_LOCAL_BASE_DIR}/zlib/${ZLIB_VERSION} +ENV ZLIB_INC_DIR=${ZLIB_DIR}/include +ENV ZLIB_LIB_DIR=${ZLIB_DIR}/lib +ENV ZLIB_SRC_DIR=/usr/local/src/zlib/${ZLIB_VERSION} +ARG ZLIB_DOWNLOAD_URL=https://zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz +ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz +ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} + +# zstd source tarball +ENV ZSTD_VERSION=1.5.7 +ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} +ENV ZSTD_BIN_DIR=${ZSTD_DIR}/bin +ENV ZSTD_INC_DIR=${ZSTD_DIR}/include +ENV ZSTD_LIB_DIR=${ZSTD_DIR}/lib +ENV ZSTD_SRC_DIR=/usr/local/src/zstd/${ZSTD_VERSION} +ARG ZSTD_DOWNLOAD_URL=https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz +ARG ZSTD_TEMP=/tmp/zstd-${ZSTD_VERSION}.tar.gz +ARG ZSTD_TEMP_SRC=/tmp/zstd-${ZSTD_VERSION} + +# IP2Location-C-Library source tarball +ENV IP2LOC_VERSION=8.7.0 +ENV IP2LOC_DIR=${EMG_LOCAL_BASE_DIR}/ip2location/${IP2LOC_VERSION} +ENV IP2LOC_BIN_DIR=${IP2LOC_DIR}/bin +ENV IP2LOC_INC_DIR=${IP2LOC_DIR}/include +ENV IP2LOC_LIB_DIR=${IP2LOC_DIR}/lib +ENV IP2LOC_SRC_DIR=/usr/local/src/ip2location/${IP2LOC_VERSION} +ARG IP2LOC_DOWNLOAD_URL=https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/heads/master.tar.gz +ARG IP2LOC_TEMP=/tmp/master.tar.gz +ARG IP2LOC_TEMP_SRC=/tmp/IP2Location-C-Library-master + +# libatomic_ops source tarball +ENV LIBATOMICOPS_VERSION=7.8.2 +ENV LIBATOMICOPS_DIR=${EMG_LOCAL_BASE_DIR}/libatomic_ops/${LIBATOMICOPS_VERSION} +ENV LIBATOMICOPS_INC_DIR=${LIBATOMICOPS_DIR}/include +ENV LIBATOMICOPS_LIB_DIR=${LIBATOMICOPS_DIR}/lib +ENV LIBATOMICOPS_SRC_DIR=/usr/local/src/libatomic_ops/${LIBATOMICOPS_VERSION} +ARG LIBATOMICOPS_DOWNLOAD_URL=https://github.com/bdwgc/libatomic_ops/releases/download/v${LIBATOMICOPS_VERSION}/libatomic_ops-${LIBATOMICOPS_VERSION}.tar.gz +ARG LIBATOMICOPS_TEMP=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION}.tar.gz +ARG LIBATOMICOPS_TEMP_SRC=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION} + +# libimagequant source +ENV LIBIMAGEQUANT_VERSION=4.3.4 +ARG LIBIMAGEQUANT_DOWNLOAD_URL=https://github.com/ImageOptim/libimagequant +ENV LIBIMAGEQUANT_DIR=${EMG_LOCAL_BASE_DIR}/libimagequant +ENV LIBIMAGEQUANT_SRC_DIR=/usr/local/src/libimagequant/${LIBIMAGEQUANT_VERSION} +ARG LIBIMAGEQUANT_TEMP_SRC=/tmp/libimagequant + +# libraqm source +ENV LIBRAQM_VERSION=0.10.1 +ARG LIBRAQM_DOWNLOAD_URL=https://github.com/HOST-Oman/libraqm +ENV LIBRAQM_DIR=${EMG_LOCAL_BASE_DIR}/libraqm +ENV LIBRAQM_SRC_DIR=/usr/local/src/libraqm/${LIBRAQM_VERSION} +ARG LIBRAQM_TEMP_SRC=/tmp/libraqm + +# libgd source tarball +ENV LIBGD_VERSION=2.3.3 +ENV LIBGD_DIR=${EMG_LOCAL_BASE_DIR}/libgd/${LIBGD_VERSION} +ENV LIBGD_BIN_DIR=${LIBGD_DIR}/bin +ENV LIBGD_INC_DIR=${LIBGD_DIR}/include +ENV LIBGD_LIB_DIR=${LIBGD_DIR}/lib +ENV LIBGD_SRC_DIR=/usr/local/src/libgd/${LIBGD_VERSION} +ARG LIBGD_DOWNLOAD_URL=https://github.com/libgd/libgd/releases/download/gd-${LIBGD_VERSION}/libgd-${LIBGD_VERSION}.tar.gz +ARG LIBGD_TEMP=/tmp/libgd-${LIBGD_VERSION}.tar.gz +ARG LIBGD_TEMP_SRC=/tmp/libgd-${LIBGD_VERSION} + +# libxml2 source tarball +ENV LIBXML2_VERSION=2.13.5 +ENV LIBXML2_DIR=${EMG_LOCAL_BASE_DIR}/libxml2/${LIBXML2_VERSION} +ENV LIBXML2_BIN_DIR=${LIBXML2_DIR}/bin +ENV LIBXML2_INC_DIR=${LIBXML2_DIR}/include +ENV LIBXML2_LIB_DIR=${LIBXML2_DIR}/lib +ENV LIBXML2_SRC_DIR=/usr/local/src/libxml2/${LIBXML2_VERSION} +ARG LIBXML2_DOWNLOAD_URL=https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${LIBXML2_VERSION}/libxml2-v${LIBXML2_VERSION}.tar.gz +ARG LIBXML2_TEMP=/tmp/libxml2-v${LIBXML2_VERSION}.tar.gz +ARG LIBXML2_TEMP_SRC=/tmp/libxml2-v${LIBXML2_VERSION} + +# libxslt source tarball +ENV LIBXSLT_VERSION=1.1.42 +ENV LIBXSLT_DIR=${EMG_LOCAL_BASE_DIR}/libxslt/${LIBXSLT_VERSION} +ENV LIBXSLT_BIN_DIR=${LIBXSLT_DIR}/bin +ENV LIBXSLT_INC_DIR=${LIBXSLT_DIR}/include +ENV LIBXSLT_LIB_DIR=${LIBXSLT_DIR}/lib +ENV LIBXSLT_SRC_DIR=/usr/local/src/libxslt/${LIBXSLT_VERSION} +ARG LIBXSLT_DOWNLOAD_URL=https://gitlab.gnome.org/GNOME/libxslt/-/archive/v${LIBXSLT_VERSION}/libxslt-v${LIBXSLT_VERSION}.tar.gz +ARG LIBXSLT_TEMP=/tmp/libxslt-v${LIBXSLT_VERSION}.tar.gz +ARG LIBXSLT_TEMP_SRC=/tmp/libxslt-v${LIBXSLT_VERSION} + +# maxmind geoip +ENV MM_GEOIP_VERSION=1.6.12 +ENV MM_GEOIP_DIR=${EMG_LOCAL_BASE_DIR}/geoip/${MM_GEOIP_VERSION} +ENV MM_GEOIP_BIN_DIR=${MM_GEOIP_DIR}/bin +ENV MM_GEOIP_INC_DIR=${MM_GEOIP_DIR}/include +ENV MM_GEOIP_LIB_DIR=${MM_GEOIP_DIR}/lib +ENV MM_GEOIP_SRC_DIR=/usr/local/src/geoip/${MM_GEOIP_VERSION} +ARG MM_GEOIP_DOWNLOAD_URL=https://github.com/maxmind/geoip-api-c/releases/download/v${MM_GEOIP_VERSION}/GeoIP-${MM_GEOIP_VERSION}.tar.gz +ARG MM_GEOIP_TEMP=/tmp/GeoIP-${MM_GEOIP_VERSION}.tar.gz +ARG MM_GEOIP_TEMP_SRC=/tmp/GeoIP-${MM_GEOIP_VERSION} + +# Google perftools +ENV GPERFTOOLS_VERSION=2.15 +ENV GPERFTOOLS_DIR=${EMG_LOCAL_BASE_DIR}/gperftools/${GPERFTOOLS_VERSION} +ENV GPERFTOOLS_BIN_DIR=${GPERFTOOLS_DIR}/bin +ENV GPERFTOOLS_INC_DIR=${GPERFTOOLS_DIR}/include +ENV GPERFTOOLS_LIB_DIR=${GPERFTOOLS_DIR}/lib +ENV GPERFTOOLS_SRC_DIR=/usr/local/src/gperftools/${GPERFTOOLS_VERSION} +ARG GPERFTOOLS_DOWNLOAD_URL=https://github.com/gperftools/gperftools/releases/download/gperftools-${GPERFTOOLS_VERSION}/gperftools-${GPERFTOOLS_VERSION}.tar.gz +ARG GPERFTOOLS_TEMP=/tmp/gperftools-${GPERFTOOLS_VERSION}.tar.gz +ARG GPERFTOOLS_TEMP_SRC=/tmp/gperftools-${GPERFTOOLS_VERSION} + +# OpenSSL 1.0.2 +ENV OPENSSL_102_VERSION=1.0.2 +ENV OPENSSL_102_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_102_VERSION} +ENV OPENSSL_102_BIN_DIR=${OPENSSL_102_DIR}/bin +ENV OPENSSL_102_INC_DIR=${OPENSSL_102_DIR}/include +ENV OPENSSL_102_LIB_DIR=${OPENSSL_102_DIR}/lib +ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} +ARG OPENSSL_102_DOWNLOAD_URL=https://github.com/openssl/openssl/releases/download/OpenSSL_1_0_2u/openssl-1.0.2u.tar.gz +ARG OPENSSL_102_TEMP=/tmp/openssl-1.0.2u.tar.gz +ARG OPENSSL_102_TEMP_SRC=/tmp/openssl-1.0.2u + +# OpenSSL 1.1.1 +ENV OPENSSL_111_VERSION=1.1.1 +ENV OPENSSL_111_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_111_VERSION} +ENV OPENSSL_111_BIN_DIR=${OPENSSL_111_DIR}/bin +ENV OPENSSL_111_INC_DIR=${OPENSSL_111_DIR}/include +ENV OPENSSL_111_LIB_DIR=${OPENSSL_111_DIR}/lib +ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} +ARG OPENSSL_111_DOWNLOAD_URL=https://www.openssl.org/source/old/${OPENSSL_111_VERSION}/openssl-${OPENSSL_111_VERSION}w.tar.gz +ARG OPENSSL_111_TEMP=/tmp/openssl-${OPENSSL_111_VERSION}w.tar.gz +ARG OPENSSL_111_TEMP_SRC=/tmp/openssl-${OPENSSL_111_VERSION}w + +# OpenSSL 3.0 +ENV OPENSSL_30_VERSION=3.0.16 +ENV OPENSSL_30_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_30_VERSION} +ENV OPENSSL_30_BIN_DIR=${OPENSSL_30_DIR}/bin +ENV OPENSSL_30_INC_DIR=${OPENSSL_30_DIR}/include +ENV OPENSSL_30_LIB_DIR=${OPENSSL_30_DIR}/lib64 +ENV OPENSSL_30_SRC_DIR=/usr/local/src/openssl/${OPENSSL_30_VERSION} +ARG OPENSSL_30_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_30_VERSION}.tar.gz +ARG OPENSSL_30_TEMP=/tmp/openssl-${OPENSSL_30_VERSION}.tar.gz +ARG OPENSSL_30_TEMP_SRC=/tmp/openssl-${OPENSSL_30_VERSION} + +# OpenSSL 3.1 +ENV OPENSSL_31_VERSION=3.1.8 +ENV OPENSSL_31_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_31_VERSION} +ENV OPENSSL_31_BIN_DIR=${OPENSSL_31_DIR}/bin +ENV OPENSSL_31_INC_DIR=${OPENSSL_31_DIR}/include +ENV OPENSSL_31_LIB_DIR=${OPENSSL_31_DIR}/lib64 +ENV OPENSSL_31_SRC_DIR=/usr/local/src/openssl/${OPENSSL_31_VERSION} +ARG OPENSSL_31_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_31_VERSION}.tar.gz +ARG OPENSSL_31_TEMP=/tmp/openssl-${OPENSSL_31_VERSION}.tar.gz +ARG OPENSSL_31_TEMP_SRC=/tmp/openssl-${OPENSSL_31_VERSION} + +# OpenSSL 3.2 +ENV OPENSSL_32_VERSION=3.2.4 +ENV OPENSSL_32_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_32_VERSION} +ENV OPENSSL_32_BIN_DIR=${OPENSSL_32_DIR}/bin +ENV OPENSSL_32_INC_DIR=${OPENSSL_32_DIR}/include +ENV OPENSSL_32_LIB_DIR=${OPENSSL_32_DIR}/lib64 +ENV OPENSSL_32_SRC_DIR=/usr/local/src/openssl/${OPENSSL_32_VERSION} +ARG OPENSSL_32_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_32_VERSION}.tar.gz +ARG OPENSSL_32_TEMP=/tmp/openssl-${OPENSSL_32_VERSION}.tar.gz +ARG OPENSSL_32_TEMP_SRC=/tmp/openssl-${OPENSSL_32_VERSION} + +# OpenSSL 3.3 +ENV OPENSSL_33_VERSION=3.3.3 +ENV OPENSSL_33_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_33_VERSION} +ENV OPENSSL_33_BIN_DIR=${OPENSSL_33_DIR}/bin +ENV OPENSSL_33_INC_DIR=${OPENSSL_33_DIR}/include +ENV OPENSSL_33_LIB_DIR=${OPENSSL_33_DIR}/lib64 +ENV OPENSSL_33_SRC_DIR=/usr/local/src/openssl/${OPENSSL_33_VERSION} +ARG OPENSSL_33_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_33_VERSION}.tar.gz +ARG OPENSSL_33_TEMP=/tmp/openssl-${OPENSSL_33_VERSION}.tar.gz +ARG OPENSSL_33_TEMP_SRC=/tmp/openssl-${OPENSSL_33_VERSION} + +# OpenSSL 3.4 +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} +ARG OPENSSL_34_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_34_VERSION}.tar.gz +ARG OPENSSL_34_TEMP=/tmp/openssl-${OPENSSL_34_VERSION}.tar.gz +ARG OPENSSL_34_TEMP_SRC=/tmp/openssl-${OPENSSL_34_VERSION} + +# OpenSSL 3.5 +ENV OPENSSL_35_VERSION=3.5.0 +ENV OPENSSL_35_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_35_VERSION} +ENV OPENSSL_35_BIN_DIR=${OPENSSL_35_DIR}/bin +ENV OPENSSL_35_INC_DIR=${OPENSSL_35_DIR}/include +ENV OPENSSL_35_LIB_DIR=${OPENSSL_35_DIR}/lib64 +ENV OPENSSL_35_SRC_DIR=/usr/local/src/openssl/${OPENSSL_35_VERSION} +ARG OPENSSL_35_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP=/tmp/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP_SRC=/tmp/openssl-${OPENSSL_35_VERSION} + +# LibreSSL +ENV LIBRESSL_VERSION=4.0.0 +ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} +ENV LIBRESSL_INC_DIR=${LIBRESSL_DIR}/include +ENV LIBRESSL_LIB_DIR=${LIBRESSL_DIR}/lib +ENV LIBRESSL_SRC_DIR=/usr/local/src/libressl/${LIBRESSL_VERSION} +ARG LIBRESSL_DOWNLOAD_URL=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz +ARG LIBRESSL_TEMP=/tmp/libressl-${LIBRESSL_VERSION}.tar.gz +ARG LIBRESSL_TEMP_SRC=/tmp/libressl-${LIBRESSL_VERSION} + +# BoringSSL +ENV BORINGSSL_VERSION=master +ENV BORINGSSL_DIR=${EMG_LOCAL_BASE_DIR}/boringssl/${BORINGSSL_VERSION} +ENV BORINGSSL_INC_DIR=${BORINGSSL_DIR}/include +ENV BORINGSSL_LIB_DIR=${BORINGSSL_DIR}/lib +ENV BORINGSSL_SRC_DIR=/usr/local/src/boringssl/${BORINGSSL_VERSION} +ARG BORINGSSL_DOWNLOAD_URL=https://boringssl.googlesource.com/boringssl +ARG BORINGSSL_TEMP_SRC=/tmp/boringssl ################################################################## -# Files and folders +# bullseye sources list ################################################################## -RUN mkdir -p ${SRC_DIR} ${EXPORT_DIR} ${PRE_DIR} +RUN apt-get update && \ + apt-get dist-upgrade -y ################################################################## -# update lists +# installing ################################################################## -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update - -################################################################## -# installing utils -################################################################## -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ - at \ - autoconf \ - autoconf-archive \ - automake \ - autopkgtest \ - autotools-dev \ - build-essential \ - cmake \ - cmake-extras \ - docker.io \ - docker-compose \ - devscripts \ - dh-make \ - dpkg-dev \ - extra-cmake-modules \ - fakeroot \ - fuse3 \ - g++ \ - g++-multilib \ - gcc \ - gcc-multilib \ - gdal-bin \ - gdb \ - gnu-standards \ - googletest \ - googletest-tools \ - libgtest-dev \ - golang \ - golang-go \ - krb5-user \ - libavcodec-dev \ - libavfilter-dev \ - libavformat-dev \ - libbz2-dev \ - libc6-dev \ - libcrypto++-dev \ - libegl1-mesa-dev \ - libfreetype6-dev \ - libfuse3-3 \ - libgbm-dev \ - libgd-dev \ - libgdal-dev \ - libgeoip-dev \ - libgeos-dev \ - libgles2-mesa-dev \ - libgtk-3-dev \ - libhiredis-dev \ - libkrb5-dev \ - libldap2-dev \ - liblua5.1-0-dev \ - liblzma-dev \ - libmaxminddb-dev \ - libpam0g-dev \ - libpcre3-dev \ - libperl-dev \ - libproj-dev \ - libprotobuf-c-dev \ - libsdl-image1.2-dev \ - libsdl2-dev \ - libsqlite3-dev \ - libssl-dev \ - libswscale-dev \ - libtool \ - libunwind-dev \ - libvpx-dev \ - libxkbcommon-dev \ - libxml2-dev \ - libxslt1-dev \ - libzip-dev \ - luajit \ - make \ - pkg-config \ - protobuf-c-compiler \ - python3-all-dev \ - strace \ - tcl \ - uuid-dev \ - yasm \ - zlib1g \ - zlib1g-dev +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests --allow-downgrades \ + build-essential \ + autoconf-archive \ + gnu-standards \ + cmake \ + clang \ + meson \ + libunwind-dev \ + at \ + autopkgtest \ + gcc-multilib \ + g++-multilib \ + libxkbcommon-dev \ + libsqlite3-dev \ + liblzma-dev \ + libgtk-3-dev \ + zlib1g-dev \ + libfreetype6-dev \ + libegl1-mesa-dev \ + libgles2-mesa-dev \ + libgbm-dev \ + uuid-dev \ +# nvidia-cg-toolkit \ +# nvidia-cg-dev \ + libavutil-dev \ + libavcodec-dev \ + libxvidcore-dev \ + libtwolame-dev \ + libmp3lame-dev \ + libopus-dev \ + libavcodec-extra \ + libheif-dev \ + libtheora-dev \ + libvorbis-dev \ + libflac-dev \ + libx264-dev \ + libx265-dev \ + libaom-dev \ + libdav1d-dev \ + libaio-dev \ + libsdl2-dev \ + libsdl-image1.2-dev \ + libxml2-dev \ + yasm \ + devscripts \ + automake \ + libtool \ + autotools-dev \ + dpkg-dev \ + fakeroot \ +# checkinstall \ + dh-make \ + zlib1g \ + zlib1g-dev \ + libssl-dev \ + libxslt-dev \ + libgd-dev \ + libpcre2-dev \ + libgeoip-dev \ + libxml++*-dev \ + libkrb5-dev \ + libperl-dev \ + krb5-user \ + luajit \ + liblua5.1-0-dev \ + libmaxminddb-dev \ + libpam0g-dev \ + libldap2-dev \ + libavformat-dev \ + libavfilter-dev \ + libavif-dev \ + libswscale-dev \ + libavcodec-dev \ + libz-dev \ + libhiredis-dev \ + libzip-dev \ + libcrypto++-dev \ + libbz2-dev \ + libvpx-dev \ + libsasl2-dev \ + tcl \ + g++ \ + gcc \ + libc6-dev \ + make \ + pkg-config \ + python3-all-dev \ + g++-multilib \ + autoconf \ + automake \ + libtool \ + gdb \ + strace \ + libbsd-dev \ + libedit-dev \ + libmd-dev \ + valgrind \ +# valgrind-dbg \ + valgrind-mpi \ +# gcovr \ + lcov \ + libsctp-dev \ + libharfbuzz-dev \ + libfribidi-dev \ + libpng-dev \ + libjpeg-dev \ + libfreetype6-dev ################################################################## # Rust compillers ################################################################## -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile complete --default-toolchain stable --verbose -RUN printf "\n--------------------------------\n$(cargo --version)\n--------------------------------\n\n" +ENV CARGO_HOME=${EMG_LOCAL_BASE_DIR}/cargo +ENV RUSTUP_HOME=${EMG_LOCAL_BASE_DIR}/rustup +ARG CARGO_BIN=${CARGO_HOME}/bin + +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile complete --default-toolchain stable --verbose + +ENV PATH="$CARGO_HOME/bin:${PATH}" + +RUN echo "=============================================" && \ + echo cargo $(cargo --version) && \ + echo rustc $(rustc --version) && \ + echo rustup $(rustup --version) && \ + echo "=============================================" + +################################################################## +# CMake +################################################################## +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp + +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest + +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo $(cmake --version) && \ + echo "=============================================" + +################################################################## +# steam runtime and ssdk +################################################################## +RUN mkdir -p ${STEAM_RUNTIME_SDK_DIR} +ADD ${STEAM_RUNTIME_SDK_URL} /tmp + +RUN tar -xf ${STEAM_RUNTIME_SDK_TEMP} --directory ${STEAM_RUNTIME_SDK_DIR} --strip-components=1 && \ + chmod +x ${STEAM_RUNTIME_SDK_BIN_DIR} -R && \ + chmod +x ${STEAM_RUNTIME_SDK_DIR}/setup.sh && \ + chmod +x ${STEAM_RUNTIME_SDK_DIR}/shell.sh && \ + chmod +x ${STEAM_RUNTIME_SDK_DIR}/shell-amd64.sh && \ + chmod +x ${STEAM_RUNTIME_SDK_DIR}/shell-i386.sh +# printf '%s\n' 3 1 Y Y Y | ./setup.sh ################################################################## # Flutter SDK ################################################################## -RUN git clone https://github.com/flutter/flutter.git -b stable /usr/local/flutter -RUN flutter precache -RUN flutter config --no-analytics -RUN dart --disable-analytics -RUN printf "\n--------------------------------\n$(flutter --version)\n--------------------------------\n\n" +RUN mkdir -p ${FLUTTER_DIR} +ADD ${FLUTTER_DOWNLOAD_URL} /tmp + +RUN tar -xf ${FLUTTER_TEMP} --directory ${FLUTTER_DIR} --strip-components=1 && \ + chmod +x ${FLUTTER_BIN_DIR}/dart && \ + chmod +x ${FLUTTER_BIN_DIR}/flutter && \ + chmod +x ${FLUTTER_BIN_DIR}/internal/shared.sh && \ + chmod +x ${FLUTTER_BIN_DIR}/internal/update_dart_sdk.sh + +ENV PATH="${FLUTTER_BIN_DIR}:${PATH}" + +RUN git config --global --add safe.directory ${FLUTTER_DIR} && \ + flutter precache && \ + flutter config --no-analytics && \ + dart --disable-analytics + +RUN echo "=============================================" && \ + echo dart $(dart --version) && \ + echo flutter $(flutter --version) && \ + echo "=============================================" ################################################################## # GO compillers ################################################################## -RUN printf "\n--------------------------------\n$(go version)\n--------------------------------\n\n" +RUN mkdir -p ${GO_DIR} ${GO_PATH_BIN_DIR} ${GO_BIN_DIR} +ADD ${GO_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${GO_TEMP} --directory ${GO_DIR} --strip-components=1 && \ + chmod +x ${GO_BIN_DIR}/go && \ + chmod +x ${GO_BIN_DIR}/gofmt + +ENV GOROOT=${GO_DIR} +ENV GOPATH=${GO_PATH_DIR} +ENV PATH="${GO_BIN_DIR}:${GO_PATH_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo go $(go version) && \ + echo "=============================================" + +################################################################## +# Get NINJA binary +################################################################## +RUN mkdir -p ${NINJA_BIN_DIR} +ADD ${NINJA_DOWNLOAD_URL} /tmp + +RUN 7zz x ${NINJA_TEMP} -o${NINJA_BIN_DIR} -y && \ + chmod +x ${NINJA_BIN_DIR}/ninja + +ENV PATH="${NINJA_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo ninja $(ninja --version) && \ + echo "=============================================" + +################################################################## +# ZLIB library +################################################################## +RUN mkdir -p ${ZLIB_DIR} ${ZLIB_SRC_DIR} +ADD ${ZLIB_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${ZLIB_TEMP} --directory /tmp && \ + cp -rfv ${ZLIB_TEMP_SRC}/* ${ZLIB_SRC_DIR} && \ + ln -sf ${ZLIB_SRC_DIR} ${ZLIB_DIR}/src && \ + cd ${ZLIB_TEMP_SRC} && \ + ./configure \ +# --static \ + --prefix=${ZLIB_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# ZLIB support" >> ${LD_CONF_DIR}/ZLIB.conf && \ + echo ${ZLIB_LIB_DIR} >> ${LD_CONF_DIR}/ZLIB.conf && \ + ldconfig + +################################################################## +# ZSTD library +################################################################## +RUN mkdir -p ${ZSTD_DIR} ${ZSTD_SRC_DIR} +ADD ${ZSTD_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${ZSTD_TEMP} --directory /tmp && \ + cp -rfv ${ZSTD_TEMP_SRC}/* ${ZSTD_SRC_DIR} && \ + ln -sf ${ZSTD_SRC_DIR} ${ZSTD_DIR}/src && \ + cd ${ZSTD_TEMP_SRC} && \ + mkdir -p ${ZSTD_TEMP_SRC}/build/cmake/builddir && \ + cd ${ZSTD_TEMP_SRC}/build/cmake/builddir && \ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${ZSTD_DIR} -DZSTD_BUILD_STATIC=ON -DZSTD_BUILD_SHARED=ON .. && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# ZSTD support" >> ${LD_CONF_DIR}/ZSTD.conf && \ + echo ${ZSTD_LIB_DIR} >> ${LD_CONF_DIR}/ZSTD.conf && \ + ldconfig + +ENV PATH="${ZSTD_BIN_DIR}:${PATH}" + +################################################################## +# PRCE2 static library +################################################################## +RUN mkdir -p ${PCRE_BIN_DIR} ${PCRE_SRC_DIR} +ADD ${PCRE_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${PCRE_TEMP} --directory /tmp && \ + cp -rfv ${PCRE_TEMP_SRC}/* ${PCRE_SRC_DIR} && \ + ln -sf ${PCRE_SRC_DIR} ${PCRE_DIR}/src && \ + cd ${PCRE_TEMP_SRC} && \ + ./configure --prefix=${PCRE_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-rebuild-chartables \ + --enable-pcre2-8 \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --enable-jit \ + --enable-newline-is-cr \ + --enable-newline-is-lf \ + --enable-newline-is-anycrlf \ + --enable-newline-is-any \ + --enable-newline-is-nul \ + --enable-bsr-anycrlf \ + --enable-pcre2grep-libz \ + --enable-pcre2grep-libbz2 \ + --enable-pcre2test-libedit \ + --enable-unicode \ + --enable-valgrind \ + --enable-fuzz-support \ + --enable-diff-fuzz-support \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# PRCE2 support" >> ${LD_CONF_DIR}/PRCE2.conf && \ + echo ${PCRE_LIB_DIR} >> ${LD_CONF_DIR}/PRCE2.conf && \ + ldconfig + +ENV PATH="${PCRE_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo pcre2 $(pcre2-config --version) && \ + echo "=============================================" + +################################################################## +# LuaJIT2 OpenResty 2.1 +################################################################## +RUN mkdir -p ${LUAJIT2OR_DIR} ${LUAJIT2OR_SRC_DIR} && \ + git clone ${LUAJIT2OR_DOWNLOAD_URL} ${LUAJIT2OR_TEMP_SRC} && \ + cp -rfv ${LUAJIT2OR_TEMP_SRC}/* ${LUAJIT2OR_SRC_DIR} && \ + ln -sf ${LUAJIT2OR_SRC_DIR} ${LUAJIT2OR_DIR}/src && \ + cd ${LUAJIT2OR_TEMP_SRC} && \ +# make -j$(nproc) XCFLAGS='-DLUAJIT_ENABLE_GC64' BUILDMODE=static && \ + make -j$(nproc) XCFLAGS='-DLUAJIT_ENABLE_GC64' BUILDMODE=mixed && \ + make -j$(nproc) install PREFIX=${LUAJIT2OR_DIR} && \ + echo "# LuaJIT2 support" >> ${LD_CONF_DIR}/LuaJIT2.conf && \ + echo ${LUAJIT2OR_LIB_DIR} >> ${LD_CONF_DIR}/LuaJIT2.conf && \ + ldconfig + +ENV PATH="${LUAJIT2OR_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo luajit $(luajit -v) && \ + echo "=============================================" + +################################################################## +# IP2Location +################################################################## +RUN mkdir -p ${IP2LOC_DIR} ${IP2LOC_SRC_DIR} +ADD ${IP2LOC_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${IP2LOC_TEMP} --directory /tmp && \ + cp -rfv ${IP2LOC_TEMP_SRC}/* ${IP2LOC_SRC_DIR} && \ + ln -sf ${IP2LOC_SRC_DIR} ${IP2LOC_DIR}/src && \ + cd ${IP2LOC_TEMP_SRC} && \ + autoreconf -i -v --force && \ + aclocal && \ + automake --gnu --add-missing && \ + autoconf && \ + autoreconf -i -v --force && \ + ./configure \ + --prefix=${IP2LOC_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# IP2Location support" >> ${LD_CONF_DIR}/IP2Location.conf && \ + echo ${IP2LOC_LIB_DIR} >> ${LD_CONF_DIR}/IP2Location.conf && \ + ldconfig + +ENV PATH="${IP2LOC_BIN_DIR}:${PATH}" + +################################################################## +# libatomic_ops +################################################################## +RUN mkdir -p ${LIBATOMICOPS_DIR} ${LIBATOMICOPS_SRC_DIR} +ADD ${LIBATOMICOPS_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBATOMICOPS_TEMP} --directory /tmp && \ + cp -rfv ${LIBATOMICOPS_TEMP_SRC}/* ${LIBATOMICOPS_SRC_DIR} && \ + ln -sf ${LIBATOMICOPS_SRC_DIR} ${LIBATOMICOPS_DIR}/src && \ + cd ${LIBATOMICOPS_TEMP_SRC} && \ + ./autogen.sh && \ + ./configure \ + --prefix=${LIBATOMICOPS_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-assertions \ + --with-aix-soname=both \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + ln -sfv ${LIBATOMICOPS_SRC_DIR} ${LIBATOMICOPS_SRC_DIR}/src && \ + echo "# libatomic_ops support" >> ${LD_CONF_DIR}/libatomic_ops.conf && \ + echo ${LIBATOMICOPS_LIB_DIR} >> ${LD_CONF_DIR}/libatomic_ops.conf && \ + ldconfig + +################################################################## +# libimagequant +################################################################## +RUN mkdir -p ${LIBIMAGEQUANT_DIR} ${LIBIMAGEQUANT_SRC_DIR} + +RUN git clone ${LIBIMAGEQUANT_DOWNLOAD_URL} ${LIBIMAGEQUANT_TEMP_SRC} && \ + cp -rfv ${LIBIMAGEQUANT_TEMP_SRC}/* ${LIBIMAGEQUANT_SRC_DIR} && \ + ln -sf ${LIBIMAGEQUANT_SRC_DIR} ${LIBIMAGEQUANT_DIR}/src && \ + cd ${LIBIMAGEQUANT_TEMP_SRC} && \ + cargo build --release && \ + cd ${LIBIMAGEQUANT_TEMP_SRC}/imagequant-sys && \ + cargo build --release && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# libraqm +################################################################## +RUN mkdir -p ${LIBRAQM_DIR} ${LIBRAQM_SRC_DIR} + +RUN git clone ${LIBRAQM_DOWNLOAD_URL} ${LIBRAQM_TEMP_SRC} && \ + cp -rfv ${LIBRAQM_TEMP_SRC}/* ${LIBRAQM_SRC_DIR} && \ + ln -sf ${LIBRAQM_SRC_DIR} ${LIBRAQM_DIR}/src && \ + cd ${LIBRAQM_TEMP_SRC} && \ + meson build && \ + ninja -C build && \ + ninja -C build install + +################################################################## +# libgd +################################################################## +RUN mkdir -p ${LIBGD_DIR} ${LIBGD_SRC_DIR} +ADD ${LIBGD_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBGD_TEMP} --directory /tmp && \ + cp -rfv ${LIBGD_TEMP_SRC}/* ${LIBGD_SRC_DIR} && \ + ln -sf ${LIBGD_SRC_DIR} ${LIBGD_DIR}/src && \ + cd ${LIBGD_TEMP_SRC} && \ + ./bootstrap.sh && \ + ./configure \ + --prefix=${LIBGD_DIR} \ + --disable-silent-rules \ + --enable-static \ + --enable-shared \ + --with-aix-soname=both \ + --with-libiconv-prefix \ + --with-zlib=${ZSTD_SRC_DIR} \ + --with-png --with-freetype \ + --with-raqm=${LIBRAQM_SRC_DIR} \ + --with-fontconfig \ + --with-jpeg \ + --with-liq=${LIBIMAGEQUANT_SRC_DIR} \ + --with-xpm \ + --with-gd \ + --enable-gd-formats \ + --with-tiff \ + --with-webp \ + --with-heif \ + --with-avif \ + --with-x \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# libgd support" >> ${LD_CONF_DIR}/libgd.conf && \ + echo ${LIBGD_LIB_DIR} >> ${LD_CONF_DIR}/libgd.conf && \ + ldconfig + +ENV PATH="${LIBGD_BIN_DIR}:${PATH}" + +# TO FIX +# ################################################################## +# # libxml2 +# ################################################################## +# RUN mkdir -p ${LIBXML2_DIR} ${LIBXML2_SRC_DIR} +# ADD ${LIBXML2_DOWNLOAD_URL} /tmp +# +# RUN tar -xzf ${LIBXML2_TEMP} --directory /tmp && \ +# cp -rfv ${LIBXML2_TEMP_SRC}/* ${LIBXML2_SRC_DIR} && \ +# ln -sf ${LIBXML2_SRC_DIR} ${LIBXML2_DIR}/src && \ +# cd ${LIBXML2_TEMP_SRC} && \ +# ./autogen.sh && \ +# ./configure \ +# --prefix=${LIBXML2_DIR} \ +# --disable-silent-rules \ +# --enable-static \ +# --enable-shared \ +# --with-aix-soname=both \ +# --with-c14n \ +# --with-catalog \ +# --with-debug \ +# --with-ftp \ +# --with-history \ +# --with-html \ +# --with-http \ +# --with-iconv \ +# --with-readline \ +# --with-http \ +# --with-icu \ +# --with-iso8859x \ +# --with-output \ +# --with-pattern \ +# --with-push \ +# --with-python \ +# --with-reader \ +# --with-regexps \ +# --with-sax1 \ +# --with-schemas \ +# --with-schematron \ +# --with-threads \ +# --with-thread-alloc \ +# --with-tree \ +# --with-valid \ +# --with-writer \ +# --with-xinclude \ +# --with-xpath \ +# --with-xptr \ +# --with-xptr-locs \ +# --with-lzma \ +# --with-zlib=${ZSTD_DIR} \ +# --with-legacy \ +# --with-tls \ +# --with-python-sys-prefix \ +# && \ +# make -j$(nproc) && \ +# make -j$(nproc) install && \ +# echo "# libxslt support" >> ${LD_CONF_DIR}/libxml2.conf && \ +# echo ${LIBXML2_LIB_DIR} >> ${LD_CONF_DIR}/libxml2.conf && \ +# ldconfig +# +# ENV PATH="${LIBXML2_BIN_DIR}:${PATH}" + +# TO FIX +# ################################################################## +# # libxslt +# ################################################################## +# RUN mkdir -p ${LIBXSLT_DIR} ${LIBXSLT_SRC_DIR} +# ADD ${LIBXSLT_DOWNLOAD_URL} /tmp +# +# RUN tar -xzf ${LIBXSLT_TEMP} --directory /tmp && \ +# cp -rfv ${LIBXSLT_TEMP_SRC}/* ${LIBXSLT_SRC_DIR} && \ +# ln -sf ${LIBXSLT_SRC_DIR} ${LIBXSLT_DIR}/src && \ +# cd ${LIBXSLT_TEMP_SRC} && \ +# ./autogen.sh && \ +# ./configure \ +# --prefix=${LIBXSLT_DIR} \ +# --disable-silent-rules \ +# --enable-static \ +# --enable-shared \ +# --with-aix-soname=both \ +# # --with-python-sys-prefix \ +# --with-crypto \ +# --with-debug \ +# --with-debugger \ +# --with-profiler \ +# --with-plugins \ +# && \ +# make -j$(nproc) && \ +# make -j$(nproc) install && \ +# echo "# libxslt support" >> ${LD_CONF_DIR}/libxslt.conf && \ +# echo ${LIBXSLT_LIB_DIR} >> ${LD_CONF_DIR}/libxslt.conf && \ +# ldconfig +# +# ENV PATH="${LIBXSLT_BIN_DIR}:${PATH}" + +################################################################## +# MAxMind GeoIP +################################################################## +RUN mkdir -p ${MM_GEOIP_DIR} ${MM_GEOIP_SRC_DIR} +ADD ${MM_GEOIP_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${MM_GEOIP_TEMP} --directory /tmp && \ + cp -rfv ${MM_GEOIP_TEMP_SRC}/* ${MM_GEOIP_SRC_DIR} && \ + ln -sf ${MM_GEOIP_SRC_DIR} ${MM_GEOIP_DIR}/src && \ + cd ${MM_GEOIP_TEMP_SRC} && \ + ./bootstrap && \ + aclocal && \ + autoconf && \ + automake --add-missing && \ + ./configure \ + --prefix=${MM_GEOIP_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-assertions \ + --with-aix-soname=both \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# GeoIP support" >> ${LD_CONF_DIR}/GeoIP.conf && \ + echo ${MM_GEOIP_LIB_DIR} >> ${LD_CONF_DIR}/GeoIP.conf && \ + ldconfig + +ENV PATH="${MM_GEOIP_BIN_DIR}:${PATH}" + +################################################################## +# Google perftools +################################################################## +RUN mkdir -p ${GPERFTOOLS_DIR} ${GPERFTOOLS_SRC_DIR} +ADD ${GPERFTOOLS_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${GPERFTOOLS_TEMP} --directory /tmp && \ + cp -rfv ${GPERFTOOLS_TEMP_SRC}/* ${GPERFTOOLS_SRC_DIR} && \ + ln -sf ${GPERFTOOLS_SRC_DIR} ${GPERFTOOLS_DIR}/src && \ + cd ${GPERFTOOLS_TEMP_SRC} && \ + ./configure \ + --prefix=${GPERFTOOLS_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-libunwind \ + --with-aix-soname=both \ + --enable-large-alloc-report \ + --enable-aggressive-decommit-by-default \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# Google perftools support" >> ${LD_CONF_DIR}/Googleperftools.conf && \ + echo ${GPERFTOOLS_LIB_DIR} >> ${LD_CONF_DIR}/Googleperftools.conf && \ + ldconfig + +ENV PATH="${GPERFTOOLS_BIN_DIR}:${PATH}" + +################################################################## +# OpenSSL 1.0.2u +################################################################## +RUN mkdir -p ${OPENSSL_102_DIR} ${OPENSSL_102_SRC_DIR} +ADD ${OPENSSL_102_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_102_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_102_TEMP_SRC}/* ${OPENSSL_102_SRC_DIR} && \ + ln -sf ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_DIR}/src && \ + cd ${OPENSSL_102_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-ssl-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_102_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 1.1.1.1 +################################################################## +RUN mkdir -p ${OPENSSL_111_DIR} ${OPENSSL_111_SRC_DIR} +ADD ${OPENSSL_111_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_111_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_111_TEMP_SRC}/* ${OPENSSL_111_SRC_DIR} && \ + ln -sf ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_DIR}/src && \ + cd ${OPENSSL_111_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-ssl-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_111_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.0 +################################################################## +RUN mkdir -p ${OPENSSL_30_DIR} ${OPENSSL_30_SRC_DIR} +ADD ${OPENSSL_30_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_30_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_30_TEMP_SRC}/* ${OPENSSL_30_SRC_DIR} && \ + ln -sf ${OPENSSL_30_SRC_DIR} ${OPENSSL_30_DIR}/src && \ + cd ${OPENSSL_30_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_30_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.1 +################################################################## +RUN mkdir -p ${OPENSSL_31_DIR} ${OPENSSL_31_SRC_DIR} +ADD ${OPENSSL_31_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_31_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_31_TEMP_SRC}/* ${OPENSSL_31_SRC_DIR} && \ + ln -sf ${OPENSSL_31_SRC_DIR} ${OPENSSL_31_DIR}/src && \ + cd ${OPENSSL_31_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_31_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.2 +################################################################## +RUN mkdir -p ${OPENSSL_32_DIR} ${OPENSSL_32_SRC_DIR} +ADD ${OPENSSL_32_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_32_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_32_TEMP_SRC}/* ${OPENSSL_32_SRC_DIR} && \ + ln -sf ${OPENSSL_32_SRC_DIR} ${OPENSSL_32_DIR}/src && \ + cd ${OPENSSL_32_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_32_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.3 +################################################################## +RUN mkdir -p ${OPENSSL_33_DIR} ${OPENSSL_33_SRC_DIR} +ADD ${OPENSSL_33_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_33_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_33_TEMP_SRC}/* ${OPENSSL_33_SRC_DIR} && \ + ln -sf ${OPENSSL_33_SRC_DIR} ${OPENSSL_33_DIR}/src && \ + cd ${OPENSSL_33_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_33_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# OpenSSL support" >> ${LD_CONF_DIR}/OpenSSL.conf && \ + echo ${OPENSSL_33_LIB_DIR} >> ${LD_CONF_DIR}/OpenSSL.conf && \ + ldconfig + +################################################################## +# OpenSSL 3.4 +################################################################## +RUN mkdir -p ${OPENSSL_34_DIR} ${OPENSSL_34_SRC_DIR} +ADD ${OPENSSL_34_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_34_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_34_TEMP_SRC}/* ${OPENSSL_34_SRC_DIR} && \ + ln -sf ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_DIR}/src && \ + cd ${OPENSSL_34_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_34_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.5 +################################################################## +RUN mkdir -p ${OPENSSL_35_DIR} ${OPENSSL_35_SRC_DIR} +ADD ${OPENSSL_35_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_35_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_35_TEMP_SRC}/* ${OPENSSL_35_SRC_DIR} && \ + ln -sf ${OPENSSL_35_SRC_DIR} ${OPENSSL_35_DIR}/src && \ + cd ${OPENSSL_35_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_35_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# OpenSSL support" >> ${LD_CONF_DIR}/OpenSSL.conf && \ + echo ${OPENSSL_34_LIB_DIR} >> ${LD_CONF_DIR}/OpenSSL.conf && \ + ldconfig + +################################################################## +# LibreSSL +################################################################## +RUN mkdir -p ${LIBRESSL_DIR} ${LIBRESSL_SRC_DIR} +ADD ${LIBRESSL_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBRESSL_TEMP} --directory /tmp && \ + cp -rfv ${LIBRESSL_TEMP_SRC}/* ${LIBRESSL_SRC_DIR} && \ + ln -sfv ${LIBRESSL_SRC_DIR} ${LIBRESSL_DIR}/src && \ + cd ${LIBRESSL_TEMP_SRC} && \ + ./config \ + --enable-static \ + --enable-shared \ + --disable-silent-rules \ + --prefix=${LIBRESSL_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ +# echo "# LibreSSL support" >> ${LD_CONF_DIR}/LibreSSL.conf && \ +# echo ${LIBRESSL_LIB_DIR} >> ${LD_CONF_DIR}/LibreSSL.conf && \ + ldconfig + +################################################################## +# BoringSSL +################################################################## +# RUN mkdir -p ${BORINGSSL_DIR} ${BORINGSSL_SRC_DIR} && \ +# git clone -b ${BORINGSSL_VERSION} ${BORINGSSL_DOWNLOAD_URL} ${BORINGSSL_TEMP_SRC} && \ +# cp -rfv ${BORINGSSL_TEMP_SRC}/* ${BORINGSSL_SRC_DIR} && \ +# ln -sf ${BORINGSSL_SRC_DIR} ${BORINGSSL_DIR}/src && \ +# cd ${BORINGSSL_TEMP_SRC} && \ +# mkdir ${BORINGSSL_TEMP_SRC}/build && \ +# # cmake -GNinja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} && \ +# # ninja -C build && \ +# cd ${BORINGSSL_TEMP_SRC}/build && \ +# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} .. && \ +# make -j$(if [ $(nproc) -gt 8 ]; then echo $(( $(nproc) / 2 )); else echo $(nproc); fi) && \ +# make -j$(nproc) install && \ +# # echo "# BoringSSL support" >> ${LD_CONF_DIR}/BoringSSL.conf && \ +# # echo ${BORINGSSL_LIB_DIR} >> ${LD_CONF_DIR}/BoringSSL.conf && \ +# ldconfig ################################################################## # other customisations ################################################################## ################################################################## -# cleanup +# Cleanup ################################################################## RUN echo "clean up" && \ apt-get clean -y && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* RUN updatedb diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/develop/Dockerfile b/linux/ecosystem/epicmorg/astra/1.8-alse/develop/Dockerfile new file mode 100644 index 000000000..46a4909e5 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/develop/Dockerfile @@ -0,0 +1,1264 @@ +FROM quay.io/epicmorg/astralinux:1.8-main +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +# /etc/ld.so.conf.d/ +ARG LD_CONF_DIR=/etc/ld.so.conf.d/ + +# steam runtime sdk +ENV STEAM_RUNTIME_SDK_DIR=${EMG_LOCAL_BASE_DIR}/valve/steam/runtime-sdk/latest +ARG STEAM_RUNTIME_SDK_BIN_DIR=${STEAM_RUNTIME_SDK_DIR}/bin +ARG STEAM_RUNTIME_SDK_URL=http://media.steampowered.com/client/runtime/steam-runtime-sdk_latest.tar.xz +ARG STEAM_RUNTIME_SDK_TEMP=/tmp/steam-runtime-sdk_latest.tar.xz + +# cmake compiller +ENV CMAKE_3_31_VERSION=3.31.6 +ENV CMAKE_3_31_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_31_VERSION} +ARG CMAKE_3_31_BIN_DIR=${CMAKE_3_31_DIR}/bin +ARG CMAKE_3_31_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_31_VERSION}/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_31_TEMP=/tmp/cmake-${CMAKE_3_31_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_30_VERSION=3.30.8 +ENV CMAKE_3_30_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_30_VERSION} +ARG CMAKE_3_30_BIN_DIR=${CMAKE_3_30_DIR}/bin +ARG CMAKE_3_30_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_30_VERSION}/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_30_TEMP=/tmp/cmake-${CMAKE_3_30_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_21_VERSION=3.21.7 +ENV CMAKE_3_21_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_21_VERSION} +ARG CMAKE_3_21_BIN_DIR=${CMAKE_3_21_DIR}/bin +ARG CMAKE_3_21_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_21_VERSION}/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_21_TEMP=/tmp/cmake-${CMAKE_3_21_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_20_VERSION=3.20.6 +ENV CMAKE_3_20_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_20_VERSION} +ARG CMAKE_3_20_BIN_DIR=${CMAKE_3_20_DIR}/bin +ARG CMAKE_3_20_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_20_VERSION}/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_20_TEMP=/tmp/cmake-${CMAKE_3_20_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_19_VERSION=3.19.8 +ENV CMAKE_3_19_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_19_VERSION} +ARG CMAKE_3_19_BIN_DIR=${CMAKE_3_19_DIR}/bin +ARG CMAKE_3_19_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_19_VERSION}/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_19_TEMP=/tmp/cmake-${CMAKE_3_19_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_18_VERSION=3.18.6 +ENV CMAKE_3_18_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_18_VERSION} +ARG CMAKE_3_18_BIN_DIR=${CMAKE_3_18_DIR}/bin +ARG CMAKE_3_18_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_18_VERSION}/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_18_TEMP=/tmp/cmake-${CMAKE_3_18_VERSION}-linux-x86_64.tar.gz + +# cmake compiller +ENV CMAKE_3_16_VERSION=3.16.9 +ENV CMAKE_3_16_DIR=${EMG_LOCAL_BASE_DIR}/cmake/${CMAKE_3_16_VERSION} +ARG CMAKE_3_16_BIN_DIR=${CMAKE_3_16_DIR}/bin +ARG CMAKE_3_16_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_3_16_VERSION}/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz +ARG CMAKE_3_16_TEMP=/tmp/cmake-${CMAKE_3_16_VERSION}-linux-x86_64.tar.gz + +# flutter source tarball +ENV FLUTTER_VERSION=3.29.3 +ENV FLUTTER_CHANNEL=stable +ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION} +ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin +ARG FLUTTER_DOWNLOAD_URL=https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz +ARG FLUTTER_TEMP=/tmp/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz + +# ninja source tarball +ENV NINJA_VERSION=1.12.1 +ENV NINJA_DIR=${EMG_LOCAL_BASE_DIR}/ninja/${NINJA_VERSION} +ARG NINJA_BIN_DIR=${NINJA_DIR}/bin +ARG NINJA_DOWNLOAD_URL=https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-linux.zip +ARG NINJA_TEMP=/tmp/ninja-linux.zip + +# GO source tarball +ENV GO_VERSION=1.24.2 +ENV GO_DIR=${EMG_LOCAL_BASE_DIR}/go/${GO_VERSION} +ARG GO_BIN_DIR=${GO_DIR}/bin +ARG GO_PATH_DIR=${GO_DIR}/gopath +ARG GO_PATH_BIN_DIR=${GO_PATH_DIR}/bin +ARG GO_DOWNLOAD_URL=https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz +ARG GO_TEMP=/tmp/go${GO_VERSION}.linux-amd64.tar.gz + +# PCRE source tarball +ENV PCRE_VERSION=10.45 +ENV PCRE_DIR=${EMG_LOCAL_BASE_DIR}/pcre2/${PCRE_VERSION} +ENV PCRE_BIN_DIR=${PCRE_DIR}/bin +ENV PCRE_LIB_DIR=${PCRE_DIR}/lib +ENV PCRE_INC_DIR=${PCRE_DIR}/include +ENV PCRE_SRC_DIR=/usr/local/src/pcre2/${PCRE_VERSION} +ARG PCRE_DOWNLOAD_URL=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/pcre2-${PCRE_VERSION}.tar.gz +ARG PCRE_TEMP=/tmp/pcre2-${PCRE_VERSION}.tar.gz +ARG PCRE_TEMP_SRC=/tmp/pcre2-${PCRE_VERSION} + +# luajit2-openresty source tarball +ENV LUAJIT2OR_VERSION=2.1 +ENV LUAJIT2OR_DIR=${EMG_LOCAL_BASE_DIR}/luajit2/${LUAJIT2OR_VERSION} +ENV LUAJIT2OR_BIN_DIR=${PCRE_DIR}/bin +ENV LUAJIT2OR_LIB_DIR=${LUAJIT2OR_DIR}/lib +ENV LUAJIT2OR_INC_DIR=${LUAJIT2OR_DIR}/include +ENV LUAJIT2OR_SRC_DIR=/usr/local/src/luajit2/${LUAJIT2OR_VERSION} +ARG LUAJIT2OR_DOWNLOAD_URL=https://github.com/openresty/luajit2.git +ARG LUAJIT2OR_TEMP_SRC=/tmp/luajit2 + +# zlib source tarball +ENV ZLIB_VERSION=1.3.1 +ENV ZLIB_DIR=${EMG_LOCAL_BASE_DIR}/zlib/${ZLIB_VERSION} +ENV ZLIB_INC_DIR=${ZLIB_DIR}/include +ENV ZLIB_LIB_DIR=${ZLIB_DIR}/lib +ENV ZLIB_SRC_DIR=/usr/local/src/zlib/${ZLIB_VERSION} +ARG ZLIB_DOWNLOAD_URL=https://zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz +ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz +ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} + +# zstd source tarball +ENV ZSTD_VERSION=1.5.7 +ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} +ENV ZSTD_BIN_DIR=${ZSTD_DIR}/bin +ENV ZSTD_INC_DIR=${ZSTD_DIR}/include +ENV ZSTD_LIB_DIR=${ZSTD_DIR}/lib +ENV ZSTD_SRC_DIR=/usr/local/src/zstd/${ZSTD_VERSION} +ARG ZSTD_DOWNLOAD_URL=https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz +ARG ZSTD_TEMP=/tmp/zstd-${ZSTD_VERSION}.tar.gz +ARG ZSTD_TEMP_SRC=/tmp/zstd-${ZSTD_VERSION} + +# IP2Location-C-Library source tarball +ENV IP2LOC_VERSION=8.7.0 +ENV IP2LOC_DIR=${EMG_LOCAL_BASE_DIR}/ip2location/${IP2LOC_VERSION} +ENV IP2LOC_BIN_DIR=${IP2LOC_DIR}/bin +ENV IP2LOC_INC_DIR=${IP2LOC_DIR}/include +ENV IP2LOC_LIB_DIR=${IP2LOC_DIR}/lib +ENV IP2LOC_SRC_DIR=/usr/local/src/ip2location/${IP2LOC_VERSION} +ARG IP2LOC_DOWNLOAD_URL=https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/heads/master.tar.gz +ARG IP2LOC_TEMP=/tmp/master.tar.gz +ARG IP2LOC_TEMP_SRC=/tmp/IP2Location-C-Library-master + +# libatomic_ops source tarball +ENV LIBATOMICOPS_VERSION=7.8.2 +ENV LIBATOMICOPS_DIR=${EMG_LOCAL_BASE_DIR}/libatomic_ops/${LIBATOMICOPS_VERSION} +ENV LIBATOMICOPS_INC_DIR=${LIBATOMICOPS_DIR}/include +ENV LIBATOMICOPS_LIB_DIR=${LIBATOMICOPS_DIR}/lib +ENV LIBATOMICOPS_SRC_DIR=/usr/local/src/libatomic_ops/${LIBATOMICOPS_VERSION} +ARG LIBATOMICOPS_DOWNLOAD_URL=https://github.com/bdwgc/libatomic_ops/releases/download/v${LIBATOMICOPS_VERSION}/libatomic_ops-${LIBATOMICOPS_VERSION}.tar.gz +ARG LIBATOMICOPS_TEMP=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION}.tar.gz +ARG LIBATOMICOPS_TEMP_SRC=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION} + +# libimagequant source +ENV LIBIMAGEQUANT_VERSION=4.3.4 +ARG LIBIMAGEQUANT_DOWNLOAD_URL=https://github.com/ImageOptim/libimagequant +ENV LIBIMAGEQUANT_DIR=${EMG_LOCAL_BASE_DIR}/libimagequant +ENV LIBIMAGEQUANT_SRC_DIR=/usr/local/src/libimagequant/${LIBIMAGEQUANT_VERSION} +ARG LIBIMAGEQUANT_TEMP_SRC=/tmp/libimagequant + +# libraqm source +ENV LIBRAQM_VERSION=0.10.1 +ARG LIBRAQM_DOWNLOAD_URL=https://github.com/HOST-Oman/libraqm +ENV LIBRAQM_DIR=${EMG_LOCAL_BASE_DIR}/libraqm +ENV LIBRAQM_SRC_DIR=/usr/local/src/libraqm/${LIBRAQM_VERSION} +ARG LIBRAQM_TEMP_SRC=/tmp/libraqm + +# libgd source tarball +ENV LIBGD_VERSION=2.3.3 +ENV LIBGD_DIR=${EMG_LOCAL_BASE_DIR}/libgd/${LIBGD_VERSION} +ENV LIBGD_BIN_DIR=${LIBGD_DIR}/bin +ENV LIBGD_INC_DIR=${LIBGD_DIR}/include +ENV LIBGD_LIB_DIR=${LIBGD_DIR}/lib +ENV LIBGD_SRC_DIR=/usr/local/src/libgd/${LIBGD_VERSION} +ARG LIBGD_DOWNLOAD_URL=https://github.com/libgd/libgd/releases/download/gd-${LIBGD_VERSION}/libgd-${LIBGD_VERSION}.tar.gz +ARG LIBGD_TEMP=/tmp/libgd-${LIBGD_VERSION}.tar.gz +ARG LIBGD_TEMP_SRC=/tmp/libgd-${LIBGD_VERSION} + +# libxml2 source tarball +ENV LIBXML2_VERSION=2.13.5 +ENV LIBXML2_DIR=${EMG_LOCAL_BASE_DIR}/libxml2/${LIBXML2_VERSION} +ENV LIBXML2_BIN_DIR=${LIBXML2_DIR}/bin +ENV LIBXML2_INC_DIR=${LIBXML2_DIR}/include +ENV LIBXML2_LIB_DIR=${LIBXML2_DIR}/lib +ENV LIBXML2_SRC_DIR=/usr/local/src/libxml2/${LIBXML2_VERSION} +ARG LIBXML2_DOWNLOAD_URL=https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${LIBXML2_VERSION}/libxml2-v${LIBXML2_VERSION}.tar.gz +ARG LIBXML2_TEMP=/tmp/libxml2-v${LIBXML2_VERSION}.tar.gz +ARG LIBXML2_TEMP_SRC=/tmp/libxml2-v${LIBXML2_VERSION} + +# libxslt source tarball +ENV LIBXSLT_VERSION=1.1.42 +ENV LIBXSLT_DIR=${EMG_LOCAL_BASE_DIR}/libxslt/${LIBXSLT_VERSION} +ENV LIBXSLT_BIN_DIR=${LIBXSLT_DIR}/bin +ENV LIBXSLT_INC_DIR=${LIBXSLT_DIR}/include +ENV LIBXSLT_LIB_DIR=${LIBXSLT_DIR}/lib +ENV LIBXSLT_SRC_DIR=/usr/local/src/libxslt/${LIBXSLT_VERSION} +ARG LIBXSLT_DOWNLOAD_URL=https://gitlab.gnome.org/GNOME/libxslt/-/archive/v${LIBXSLT_VERSION}/libxslt-v${LIBXSLT_VERSION}.tar.gz +ARG LIBXSLT_TEMP=/tmp/libxslt-v${LIBXSLT_VERSION}.tar.gz +ARG LIBXSLT_TEMP_SRC=/tmp/libxslt-v${LIBXSLT_VERSION} + +# maxmind geoip +ENV MM_GEOIP_VERSION=1.6.12 +ENV MM_GEOIP_DIR=${EMG_LOCAL_BASE_DIR}/geoip/${MM_GEOIP_VERSION} +ENV MM_GEOIP_BIN_DIR=${MM_GEOIP_DIR}/bin +ENV MM_GEOIP_INC_DIR=${MM_GEOIP_DIR}/include +ENV MM_GEOIP_LIB_DIR=${MM_GEOIP_DIR}/lib +ENV MM_GEOIP_SRC_DIR=/usr/local/src/geoip/${MM_GEOIP_VERSION} +ARG MM_GEOIP_DOWNLOAD_URL=https://github.com/maxmind/geoip-api-c/releases/download/v${MM_GEOIP_VERSION}/GeoIP-${MM_GEOIP_VERSION}.tar.gz +ARG MM_GEOIP_TEMP=/tmp/GeoIP-${MM_GEOIP_VERSION}.tar.gz +ARG MM_GEOIP_TEMP_SRC=/tmp/GeoIP-${MM_GEOIP_VERSION} + +# Google perftools +ENV GPERFTOOLS_VERSION=2.15 +ENV GPERFTOOLS_DIR=${EMG_LOCAL_BASE_DIR}/gperftools/${GPERFTOOLS_VERSION} +ENV GPERFTOOLS_BIN_DIR=${GPERFTOOLS_DIR}/bin +ENV GPERFTOOLS_INC_DIR=${GPERFTOOLS_DIR}/include +ENV GPERFTOOLS_LIB_DIR=${GPERFTOOLS_DIR}/lib +ENV GPERFTOOLS_SRC_DIR=/usr/local/src/gperftools/${GPERFTOOLS_VERSION} +ARG GPERFTOOLS_DOWNLOAD_URL=https://github.com/gperftools/gperftools/releases/download/gperftools-${GPERFTOOLS_VERSION}/gperftools-${GPERFTOOLS_VERSION}.tar.gz +ARG GPERFTOOLS_TEMP=/tmp/gperftools-${GPERFTOOLS_VERSION}.tar.gz +ARG GPERFTOOLS_TEMP_SRC=/tmp/gperftools-${GPERFTOOLS_VERSION} + +# OpenSSL 1.0.2 +ENV OPENSSL_102_VERSION=1.0.2 +ENV OPENSSL_102_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_102_VERSION} +ENV OPENSSL_102_BIN_DIR=${OPENSSL_102_DIR}/bin +ENV OPENSSL_102_INC_DIR=${OPENSSL_102_DIR}/include +ENV OPENSSL_102_LIB_DIR=${OPENSSL_102_DIR}/lib +ENV OPENSSL_102_SRC_DIR=/usr/local/src/openssl/${OPENSSL_102_VERSION} +ARG OPENSSL_102_DOWNLOAD_URL=https://github.com/openssl/openssl/releases/download/OpenSSL_1_0_2u/openssl-1.0.2u.tar.gz +ARG OPENSSL_102_TEMP=/tmp/openssl-1.0.2u.tar.gz +ARG OPENSSL_102_TEMP_SRC=/tmp/openssl-1.0.2u + +# OpenSSL 1.1.1 +ENV OPENSSL_111_VERSION=1.1.1 +ENV OPENSSL_111_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_111_VERSION} +ENV OPENSSL_111_BIN_DIR=${OPENSSL_111_DIR}/bin +ENV OPENSSL_111_INC_DIR=${OPENSSL_111_DIR}/include +ENV OPENSSL_111_LIB_DIR=${OPENSSL_111_DIR}/lib +ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} +ARG OPENSSL_111_DOWNLOAD_URL=https://www.openssl.org/source/old/${OPENSSL_111_VERSION}/openssl-${OPENSSL_111_VERSION}w.tar.gz +ARG OPENSSL_111_TEMP=/tmp/openssl-${OPENSSL_111_VERSION}w.tar.gz +ARG OPENSSL_111_TEMP_SRC=/tmp/openssl-${OPENSSL_111_VERSION}w + +# OpenSSL 3.0 +ENV OPENSSL_30_VERSION=3.0.16 +ENV OPENSSL_30_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_30_VERSION} +ENV OPENSSL_30_BIN_DIR=${OPENSSL_30_DIR}/bin +ENV OPENSSL_30_INC_DIR=${OPENSSL_30_DIR}/include +ENV OPENSSL_30_LIB_DIR=${OPENSSL_30_DIR}/lib64 +ENV OPENSSL_30_SRC_DIR=/usr/local/src/openssl/${OPENSSL_30_VERSION} +ARG OPENSSL_30_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_30_VERSION}.tar.gz +ARG OPENSSL_30_TEMP=/tmp/openssl-${OPENSSL_30_VERSION}.tar.gz +ARG OPENSSL_30_TEMP_SRC=/tmp/openssl-${OPENSSL_30_VERSION} + +# OpenSSL 3.1 +ENV OPENSSL_31_VERSION=3.1.8 +ENV OPENSSL_31_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_31_VERSION} +ENV OPENSSL_31_BIN_DIR=${OPENSSL_31_DIR}/bin +ENV OPENSSL_31_INC_DIR=${OPENSSL_31_DIR}/include +ENV OPENSSL_31_LIB_DIR=${OPENSSL_31_DIR}/lib64 +ENV OPENSSL_31_SRC_DIR=/usr/local/src/openssl/${OPENSSL_31_VERSION} +ARG OPENSSL_31_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_31_VERSION}.tar.gz +ARG OPENSSL_31_TEMP=/tmp/openssl-${OPENSSL_31_VERSION}.tar.gz +ARG OPENSSL_31_TEMP_SRC=/tmp/openssl-${OPENSSL_31_VERSION} + +# OpenSSL 3.2 +ENV OPENSSL_32_VERSION=3.2.4 +ENV OPENSSL_32_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_32_VERSION} +ENV OPENSSL_32_BIN_DIR=${OPENSSL_32_DIR}/bin +ENV OPENSSL_32_INC_DIR=${OPENSSL_32_DIR}/include +ENV OPENSSL_32_LIB_DIR=${OPENSSL_32_DIR}/lib64 +ENV OPENSSL_32_SRC_DIR=/usr/local/src/openssl/${OPENSSL_32_VERSION} +ARG OPENSSL_32_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_32_VERSION}.tar.gz +ARG OPENSSL_32_TEMP=/tmp/openssl-${OPENSSL_32_VERSION}.tar.gz +ARG OPENSSL_32_TEMP_SRC=/tmp/openssl-${OPENSSL_32_VERSION} + +# OpenSSL 3.3 +ENV OPENSSL_33_VERSION=3.3.3 +ENV OPENSSL_33_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_33_VERSION} +ENV OPENSSL_33_BIN_DIR=${OPENSSL_33_DIR}/bin +ENV OPENSSL_33_INC_DIR=${OPENSSL_33_DIR}/include +ENV OPENSSL_33_LIB_DIR=${OPENSSL_33_DIR}/lib64 +ENV OPENSSL_33_SRC_DIR=/usr/local/src/openssl/${OPENSSL_33_VERSION} +ARG OPENSSL_33_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_33_VERSION}.tar.gz +ARG OPENSSL_33_TEMP=/tmp/openssl-${OPENSSL_33_VERSION}.tar.gz +ARG OPENSSL_33_TEMP_SRC=/tmp/openssl-${OPENSSL_33_VERSION} + +# OpenSSL 3.4 +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} +ARG OPENSSL_34_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_34_VERSION}.tar.gz +ARG OPENSSL_34_TEMP=/tmp/openssl-${OPENSSL_34_VERSION}.tar.gz +ARG OPENSSL_34_TEMP_SRC=/tmp/openssl-${OPENSSL_34_VERSION} + +# OpenSSL 3.5 +ENV OPENSSL_35_VERSION=3.5.0 +ENV OPENSSL_35_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_35_VERSION} +ENV OPENSSL_35_BIN_DIR=${OPENSSL_35_DIR}/bin +ENV OPENSSL_35_INC_DIR=${OPENSSL_35_DIR}/include +ENV OPENSSL_35_LIB_DIR=${OPENSSL_35_DIR}/lib64 +ENV OPENSSL_35_SRC_DIR=/usr/local/src/openssl/${OPENSSL_35_VERSION} +ARG OPENSSL_35_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP=/tmp/openssl-${OPENSSL_35_VERSION}.tar.gz +ARG OPENSSL_35_TEMP_SRC=/tmp/openssl-${OPENSSL_35_VERSION} + +# LibreSSL +ENV LIBRESSL_VERSION=4.0.0 +ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} +ENV LIBRESSL_INC_DIR=${LIBRESSL_DIR}/include +ENV LIBRESSL_LIB_DIR=${LIBRESSL_DIR}/lib +ENV LIBRESSL_SRC_DIR=/usr/local/src/libressl/${LIBRESSL_VERSION} +ARG LIBRESSL_DOWNLOAD_URL=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz +ARG LIBRESSL_TEMP=/tmp/libressl-${LIBRESSL_VERSION}.tar.gz +ARG LIBRESSL_TEMP_SRC=/tmp/libressl-${LIBRESSL_VERSION} + +# BoringSSL +ENV BORINGSSL_VERSION=master +ENV BORINGSSL_DIR=${EMG_LOCAL_BASE_DIR}/boringssl/${BORINGSSL_VERSION} +ENV BORINGSSL_INC_DIR=${BORINGSSL_DIR}/include +ENV BORINGSSL_LIB_DIR=${BORINGSSL_DIR}/lib +ENV BORINGSSL_SRC_DIR=/usr/local/src/boringssl/${BORINGSSL_VERSION} +ARG BORINGSSL_DOWNLOAD_URL=https://boringssl.googlesource.com/boringssl +ARG BORINGSSL_TEMP_SRC=/tmp/boringssl + +################################################################## +# bookworm sources list +################################################################## +RUN apt-get update && \ + apt-get dist-upgrade -y + +################################################################## +# installing +################################################################## +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests --allow-downgrades \ + build-essential \ + autoconf-archive \ +# gnu-standards \ + cmake \ + clang \ + meson \ + libunwind-dev \ + at \ + autopkgtest \ + gcc-multilib \ + g++-multilib \ + libxkbcommon-dev \ + libsqlite3-dev \ + liblzma-dev \ + libgtk-3-dev \ + zlib1g-dev \ + libfreetype6-dev \ + libegl1-mesa-dev \ + libgles2-mesa-dev \ + libgbm-dev \ + uuid-dev \ +# nvidia-cg-toolkit \ +# nvidia-cg-dev \ + libavutil-dev \ + libavcodec-dev \ + libxvidcore-dev \ + libtwolame-dev \ + libmp3lame-dev \ + libopus-dev \ + libavcodec-extra \ + libtheora-dev \ + libvorbis-dev \ + libflac-dev \ + libx264-dev \ + libx265-dev \ + libaom-dev \ + libdav1d-dev \ + libaio-dev \ + libsdl2-dev \ + libsdl-image1.2-dev \ + libxml2-dev \ + yasm \ + devscripts \ + automake \ + libtool \ + autotools-dev \ + dpkg-dev \ + fakeroot \ +# checkinstall \ + dh-make \ + zlib1g \ + zlib1g-dev \ + libssl-dev \ + libxslt-dev \ + libgd-dev \ + libpcre2-dev \ + libgeoip-dev \ + libxml++*-dev \ + libkrb5-dev \ + libperl-dev \ + krb5-user \ + luajit \ + liblua5.1-0-dev \ + libmaxminddb-dev \ + libpam0g-dev \ + libldap2-dev \ + libavformat-dev \ + libavfilter-dev \ + libavif-dev \ + libswscale-dev \ + libavcodec-dev \ + libz-dev \ + libhiredis-dev \ + libzip-dev \ + libcrypto++-dev \ + libbz2-dev \ + libvpx-dev \ + libsasl2-dev \ + tcl \ + g++ \ + gcc \ + libc6-dev \ + make \ + pkg-config \ + python3-all-dev \ + g++-multilib \ + autoconf \ + automake \ + libtool \ + gdb \ + strace \ + libbsd-dev \ + libedit-dev \ + libmd-dev \ + valgrind \ +# valgrind-dbg \ + valgrind-if-available \ + valgrind-mpi \ + gcovr \ + lcov \ + libsctp-dev \ + libharfbuzz-dev \ + libfribidi-dev \ + libpng-dev \ + libjpeg-dev \ + libfreetype6-dev + +################################################################## +# Rust compillers +################################################################## +ENV CARGO_HOME=${EMG_LOCAL_BASE_DIR}/cargo +ENV RUSTUP_HOME=${EMG_LOCAL_BASE_DIR}/rustup +ARG CARGO_BIN=${CARGO_HOME}/bin + +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile complete --default-toolchain stable --verbose + +ENV PATH="$CARGO_HOME/bin:${PATH}" + +RUN echo "=============================================" && \ + echo cargo $(cargo --version) && \ + echo rustc $(rustc --version) && \ + echo rustup $(rustup --version) && \ + echo "=============================================" + +################################################################## +# CMake +################################################################## +RUN mkdir -p ${CMAKE_3_31_DIR} ${CMAKE_3_30_DIR} ${CMAKE_3_21_DIR} ${CMAKE_3_20_DIR} ${CMAKE_3_19_DIR} ${CMAKE_3_18_DIR} ${CMAKE_3_16_DIR} +ADD ${CMAKE_3_31_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_30_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_21_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_20_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_19_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_18_DOWNLOAD_URL} /tmp +ADD ${CMAKE_3_16_DOWNLOAD_URL} /tmp + +RUN tar -xf ${CMAKE_3_31_TEMP} --directory ${CMAKE_3_31_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_31_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_30_TEMP} --directory ${CMAKE_3_30_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_30_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_21_TEMP} --directory ${CMAKE_3_21_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_21_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_20_TEMP} --directory ${CMAKE_3_20_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_20_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_19_TEMP} --directory ${CMAKE_3_19_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_19_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_18_TEMP} --directory ${CMAKE_3_18_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_18_BIN_DIR}/ctest && \ + tar -xf ${CMAKE_3_16_TEMP} --directory ${CMAKE_3_16_DIR} --strip-components=1 && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ccmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cmake-gui && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/cpack && \ + chmod +x ${CMAKE_3_16_BIN_DIR}/ctest + +# Install default latest version +ENV PATH="${CMAKE_3_31_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo $(cmake --version) && \ + echo "=============================================" + +################################################################## +# steam runtime and ssdk +################################################################## +RUN mkdir -p ${STEAM_RUNTIME_SDK_DIR} +ADD ${STEAM_RUNTIME_SDK_URL} /tmp + +RUN tar -xf ${STEAM_RUNTIME_SDK_TEMP} --directory ${STEAM_RUNTIME_SDK_DIR} --strip-components=1 && \ + chmod +x ${STEAM_RUNTIME_SDK_BIN_DIR} -R && \ + chmod +x ${STEAM_RUNTIME_SDK_DIR}/setup.sh && \ + chmod +x ${STEAM_RUNTIME_SDK_DIR}/shell.sh && \ + chmod +x ${STEAM_RUNTIME_SDK_DIR}/shell-amd64.sh && \ + chmod +x ${STEAM_RUNTIME_SDK_DIR}/shell-i386.sh +# printf '%s\n' 3 1 Y Y Y | ./setup.sh + +################################################################## +# Flutter SDK +################################################################## +RUN mkdir -p ${FLUTTER_DIR} +ADD ${FLUTTER_DOWNLOAD_URL} /tmp + +RUN tar -xf ${FLUTTER_TEMP} --directory ${FLUTTER_DIR} --strip-components=1 && \ + chmod +x ${FLUTTER_BIN_DIR}/dart && \ + chmod +x ${FLUTTER_BIN_DIR}/flutter && \ + chmod +x ${FLUTTER_BIN_DIR}/internal/shared.sh && \ + chmod +x ${FLUTTER_BIN_DIR}/internal/update_dart_sdk.sh + +ENV PATH="${FLUTTER_BIN_DIR}:${PATH}" + +RUN git config --global --add safe.directory ${FLUTTER_DIR} && \ + flutter precache && \ + flutter config --no-analytics && \ + dart --disable-analytics + +RUN echo "=============================================" && \ + echo dart $(dart --version) && \ + echo flutter $(flutter --version) && \ + echo "=============================================" + +################################################################## +# GO compillers +################################################################## +RUN mkdir -p ${GO_DIR} ${GO_PATH_BIN_DIR} ${GO_BIN_DIR} ${GO_BIN_DIR} +ADD ${GO_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${GO_TEMP} --directory ${GO_DIR} --strip-components=1 && \ + chmod +x ${GO_BIN_DIR}/go && \ + chmod +x ${GO_BIN_DIR}/gofmt + +ENV GOROOT=${GO_DIR} +ENV GOPATH=${GO_PATH_DIR} +ENV PATH="${GO_BIN_DIR}:${GO_PATH_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo go $(go version) && \ + echo "=============================================" + +################################################################## +# Get NINJA binary +################################################################## +RUN mkdir -p ${NINJA_BIN_DIR} +ADD ${NINJA_DOWNLOAD_URL} /tmp + +RUN 7zz x ${NINJA_TEMP} -o${NINJA_BIN_DIR} -y && \ + chmod +x ${NINJA_BIN_DIR}/ninja + +ENV PATH="${NINJA_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo ninja $(ninja --version) && \ + echo "=============================================" + +################################################################## +# ZLIB library +################################################################## +RUN mkdir -p ${ZLIB_DIR} ${ZLIB_SRC_DIR} +ADD ${ZLIB_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${ZLIB_TEMP} --directory /tmp && \ + cp -rfv ${ZLIB_TEMP_SRC}/* ${ZLIB_SRC_DIR} && \ + ln -sf ${ZLIB_SRC_DIR} ${ZLIB_DIR}/src && \ + cd ${ZLIB_TEMP_SRC} && \ + CFLAGS=-Wno-error ./configure \ +# --static \ + --prefix=${ZLIB_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# ZLIB support" >> ${LD_CONF_DIR}/ZLIB.conf && \ + echo ${ZLIB_LIB_DIR} >> ${LD_CONF_DIR}/ZLIB.conf && \ + ldconfig + +################################################################## +# ZSTD library +################################################################## +RUN mkdir -p ${ZSTD_DIR} ${ZSTD_SRC_DIR} +ADD ${ZSTD_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${ZSTD_TEMP} --directory /tmp && \ + cp -rfv ${ZSTD_TEMP_SRC}/* ${ZSTD_SRC_DIR} && \ + ln -sf ${ZSTD_SRC_DIR} ${ZSTD_DIR}/src && \ + cd ${ZSTD_TEMP_SRC} && \ + mkdir -p ${ZSTD_TEMP_SRC}/build/cmake/builddir && \ + cd ${ZSTD_TEMP_SRC}/build/cmake/builddir && \ + CFLAGS=-Wno-error cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${ZSTD_DIR} -DZSTD_BUILD_STATIC=ON -DZSTD_BUILD_SHARED=ON .. && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# ZSTD support" >> ${LD_CONF_DIR}/ZSTD.conf && \ + echo ${ZSTD_LIB_DIR} >> ${LD_CONF_DIR}/ZSTD.conf && \ + ldconfig + +ENV PATH="${ZSTD_BIN_DIR}:${PATH}" + +################################################################## +# PRCE2 static library +################################################################## +RUN mkdir -p ${PCRE_BIN_DIR} ${PCRE_SRC_DIR} +ADD ${PCRE_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${PCRE_TEMP} --directory /tmp && \ + cp -rfv ${PCRE_TEMP_SRC}/* ${PCRE_SRC_DIR} && \ + ln -sf ${PCRE_SRC_DIR} ${PCRE_DIR}/src && \ + cd ${PCRE_TEMP_SRC} && \ + CFLAGS=-Wno-error ./configure --prefix=${PCRE_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-rebuild-chartables \ + --enable-pcre2-8 \ + --enable-pcre2-16 \ + --enable-pcre2-32 \ + --enable-jit \ + --enable-newline-is-cr \ + --enable-newline-is-lf \ + --enable-newline-is-anycrlf \ + --enable-newline-is-any \ + --enable-newline-is-nul \ + --enable-bsr-anycrlf \ + --enable-pcre2grep-libz \ + --enable-pcre2grep-libbz2 \ + --enable-pcre2test-libedit \ + --enable-unicode \ + --enable-valgrind \ + --enable-fuzz-support \ + --enable-diff-fuzz-support \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# PRCE2 support" >> ${LD_CONF_DIR}/PRCE2.conf && \ + echo ${PCRE_LIB_DIR} >> ${LD_CONF_DIR}/PRCE2.conf && \ + ldconfig + +ENV PATH="${PCRE_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo pcre2 $(pcre2-config --version) && \ + echo "=============================================" + +################################################################## +# LuaJIT2 OpenResty 2.1 +################################################################## +RUN mkdir -p ${LUAJIT2OR_DIR} ${LUAJIT2OR_SRC_DIR} && \ + git clone ${LUAJIT2OR_DOWNLOAD_URL} ${LUAJIT2OR_TEMP_SRC} && \ + cp -rfv ${LUAJIT2OR_TEMP_SRC}/* ${LUAJIT2OR_SRC_DIR} && \ + ln -sf ${LUAJIT2OR_SRC_DIR} ${LUAJIT2OR_DIR}/src && \ + cd ${LUAJIT2OR_TEMP_SRC} && \ +# make -j$(nproc) XCFLAGS='-DLUAJIT_ENABLE_GC64' BUILDMODE=static && \ + make -j$(nproc) XCFLAGS='-DLUAJIT_ENABLE_GC64' BUILDMODE=mixed && \ + make -j$(nproc) install PREFIX=${LUAJIT2OR_DIR} && \ + echo "# LuaJIT2 support" >> ${LD_CONF_DIR}/LuaJIT2.conf && \ + echo ${LUAJIT2OR_LIB_DIR} >> ${LD_CONF_DIR}/LuaJIT2.conf && \ + ldconfig + +ENV PATH="${LUAJIT2OR_BIN_DIR}:${PATH}" + +RUN echo "=============================================" && \ + echo luajit $(luajit -v) && \ + echo "=============================================" + +################################################################## +# IP2Location +################################################################## +RUN mkdir -p ${IP2LOC_DIR} ${IP2LOC_SRC_DIR} +ADD ${IP2LOC_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${IP2LOC_TEMP} --directory /tmp && \ + cp -rfv ${IP2LOC_TEMP_SRC}/* ${IP2LOC_SRC_DIR} && \ + ln -sf ${IP2LOC_SRC_DIR} ${IP2LOC_DIR}/src && \ + cd ${IP2LOC_TEMP_SRC} && \ + autoreconf -i -v --force && \ + aclocal && \ + automake --gnu --add-missing && \ + autoconf && \ + autoreconf -i -v --force && \ + CFLAGS=-Wno-error ./configure \ + --prefix=${IP2LOC_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# IP2Location support" >> ${LD_CONF_DIR}/IP2Location.conf && \ + echo ${IP2LOC_LIB_DIR} >> ${LD_CONF_DIR}/IP2Location.conf && \ + ldconfig + +ENV PATH="${IP2LOC_BIN_DIR}:${PATH}" + +################################################################## +# libatomic_ops +################################################################## +RUN mkdir -p ${LIBATOMICOPS_DIR} ${LIBATOMICOPS_SRC_DIR} +ADD ${LIBATOMICOPS_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBATOMICOPS_TEMP} --directory /tmp && \ + cp -rfv ${LIBATOMICOPS_TEMP_SRC}/* ${LIBATOMICOPS_SRC_DIR} && \ + ln -sf ${LIBATOMICOPS_SRC_DIR} ${LIBATOMICOPS_DIR}/src && \ + cd ${LIBATOMICOPS_TEMP_SRC} && \ + ./autogen.sh && \ + CFLAGS=-Wno-error ./configure \ + --prefix=${LIBATOMICOPS_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-assertions \ + --with-aix-soname=both \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + ln -sfv ${LIBATOMICOPS_SRC_DIR} ${LIBATOMICOPS_SRC_DIR}/src && \ + echo "# libatomic_ops support" >> ${LD_CONF_DIR}/libatomic_ops.conf && \ + echo ${LIBATOMICOPS_LIB_DIR} >> ${LD_CONF_DIR}/libatomic_ops.conf && \ + ldconfig + +################################################################## +# libimagequant +################################################################## +RUN mkdir -p ${LIBIMAGEQUANT_DIR} ${LIBIMAGEQUANT_SRC_DIR} + +RUN git clone ${LIBIMAGEQUANT_DOWNLOAD_URL} ${LIBIMAGEQUANT_TEMP_SRC} && \ + cp -rfv ${LIBIMAGEQUANT_TEMP_SRC}/* ${LIBIMAGEQUANT_SRC_DIR} && \ + ln -sf ${LIBIMAGEQUANT_SRC_DIR} ${LIBIMAGEQUANT_DIR}/src && \ + cd ${LIBIMAGEQUANT_TEMP_SRC} && \ + cargo build --release && \ + cd ${LIBIMAGEQUANT_TEMP_SRC}/imagequant-sys && \ + cargo build --release && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# libraqm +################################################################## +RUN mkdir -p ${LIBRAQM_DIR} ${LIBRAQM_SRC_DIR} + +RUN git clone ${LIBRAQM_DOWNLOAD_URL} ${LIBRAQM_TEMP_SRC} && \ + cp -rfv ${LIBRAQM_TEMP_SRC}/* ${LIBRAQM_SRC_DIR} && \ + ln -sf ${LIBRAQM_SRC_DIR} ${LIBRAQM_DIR}/src && \ + cd ${LIBRAQM_TEMP_SRC} && \ + meson build && \ + ninja -C build && \ + ninja -C build install + +################################################################## +# libgd +################################################################## +RUN mkdir -p ${LIBGD_DIR} ${LIBGD_SRC_DIR} +ADD ${LIBGD_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBGD_TEMP} --directory /tmp && \ + cp -rfv ${LIBGD_TEMP_SRC}/* ${LIBGD_SRC_DIR} && \ + ln -sf ${LIBGD_SRC_DIR} ${LIBGD_DIR}/src && \ + cd ${LIBGD_TEMP_SRC} && \ + ./bootstrap.sh && \ + CFLAGS=-Wno-error ./configure \ + --prefix=${LIBGD_DIR} \ + --disable-silent-rules \ + --enable-static \ + --enable-shared \ + --with-aix-soname=both \ + --with-libiconv-prefix \ + --with-zlib=${ZSTD_SRC_DIR} \ + --with-png --with-freetype \ + --with-raqm=${LIBRAQM_SRC_DIR} \ + --with-fontconfig \ + --with-jpeg \ + --with-liq=${LIBIMAGEQUANT_SRC_DIR} \ + --with-xpm \ + --with-gd \ + --enable-gd-formats \ + --with-tiff \ + --with-webp \ + --with-heif \ + --with-avif \ + --with-x \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# libgd support" >> ${LD_CONF_DIR}/libgd.conf && \ + echo ${LIBGD_LIB_DIR} >> ${LD_CONF_DIR}/libgd.conf && \ + ldconfig + +ENV PATH="${LIBGD_BIN_DIR}:${PATH}" + +################################################################## +# libxml2 +################################################################## +RUN mkdir -p ${LIBXML2_DIR} ${LIBXML2_SRC_DIR} +ADD ${LIBXML2_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBXML2_TEMP} --directory /tmp && \ + cp -rfv ${LIBXML2_TEMP_SRC}/* ${LIBXML2_SRC_DIR} && \ + ln -sf ${LIBXML2_SRC_DIR} ${LIBXML2_DIR}/src && \ + cd ${LIBXML2_TEMP_SRC} && \ + ./autogen.sh && \ + CFLAGS=-Wno-error ./configure \ + --prefix=${LIBXML2_DIR} \ + --disable-silent-rules \ + --enable-static \ + --enable-shared \ + --with-aix-soname=both \ + --with-c14n \ + --with-catalog \ + --with-debug \ + --with-ftp \ + --with-history \ + --with-html \ + --with-http \ + --with-iconv \ + --with-readline \ + --with-http \ + --with-icu \ + --with-iso8859x \ + --with-output \ + --with-pattern \ + --with-push \ + --with-python \ + --with-reader \ + --with-regexps \ + --with-sax1 \ + --with-schemas \ + --with-schematron \ + --with-threads \ + --with-thread-alloc \ + --with-tree \ + --with-valid \ + --with-writer \ + --with-xinclude \ + --with-xpath \ + --with-xptr \ + --with-xptr-locs \ + --with-lzma \ + --with-zlib=${ZSTD_DIR} \ + --with-legacy \ + --with-tls \ + --with-python-sys-prefix \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# libxslt support" >> ${LD_CONF_DIR}/libxml2.conf && \ + echo ${LIBXML2_LIB_DIR} >> ${LD_CONF_DIR}/libxml2.conf && \ + ldconfig + +ENV PATH="${LIBXML2_BIN_DIR}:${PATH}" + +################################################################## +# libxslt +################################################################## +RUN mkdir -p ${LIBXSLT_DIR} ${LIBXSLT_SRC_DIR} +ADD ${LIBXSLT_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBXSLT_TEMP} --directory /tmp && \ + cp -rfv ${LIBXSLT_TEMP_SRC}/* ${LIBXSLT_SRC_DIR} && \ + ln -sf ${LIBXSLT_SRC_DIR} ${LIBXSLT_DIR}/src && \ + cd ${LIBXSLT_TEMP_SRC} && \ + ./autogen.sh && \ + CFLAGS=-Wno-error ./configure \ + --prefix=${LIBXSLT_DIR} \ + --disable-silent-rules \ + --enable-static \ + --enable-shared \ + --with-aix-soname=both \ + --with-python-sys-prefix \ + --with-crypto \ + --with-debug \ + --with-debugger \ + --with-profiler \ + --with-plugins \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# libxslt support" >> ${LD_CONF_DIR}/libxslt.conf && \ + echo ${LIBXSLT_LIB_DIR} >> ${LD_CONF_DIR}/libxslt.conf && \ + ldconfig + +ENV PATH="${LIBXSLT_BIN_DIR}:${PATH}" + +################################################################## +# MAxMind GeoIP +################################################################## +RUN mkdir -p ${MM_GEOIP_DIR} ${MM_GEOIP_SRC_DIR} +ADD ${MM_GEOIP_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${MM_GEOIP_TEMP} --directory /tmp && \ + cp -rfv ${MM_GEOIP_TEMP_SRC}/* ${MM_GEOIP_SRC_DIR} && \ + ln -sf ${MM_GEOIP_SRC_DIR} ${MM_GEOIP_DIR}/src && \ + cd ${MM_GEOIP_TEMP_SRC} && \ + ./bootstrap && \ + aclocal && \ + autoconf && \ + automake --add-missing && \ + CFLAGS=-Wno-error ./configure \ + --prefix=${MM_GEOIP_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-assertions \ + --with-aix-soname=both \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# GeoIP support" >> ${LD_CONF_DIR}/GeoIP.conf && \ + echo ${MM_GEOIP_LIB_DIR} >> ${LD_CONF_DIR}/GeoIP.conf && \ + ldconfig + +ENV PATH="${MM_GEOIP_BIN_DIR}:${PATH}" + +################################################################## +# Google perftools +################################################################## +RUN mkdir -p ${GPERFTOOLS_DIR} ${GPERFTOOLS_SRC_DIR} +ADD ${GPERFTOOLS_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${GPERFTOOLS_TEMP} --directory /tmp && \ + cp -rfv ${GPERFTOOLS_TEMP_SRC}/* ${GPERFTOOLS_SRC_DIR} && \ + ln -sf ${GPERFTOOLS_SRC_DIR} ${GPERFTOOLS_DIR}/src && \ + cd ${GPERFTOOLS_TEMP_SRC} && \ + CFLAGS=-Wno-error ./configure \ + --prefix=${GPERFTOOLS_DIR} \ + --disable-silent-rules \ + --enable-shared \ + --enable-static \ + --enable-libunwind \ + --with-aix-soname=both \ + --enable-large-alloc-report \ + --enable-aggressive-decommit-by-default \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install && \ + echo "# Google perftools support" >> ${LD_CONF_DIR}/Googleperftools.conf && \ + echo ${GPERFTOOLS_LIB_DIR} >> ${LD_CONF_DIR}/Googleperftools.conf && \ + ldconfig + +ENV PATH="${GPERFTOOLS_BIN_DIR}:${PATH}" + +################################################################## +# OpenSSL 1.0.2u +################################################################## +RUN mkdir -p ${OPENSSL_102_DIR} ${OPENSSL_102_SRC_DIR} +ADD ${OPENSSL_102_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_102_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_102_TEMP_SRC}/* ${OPENSSL_102_SRC_DIR} && \ + ln -sf ${OPENSSL_102_SRC_DIR} ${OPENSSL_102_DIR}/src && \ + cd ${OPENSSL_102_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-ssl-trace \ + threads \ + shared \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_102_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 1.1.1.1 +################################################################## +RUN mkdir -p ${OPENSSL_111_DIR} ${OPENSSL_111_SRC_DIR} +ADD ${OPENSSL_111_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_111_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_111_TEMP_SRC}/* ${OPENSSL_111_SRC_DIR} && \ + ln -sf ${OPENSSL_111_SRC_DIR} ${OPENSSL_111_DIR}/src && \ + cd ${OPENSSL_111_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ + enable-ssl-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_111_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.0 +################################################################## +RUN mkdir -p ${OPENSSL_30_DIR} ${OPENSSL_30_SRC_DIR} +ADD ${OPENSSL_30_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_30_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_30_TEMP_SRC}/* ${OPENSSL_30_SRC_DIR} && \ + ln -sf ${OPENSSL_30_SRC_DIR} ${OPENSSL_30_DIR}/src && \ + cd ${OPENSSL_30_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_30_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.1 +################################################################## +RUN mkdir -p ${OPENSSL_31_DIR} ${OPENSSL_31_SRC_DIR} +ADD ${OPENSSL_31_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_31_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_31_TEMP_SRC}/* ${OPENSSL_31_SRC_DIR} && \ + ln -sf ${OPENSSL_31_SRC_DIR} ${OPENSSL_31_DIR}/src && \ + cd ${OPENSSL_31_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_31_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.2 +################################################################## +RUN mkdir -p ${OPENSSL_32_DIR} ${OPENSSL_32_SRC_DIR} +ADD ${OPENSSL_32_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_32_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_32_TEMP_SRC}/* ${OPENSSL_32_SRC_DIR} && \ + ln -sf ${OPENSSL_32_SRC_DIR} ${OPENSSL_32_DIR}/src && \ + cd ${OPENSSL_32_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_32_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.3 +################################################################## +RUN mkdir -p ${OPENSSL_33_DIR} ${OPENSSL_33_SRC_DIR} +ADD ${OPENSSL_33_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_33_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_33_TEMP_SRC}/* ${OPENSSL_33_SRC_DIR} && \ + ln -sf ${OPENSSL_33_SRC_DIR} ${OPENSSL_33_DIR}/src && \ + cd ${OPENSSL_33_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_33_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.4 +################################################################## +RUN mkdir -p ${OPENSSL_34_DIR} ${OPENSSL_34_SRC_DIR} +ADD ${OPENSSL_34_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_34_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_34_TEMP_SRC}/* ${OPENSSL_34_SRC_DIR} && \ + ln -sf ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_DIR}/src && \ + cd ${OPENSSL_34_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_34_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# OpenSSL 3.5 +################################################################## +RUN mkdir -p ${OPENSSL_35_DIR} ${OPENSSL_35_SRC_DIR} +ADD ${OPENSSL_35_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${OPENSSL_35_TEMP} --directory /tmp && \ + cp -rfv ${OPENSSL_35_TEMP_SRC}/* ${OPENSSL_35_SRC_DIR} && \ + ln -sf ${OPENSSL_35_SRC_DIR} ${OPENSSL_35_DIR}/src && \ + cd ${OPENSSL_35_TEMP_SRC} && \ + CFLAGS="-Wno-error -fPIC" CXXFLAGS="-fPIC" ./config \ + zlib \ + --with-zlib-include=${ZLIB_DIR}/include \ + --with-zlib-lib=${ZLIB_DIR}/lib \ + --with-zstd-include=${ZSTD_DIR}/include \ + --with-zstd-lib=${ZSTD_DIR}/lib \ + enable-ktls \ + enable-ec_nistp_64_gcc_128 \ + enable-egd \ +# enable-fips \ + enable-ssl-trace\ + enable-trace \ + threads \ + sctp \ + shared \ + --release \ + --prefix=${OPENSSL_35_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +################################################################## +# LibreSSL +################################################################## +RUN mkdir -p ${LIBRESSL_DIR} ${LIBRESSL_SRC_DIR} +ADD ${LIBRESSL_DOWNLOAD_URL} /tmp + +RUN tar -xzf ${LIBRESSL_TEMP} --directory /tmp && \ + cp -rfv ${LIBRESSL_TEMP_SRC}/* ${LIBRESSL_SRC_DIR} && \ + ln -sfv ${LIBRESSL_SRC_DIR} ${LIBRESSL_DIR}/src && \ + cd ${LIBRESSL_TEMP_SRC} && \ + CFLAGS=-Wno-error ./config \ + --enable-static \ + --enable-shared \ + --disable-silent-rules \ + --prefix=${LIBRESSL_DIR} \ + && \ + make -j$(nproc) && \ + make -j$(nproc) install + +# ################################################################## +# # BoringSSL +# ################################################################## +# RUN mkdir -p ${BORINGSSL_DIR} ${BORINGSSL_SRC_DIR} && \ +# git clone -b ${BORINGSSL_VERSION} ${BORINGSSL_DOWNLOAD_URL} ${BORINGSSL_TEMP_SRC} && \ +# cp -rfv ${BORINGSSL_TEMP_SRC}/* ${BORINGSSL_SRC_DIR} && \ +# ln -sf ${BORINGSSL_SRC_DIR} ${BORINGSSL_DIR}/src && \ +# cd ${BORINGSSL_TEMP_SRC} && \ +# mkdir ${BORINGSSL_TEMP_SRC}/build && \ +# # cmake -GNinja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} && \ +# # ninja -C build && \ +# cd ${BORINGSSL_TEMP_SRC}/build && \ +# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=${BORINGSSL_DIR} .. && \ +# make -j$(if [ $(nproc) -gt 8 ]; then echo $(( $(nproc) / 2 )); else echo $(nproc); fi) && \ +# make -j$(nproc) install + +################################################################## +# other customisations +################################################################## + +################################################################## +# Cleanup +################################################################## +RUN echo "clean up" && \ + apt-get clean -y && \ + apt-get autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +RUN updatedb diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/develop/Makefile b/linux/ecosystem/epicmorg/astra/1.8-alse/develop/Makefile new file mode 100644 index 000000000..1e4371492 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/develop/Makefile @@ -0,0 +1,44 @@ +all: app + +app: + make pip + make build + make deploy + make clean + +build: + make build-buildah + +deploy: + make deploy-buildah + +build-buildah: + buildah-wrapper --build + +deploy-buildah: + buildah-wrapper --deploy + +build-kaniko: + kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run + +deploy-kaniko: + kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy-compose: + docker-compose push + +clean: + docker container prune -f + docker image prune -f + docker network prune -f + docker volume prune -f + docker system prune -af + buildah rm -a + buildah rmi -a + +pip: + pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper + pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/develop/docker-compose.yml b/linux/ecosystem/epicmorg/astra/1.8-alse/develop/docker-compose.yml new file mode 100644 index 000000000..e76d6b238 --- /dev/null +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/develop/docker-compose.yml @@ -0,0 +1,5 @@ +services: + app: + image: "quay.io/epicmorg/astralinux:1.8-develop" + build: + context: . \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/astra/1.8-alse/main/Dockerfile b/linux/ecosystem/epicmorg/astra/1.8-alse/main/Dockerfile index 6ac1f3f2c..33b2f30a3 100644 --- a/linux/ecosystem/epicmorg/astra/1.8-alse/main/Dockerfile +++ b/linux/ecosystem/epicmorg/astra/1.8-alse/main/Dockerfile @@ -82,7 +82,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio iftop \ # iotop \ iperf \ - iperf3 \ +# iperf3 \ iputils-ping \ jq \ kmod \ @@ -156,7 +156,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio ntfs-3g \ # reiser4progs \ reiserfsprogs \ - udftools \ +# udftools \ xfsprogs \ xfsdump From e2ebc22a5fd4f7725ff3900d9e1c32d9cc8a7402 Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 29 Apr 2025 00:56:02 +0300 Subject: [PATCH 08/12] nginx --- linux/{ecosystem => obsolete}/nginx/1.14/main/.env | 0 .../nginx/1.14/main/Dockerfile | 0 .../nginx/1.14/main/Makefile | 0 .../nginx/1.14/main/README.md | 0 .../nginx/1.14/main/docker-compose.yml | 0 .../nginx/1.14/main/pre/ip2location-description-pak | 0 .../nginx/1.14/main/pre/luajit2-description-pak | 0 .../nginx/1.14/main/pre/nginx-description-pak | 0 .../nginx/1.14/main/pre/ngninx.pre.tar.gz | Bin linux/{ecosystem => obsolete}/nginx/1.14/php/.env | 0 .../nginx/1.14/php/Dockerfile | 0 .../{ecosystem => obsolete}/nginx/1.14/php/Makefile | 0 .../nginx/1.14/php/README.md | 0 .../nginx/1.14/php/docker-compose.yml | 0 .../nginx/1.14/rtmp-hls/.env | 0 .../nginx/1.14/rtmp-hls/Dockerfile | 0 .../nginx/1.14/rtmp-hls/Makefile | 0 .../nginx/1.14/rtmp-hls/README.md | 0 .../nginx/1.14/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.14/rtmp-hls/docker-compose.yml | 0 .../nginx/1.14/rtmp-hls/players/dash.html | 0 .../nginx/1.14/rtmp-hls/players/hls.html | 0 .../nginx/1.14/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.14/rtmp-hls/players/rtmp.html | 0 .../nginx/1.14/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.14/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{ecosystem => obsolete}/nginx/1.15/main/.env | 0 .../nginx/1.15/main/Dockerfile | 0 .../nginx/1.15/main/Makefile | 0 .../nginx/1.15/main/README.md | 0 .../nginx/1.15/main/docker-compose.yml | 0 .../nginx/1.15/main/pre/ip2location-description-pak | 0 .../nginx/1.15/main/pre/luajit2-description-pak | 0 .../nginx/1.15/main/pre/nginx-description-pak | 0 .../nginx/1.15/main/pre/ngninx.pre.tar.gz | Bin linux/{ecosystem => obsolete}/nginx/1.15/php/.env | 0 .../nginx/1.15/php/Dockerfile | 0 .../{ecosystem => obsolete}/nginx/1.15/php/Makefile | 0 .../nginx/1.15/php/README.md | 0 .../nginx/1.15/php/docker-compose.yml | 0 .../nginx/1.15/rtmp-hls/.env | 0 .../nginx/1.15/rtmp-hls/Dockerfile | 0 .../nginx/1.15/rtmp-hls/Makefile | 0 .../nginx/1.15/rtmp-hls/README.md | 0 .../nginx/1.15/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.15/rtmp-hls/docker-compose.yml | 0 .../nginx/1.15/rtmp-hls/players/dash.html | 0 .../nginx/1.15/rtmp-hls/players/hls.html | 0 .../nginx/1.15/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.15/rtmp-hls/players/rtmp.html | 0 .../nginx/1.15/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.15/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{ecosystem => obsolete}/nginx/1.16/main/.env | 0 .../nginx/1.16/main/Dockerfile | 0 .../nginx/1.16/main/Makefile | 0 .../nginx/1.16/main/README.md | 0 .../nginx/1.16/main/docker-compose.yml | 0 .../nginx/1.16/main/pre/ip2location-description-pak | 0 .../nginx/1.16/main/pre/luajit2-description-pak | 0 .../nginx/1.16/main/pre/nginx-description-pak | 0 .../nginx/1.16/main/pre/ngninx.pre.tar.gz | Bin linux/{ecosystem => obsolete}/nginx/1.16/php/.env | 0 .../nginx/1.16/php/Dockerfile | 0 .../{ecosystem => obsolete}/nginx/1.16/php/Makefile | 0 .../nginx/1.16/php/README.md | 0 .../nginx/1.16/php/docker-compose.yml | 0 .../nginx/1.16/rtmp-hls/.env | 0 .../nginx/1.16/rtmp-hls/Dockerfile | 0 .../nginx/1.16/rtmp-hls/Makefile | 0 .../nginx/1.16/rtmp-hls/README.md | 0 .../nginx/1.16/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.16/rtmp-hls/docker-compose.yml | 0 .../nginx/1.16/rtmp-hls/players/dash.html | 0 .../nginx/1.16/rtmp-hls/players/hls.html | 0 .../nginx/1.16/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.16/rtmp-hls/players/rtmp.html | 0 .../nginx/1.16/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.16/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{ecosystem => obsolete}/nginx/1.17/main/.env | 0 .../nginx/1.17/main/Dockerfile | 0 .../nginx/1.17/main/Makefile | 0 .../nginx/1.17/main/README.md | 0 .../nginx/1.17/main/docker-compose.yml | 0 .../nginx/1.17/main/pre/ip2location-description-pak | 0 .../nginx/1.17/main/pre/luajit2-description-pak | 0 .../nginx/1.17/main/pre/nginx-description-pak | 0 .../nginx/1.17/main/pre/ngninx.pre.tar.gz | Bin linux/{ecosystem => obsolete}/nginx/1.17/php/.env | 0 .../nginx/1.17/php/Dockerfile | 0 .../{ecosystem => obsolete}/nginx/1.17/php/Makefile | 0 .../nginx/1.17/php/README.md | 0 .../nginx/1.17/php/docker-compose.yml | 0 .../nginx/1.17/rtmp-hls/.env | 0 .../nginx/1.17/rtmp-hls/Dockerfile | 0 .../nginx/1.17/rtmp-hls/Makefile | 0 .../nginx/1.17/rtmp-hls/README.md | 0 .../nginx/1.17/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.17/rtmp-hls/docker-compose.yml | 0 .../nginx/1.17/rtmp-hls/players/dash.html | 0 .../nginx/1.17/rtmp-hls/players/hls.html | 0 .../nginx/1.17/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.17/rtmp-hls/players/rtmp.html | 0 .../nginx/1.17/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.17/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{ecosystem => obsolete}/nginx/1.18/main/.env | 0 .../nginx/1.18/main/Dockerfile | 0 .../nginx/1.18/main/Makefile | 0 .../nginx/1.18/main/README.md | 0 .../nginx/1.18/main/docker-compose.yml | 0 .../nginx/1.18/main/pre/ip2location-description-pak | 0 .../nginx/1.18/main/pre/luajit2-description-pak | 0 .../nginx/1.18/main/pre/nginx-description-pak | 0 .../nginx/1.18/main/pre/ngninx.pre.tar.gz | Bin linux/{ecosystem => obsolete}/nginx/1.18/php/.env | 0 .../nginx/1.18/php/Dockerfile | 0 .../{ecosystem => obsolete}/nginx/1.18/php/Makefile | 0 .../nginx/1.18/php/README.md | 0 .../nginx/1.18/php/docker-compose.yml | 0 .../nginx/1.18/rtmp-hls/.env | 0 .../nginx/1.18/rtmp-hls/Dockerfile | 0 .../nginx/1.18/rtmp-hls/Makefile | 0 .../nginx/1.18/rtmp-hls/README.md | 0 .../nginx/1.18/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.18/rtmp-hls/docker-compose.yml | 0 .../nginx/1.18/rtmp-hls/players/dash.html | 0 .../nginx/1.18/rtmp-hls/players/hls.html | 0 .../nginx/1.18/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.18/rtmp-hls/players/rtmp.html | 0 .../nginx/1.18/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.18/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{ecosystem => obsolete}/nginx/1.19/main/.env | 0 .../nginx/1.19/main/Dockerfile | 0 .../nginx/1.19/main/Makefile | 0 .../nginx/1.19/main/README.md | 0 .../nginx/1.19/main/docker-compose.yml | 0 .../nginx/1.19/main/pre/ip2location-description-pak | 0 .../nginx/1.19/main/pre/luajit2-description-pak | 0 .../nginx/1.19/main/pre/nginx-description-pak | 0 .../nginx/1.19/main/pre/ngninx.pre.tar.gz | Bin linux/{ecosystem => obsolete}/nginx/1.19/php/.env | 0 .../nginx/1.19/php/Dockerfile | 0 .../{ecosystem => obsolete}/nginx/1.19/php/Makefile | 0 .../nginx/1.19/php/README.md | 0 .../nginx/1.19/php/docker-compose.yml | 0 .../nginx/1.19/rtmp-hls/.env | 0 .../nginx/1.19/rtmp-hls/Dockerfile | 0 .../nginx/1.19/rtmp-hls/Makefile | 0 .../nginx/1.19/rtmp-hls/README.md | 0 .../nginx/1.19/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.19/rtmp-hls/docker-compose.yml | 0 .../nginx/1.19/rtmp-hls/players/dash.html | 0 .../nginx/1.19/rtmp-hls/players/hls.html | 0 .../nginx/1.19/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.19/rtmp-hls/players/rtmp.html | 0 .../nginx/1.19/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.19/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{ecosystem => obsolete}/nginx/1.20/main/.env | 0 .../nginx/1.20/main/Dockerfile | 0 .../nginx/1.20/main/Makefile | 0 .../nginx/1.20/main/README.md | 0 .../nginx/1.20/main/docker-compose.yml | 0 .../nginx/1.20/main/pre/ip2location-description-pak | 0 .../nginx/1.20/main/pre/luajit2-description-pak | 0 .../nginx/1.20/main/pre/nginx-description-pak | 0 .../nginx/1.20/main/pre/ngninx.pre.tar.gz | Bin linux/{ecosystem => obsolete}/nginx/1.20/php/.env | 0 .../nginx/1.20/php/Dockerfile | 0 .../{ecosystem => obsolete}/nginx/1.20/php/Makefile | 0 .../nginx/1.20/php/README.md | 0 .../nginx/1.20/php/docker-compose.yml | 0 .../nginx/1.20/rtmp-hls/.env | 0 .../nginx/1.20/rtmp-hls/Dockerfile | 0 .../nginx/1.20/rtmp-hls/Makefile | 0 .../nginx/1.20/rtmp-hls/README.md | 0 .../nginx/1.20/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.20/rtmp-hls/docker-compose.yml | 0 .../nginx/1.20/rtmp-hls/players/dash.html | 0 .../nginx/1.20/rtmp-hls/players/hls.html | 0 .../nginx/1.20/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.20/rtmp-hls/players/rtmp.html | 0 .../nginx/1.20/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.20/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{ecosystem => obsolete}/nginx/1.21/main/.env | 0 .../nginx/1.21/main/Dockerfile | 0 .../nginx/1.21/main/Makefile | 0 .../nginx/1.21/main/README.md | 0 .../nginx/1.21/main/docker-compose.yml | 0 .../nginx/1.21/main/pre/ip2location-description-pak | 0 .../nginx/1.21/main/pre/luajit2-description-pak | 0 .../nginx/1.21/main/pre/nginx-description-pak | 0 .../nginx/1.21/main/pre/ngninx.pre.tar.gz | Bin linux/{ecosystem => obsolete}/nginx/1.21/php/.env | 0 .../nginx/1.21/php/Dockerfile | 0 .../{ecosystem => obsolete}/nginx/1.21/php/Makefile | 0 .../nginx/1.21/php/README.md | 0 .../nginx/1.21/php/docker-compose.yml | 0 .../nginx/1.21/rtmp-hls/.env | 0 .../nginx/1.21/rtmp-hls/Dockerfile | 0 .../nginx/1.21/rtmp-hls/Makefile | 0 .../nginx/1.21/rtmp-hls/README.md | 0 .../nginx/1.21/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.21/rtmp-hls/docker-compose.yml | 0 .../nginx/1.21/rtmp-hls/players/dash.html | 0 .../nginx/1.21/rtmp-hls/players/hls.html | 0 .../nginx/1.21/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.21/rtmp-hls/players/rtmp.html | 0 .../nginx/1.21/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.21/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 240 files changed, 0 insertions(+), 0 deletions(-) rename linux/{ecosystem => obsolete}/nginx/1.14/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/main/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/main/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/main/pre/nginx-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/php/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/php/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/php/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/php/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/pre/nginx-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/php/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/php/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/php/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/php/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/pre/nginx-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/php/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/php/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/php/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/php/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/pre/nginx-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/php/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/php/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/php/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/php/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/pre/nginx-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/php/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/php/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/php/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/php/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/pre/nginx-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/php/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/php/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/php/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/php/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/pre/nginx-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/php/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/php/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/php/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/php/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/pre/ip2location-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/pre/luajit2-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/pre/nginx-description-pak (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/main/pre/ngninx.pre.tar.gz (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/php/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/php/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/php/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/php/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/php/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/.env (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/Dockerfile (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/Makefile (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/README.md (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/conf/nginx.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/docker-compose.yml (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/players/dash.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/players/hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/players/rtmp.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{ecosystem => obsolete}/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list (100%) diff --git a/linux/ecosystem/nginx/1.14/main/.env b/linux/obsolete/nginx/1.14/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.14/main/.env rename to linux/obsolete/nginx/1.14/main/.env diff --git a/linux/ecosystem/nginx/1.14/main/Dockerfile b/linux/obsolete/nginx/1.14/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.14/main/Dockerfile rename to linux/obsolete/nginx/1.14/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.14/main/Makefile b/linux/obsolete/nginx/1.14/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.14/main/Makefile rename to linux/obsolete/nginx/1.14/main/Makefile diff --git a/linux/ecosystem/nginx/1.14/main/README.md b/linux/obsolete/nginx/1.14/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.14/main/README.md rename to linux/obsolete/nginx/1.14/main/README.md diff --git a/linux/ecosystem/nginx/1.14/main/docker-compose.yml b/linux/obsolete/nginx/1.14/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.14/main/docker-compose.yml rename to linux/obsolete/nginx/1.14/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.14/main/pre/ip2location-description-pak b/linux/obsolete/nginx/1.14/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.14/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/1.14/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.14/main/pre/luajit2-description-pak b/linux/obsolete/nginx/1.14/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.14/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/1.14/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.14/main/pre/nginx-description-pak b/linux/obsolete/nginx/1.14/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.14/main/pre/nginx-description-pak rename to linux/obsolete/nginx/1.14/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.14/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/1.14/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.14/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/1.14/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.14/php/.env b/linux/obsolete/nginx/1.14/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.14/php/.env rename to linux/obsolete/nginx/1.14/php/.env diff --git a/linux/ecosystem/nginx/1.14/php/Dockerfile b/linux/obsolete/nginx/1.14/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.14/php/Dockerfile rename to linux/obsolete/nginx/1.14/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.14/php/Makefile b/linux/obsolete/nginx/1.14/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.14/php/Makefile rename to linux/obsolete/nginx/1.14/php/Makefile diff --git a/linux/ecosystem/nginx/1.14/php/README.md b/linux/obsolete/nginx/1.14/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.14/php/README.md rename to linux/obsolete/nginx/1.14/php/README.md diff --git a/linux/ecosystem/nginx/1.14/php/docker-compose.yml b/linux/obsolete/nginx/1.14/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.14/php/docker-compose.yml rename to linux/obsolete/nginx/1.14/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/.env b/linux/obsolete/nginx/1.14/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/.env rename to linux/obsolete/nginx/1.14/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/Dockerfile b/linux/obsolete/nginx/1.14/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/1.14/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/Makefile b/linux/obsolete/nginx/1.14/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/Makefile rename to linux/obsolete/nginx/1.14/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/README.md b/linux/obsolete/nginx/1.14/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/README.md rename to linux/obsolete/nginx/1.14/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/1.14/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/1.14/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/players/dash.html b/linux/obsolete/nginx/1.14/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/1.14/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/players/hls.html b/linux/obsolete/nginx/1.14/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/1.14/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/1.14/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/1.14/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/1.14/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/1.14/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/1.14/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/1.14/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.15/main/.env b/linux/obsolete/nginx/1.15/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.15/main/.env rename to linux/obsolete/nginx/1.15/main/.env diff --git a/linux/ecosystem/nginx/1.15/main/Dockerfile b/linux/obsolete/nginx/1.15/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.15/main/Dockerfile rename to linux/obsolete/nginx/1.15/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.15/main/Makefile b/linux/obsolete/nginx/1.15/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.15/main/Makefile rename to linux/obsolete/nginx/1.15/main/Makefile diff --git a/linux/ecosystem/nginx/1.15/main/README.md b/linux/obsolete/nginx/1.15/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.15/main/README.md rename to linux/obsolete/nginx/1.15/main/README.md diff --git a/linux/ecosystem/nginx/1.15/main/docker-compose.yml b/linux/obsolete/nginx/1.15/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.15/main/docker-compose.yml rename to linux/obsolete/nginx/1.15/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.15/main/pre/ip2location-description-pak b/linux/obsolete/nginx/1.15/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.15/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/1.15/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.15/main/pre/luajit2-description-pak b/linux/obsolete/nginx/1.15/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.15/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/1.15/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.15/main/pre/nginx-description-pak b/linux/obsolete/nginx/1.15/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.15/main/pre/nginx-description-pak rename to linux/obsolete/nginx/1.15/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.15/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/1.15/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.15/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/1.15/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.15/php/.env b/linux/obsolete/nginx/1.15/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.15/php/.env rename to linux/obsolete/nginx/1.15/php/.env diff --git a/linux/ecosystem/nginx/1.15/php/Dockerfile b/linux/obsolete/nginx/1.15/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.15/php/Dockerfile rename to linux/obsolete/nginx/1.15/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.15/php/Makefile b/linux/obsolete/nginx/1.15/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.15/php/Makefile rename to linux/obsolete/nginx/1.15/php/Makefile diff --git a/linux/ecosystem/nginx/1.15/php/README.md b/linux/obsolete/nginx/1.15/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.15/php/README.md rename to linux/obsolete/nginx/1.15/php/README.md diff --git a/linux/ecosystem/nginx/1.15/php/docker-compose.yml b/linux/obsolete/nginx/1.15/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.15/php/docker-compose.yml rename to linux/obsolete/nginx/1.15/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/.env b/linux/obsolete/nginx/1.15/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/.env rename to linux/obsolete/nginx/1.15/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/Dockerfile b/linux/obsolete/nginx/1.15/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/1.15/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/Makefile b/linux/obsolete/nginx/1.15/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/Makefile rename to linux/obsolete/nginx/1.15/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/README.md b/linux/obsolete/nginx/1.15/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/README.md rename to linux/obsolete/nginx/1.15/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/1.15/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/1.15/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/players/dash.html b/linux/obsolete/nginx/1.15/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/1.15/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/players/hls.html b/linux/obsolete/nginx/1.15/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/1.15/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/1.15/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/1.15/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/1.15/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/1.15/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/1.15/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/1.15/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.16/main/.env b/linux/obsolete/nginx/1.16/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.16/main/.env rename to linux/obsolete/nginx/1.16/main/.env diff --git a/linux/ecosystem/nginx/1.16/main/Dockerfile b/linux/obsolete/nginx/1.16/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.16/main/Dockerfile rename to linux/obsolete/nginx/1.16/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.16/main/Makefile b/linux/obsolete/nginx/1.16/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.16/main/Makefile rename to linux/obsolete/nginx/1.16/main/Makefile diff --git a/linux/ecosystem/nginx/1.16/main/README.md b/linux/obsolete/nginx/1.16/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.16/main/README.md rename to linux/obsolete/nginx/1.16/main/README.md diff --git a/linux/ecosystem/nginx/1.16/main/docker-compose.yml b/linux/obsolete/nginx/1.16/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.16/main/docker-compose.yml rename to linux/obsolete/nginx/1.16/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.16/main/pre/ip2location-description-pak b/linux/obsolete/nginx/1.16/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.16/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/1.16/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.16/main/pre/luajit2-description-pak b/linux/obsolete/nginx/1.16/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.16/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/1.16/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.16/main/pre/nginx-description-pak b/linux/obsolete/nginx/1.16/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.16/main/pre/nginx-description-pak rename to linux/obsolete/nginx/1.16/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.16/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/1.16/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.16/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/1.16/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.16/php/.env b/linux/obsolete/nginx/1.16/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.16/php/.env rename to linux/obsolete/nginx/1.16/php/.env diff --git a/linux/ecosystem/nginx/1.16/php/Dockerfile b/linux/obsolete/nginx/1.16/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.16/php/Dockerfile rename to linux/obsolete/nginx/1.16/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.16/php/Makefile b/linux/obsolete/nginx/1.16/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.16/php/Makefile rename to linux/obsolete/nginx/1.16/php/Makefile diff --git a/linux/ecosystem/nginx/1.16/php/README.md b/linux/obsolete/nginx/1.16/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.16/php/README.md rename to linux/obsolete/nginx/1.16/php/README.md diff --git a/linux/ecosystem/nginx/1.16/php/docker-compose.yml b/linux/obsolete/nginx/1.16/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.16/php/docker-compose.yml rename to linux/obsolete/nginx/1.16/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/.env b/linux/obsolete/nginx/1.16/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/.env rename to linux/obsolete/nginx/1.16/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/Dockerfile b/linux/obsolete/nginx/1.16/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/1.16/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/Makefile b/linux/obsolete/nginx/1.16/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/Makefile rename to linux/obsolete/nginx/1.16/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/README.md b/linux/obsolete/nginx/1.16/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/README.md rename to linux/obsolete/nginx/1.16/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/1.16/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/1.16/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/players/dash.html b/linux/obsolete/nginx/1.16/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/1.16/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/players/hls.html b/linux/obsolete/nginx/1.16/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/1.16/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/1.16/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/1.16/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/1.16/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/1.16/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/1.16/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/1.16/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.17/main/.env b/linux/obsolete/nginx/1.17/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.17/main/.env rename to linux/obsolete/nginx/1.17/main/.env diff --git a/linux/ecosystem/nginx/1.17/main/Dockerfile b/linux/obsolete/nginx/1.17/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.17/main/Dockerfile rename to linux/obsolete/nginx/1.17/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.17/main/Makefile b/linux/obsolete/nginx/1.17/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.17/main/Makefile rename to linux/obsolete/nginx/1.17/main/Makefile diff --git a/linux/ecosystem/nginx/1.17/main/README.md b/linux/obsolete/nginx/1.17/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.17/main/README.md rename to linux/obsolete/nginx/1.17/main/README.md diff --git a/linux/ecosystem/nginx/1.17/main/docker-compose.yml b/linux/obsolete/nginx/1.17/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.17/main/docker-compose.yml rename to linux/obsolete/nginx/1.17/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.17/main/pre/ip2location-description-pak b/linux/obsolete/nginx/1.17/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.17/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/1.17/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.17/main/pre/luajit2-description-pak b/linux/obsolete/nginx/1.17/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.17/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/1.17/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.17/main/pre/nginx-description-pak b/linux/obsolete/nginx/1.17/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.17/main/pre/nginx-description-pak rename to linux/obsolete/nginx/1.17/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.17/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/1.17/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.17/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/1.17/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.17/php/.env b/linux/obsolete/nginx/1.17/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.17/php/.env rename to linux/obsolete/nginx/1.17/php/.env diff --git a/linux/ecosystem/nginx/1.17/php/Dockerfile b/linux/obsolete/nginx/1.17/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.17/php/Dockerfile rename to linux/obsolete/nginx/1.17/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.17/php/Makefile b/linux/obsolete/nginx/1.17/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.17/php/Makefile rename to linux/obsolete/nginx/1.17/php/Makefile diff --git a/linux/ecosystem/nginx/1.17/php/README.md b/linux/obsolete/nginx/1.17/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.17/php/README.md rename to linux/obsolete/nginx/1.17/php/README.md diff --git a/linux/ecosystem/nginx/1.17/php/docker-compose.yml b/linux/obsolete/nginx/1.17/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.17/php/docker-compose.yml rename to linux/obsolete/nginx/1.17/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/.env b/linux/obsolete/nginx/1.17/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/.env rename to linux/obsolete/nginx/1.17/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/Dockerfile b/linux/obsolete/nginx/1.17/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/1.17/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/Makefile b/linux/obsolete/nginx/1.17/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/Makefile rename to linux/obsolete/nginx/1.17/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/README.md b/linux/obsolete/nginx/1.17/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/README.md rename to linux/obsolete/nginx/1.17/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/1.17/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/1.17/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/players/dash.html b/linux/obsolete/nginx/1.17/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/1.17/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/players/hls.html b/linux/obsolete/nginx/1.17/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/1.17/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/1.17/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/1.17/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/1.17/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/1.17/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/1.17/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/1.17/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.18/main/.env b/linux/obsolete/nginx/1.18/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.18/main/.env rename to linux/obsolete/nginx/1.18/main/.env diff --git a/linux/ecosystem/nginx/1.18/main/Dockerfile b/linux/obsolete/nginx/1.18/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.18/main/Dockerfile rename to linux/obsolete/nginx/1.18/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.18/main/Makefile b/linux/obsolete/nginx/1.18/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.18/main/Makefile rename to linux/obsolete/nginx/1.18/main/Makefile diff --git a/linux/ecosystem/nginx/1.18/main/README.md b/linux/obsolete/nginx/1.18/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.18/main/README.md rename to linux/obsolete/nginx/1.18/main/README.md diff --git a/linux/ecosystem/nginx/1.18/main/docker-compose.yml b/linux/obsolete/nginx/1.18/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.18/main/docker-compose.yml rename to linux/obsolete/nginx/1.18/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.18/main/pre/ip2location-description-pak b/linux/obsolete/nginx/1.18/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.18/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/1.18/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.18/main/pre/luajit2-description-pak b/linux/obsolete/nginx/1.18/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.18/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/1.18/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.18/main/pre/nginx-description-pak b/linux/obsolete/nginx/1.18/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.18/main/pre/nginx-description-pak rename to linux/obsolete/nginx/1.18/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.18/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/1.18/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.18/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/1.18/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.18/php/.env b/linux/obsolete/nginx/1.18/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.18/php/.env rename to linux/obsolete/nginx/1.18/php/.env diff --git a/linux/ecosystem/nginx/1.18/php/Dockerfile b/linux/obsolete/nginx/1.18/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.18/php/Dockerfile rename to linux/obsolete/nginx/1.18/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.18/php/Makefile b/linux/obsolete/nginx/1.18/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.18/php/Makefile rename to linux/obsolete/nginx/1.18/php/Makefile diff --git a/linux/ecosystem/nginx/1.18/php/README.md b/linux/obsolete/nginx/1.18/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.18/php/README.md rename to linux/obsolete/nginx/1.18/php/README.md diff --git a/linux/ecosystem/nginx/1.18/php/docker-compose.yml b/linux/obsolete/nginx/1.18/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.18/php/docker-compose.yml rename to linux/obsolete/nginx/1.18/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/.env b/linux/obsolete/nginx/1.18/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/.env rename to linux/obsolete/nginx/1.18/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/Dockerfile b/linux/obsolete/nginx/1.18/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/1.18/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/Makefile b/linux/obsolete/nginx/1.18/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/Makefile rename to linux/obsolete/nginx/1.18/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/README.md b/linux/obsolete/nginx/1.18/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/README.md rename to linux/obsolete/nginx/1.18/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/1.18/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/1.18/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/players/dash.html b/linux/obsolete/nginx/1.18/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/1.18/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/players/hls.html b/linux/obsolete/nginx/1.18/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/1.18/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/1.18/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/1.18/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/1.18/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/1.18/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/1.18/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/1.18/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.19/main/.env b/linux/obsolete/nginx/1.19/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.19/main/.env rename to linux/obsolete/nginx/1.19/main/.env diff --git a/linux/ecosystem/nginx/1.19/main/Dockerfile b/linux/obsolete/nginx/1.19/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.19/main/Dockerfile rename to linux/obsolete/nginx/1.19/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.19/main/Makefile b/linux/obsolete/nginx/1.19/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.19/main/Makefile rename to linux/obsolete/nginx/1.19/main/Makefile diff --git a/linux/ecosystem/nginx/1.19/main/README.md b/linux/obsolete/nginx/1.19/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.19/main/README.md rename to linux/obsolete/nginx/1.19/main/README.md diff --git a/linux/ecosystem/nginx/1.19/main/docker-compose.yml b/linux/obsolete/nginx/1.19/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.19/main/docker-compose.yml rename to linux/obsolete/nginx/1.19/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.19/main/pre/ip2location-description-pak b/linux/obsolete/nginx/1.19/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.19/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/1.19/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.19/main/pre/luajit2-description-pak b/linux/obsolete/nginx/1.19/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.19/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/1.19/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.19/main/pre/nginx-description-pak b/linux/obsolete/nginx/1.19/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.19/main/pre/nginx-description-pak rename to linux/obsolete/nginx/1.19/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.19/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/1.19/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.19/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/1.19/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.19/php/.env b/linux/obsolete/nginx/1.19/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.19/php/.env rename to linux/obsolete/nginx/1.19/php/.env diff --git a/linux/ecosystem/nginx/1.19/php/Dockerfile b/linux/obsolete/nginx/1.19/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.19/php/Dockerfile rename to linux/obsolete/nginx/1.19/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.19/php/Makefile b/linux/obsolete/nginx/1.19/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.19/php/Makefile rename to linux/obsolete/nginx/1.19/php/Makefile diff --git a/linux/ecosystem/nginx/1.19/php/README.md b/linux/obsolete/nginx/1.19/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.19/php/README.md rename to linux/obsolete/nginx/1.19/php/README.md diff --git a/linux/ecosystem/nginx/1.19/php/docker-compose.yml b/linux/obsolete/nginx/1.19/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.19/php/docker-compose.yml rename to linux/obsolete/nginx/1.19/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/.env b/linux/obsolete/nginx/1.19/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/.env rename to linux/obsolete/nginx/1.19/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/Dockerfile b/linux/obsolete/nginx/1.19/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/1.19/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/Makefile b/linux/obsolete/nginx/1.19/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/Makefile rename to linux/obsolete/nginx/1.19/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/README.md b/linux/obsolete/nginx/1.19/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/README.md rename to linux/obsolete/nginx/1.19/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/1.19/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/1.19/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/players/dash.html b/linux/obsolete/nginx/1.19/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/1.19/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/players/hls.html b/linux/obsolete/nginx/1.19/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/1.19/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/1.19/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/1.19/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/1.19/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/1.19/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/1.19/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/1.19/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.20/main/.env b/linux/obsolete/nginx/1.20/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.20/main/.env rename to linux/obsolete/nginx/1.20/main/.env diff --git a/linux/ecosystem/nginx/1.20/main/Dockerfile b/linux/obsolete/nginx/1.20/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.20/main/Dockerfile rename to linux/obsolete/nginx/1.20/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.20/main/Makefile b/linux/obsolete/nginx/1.20/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.20/main/Makefile rename to linux/obsolete/nginx/1.20/main/Makefile diff --git a/linux/ecosystem/nginx/1.20/main/README.md b/linux/obsolete/nginx/1.20/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.20/main/README.md rename to linux/obsolete/nginx/1.20/main/README.md diff --git a/linux/ecosystem/nginx/1.20/main/docker-compose.yml b/linux/obsolete/nginx/1.20/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.20/main/docker-compose.yml rename to linux/obsolete/nginx/1.20/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.20/main/pre/ip2location-description-pak b/linux/obsolete/nginx/1.20/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.20/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/1.20/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.20/main/pre/luajit2-description-pak b/linux/obsolete/nginx/1.20/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.20/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/1.20/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.20/main/pre/nginx-description-pak b/linux/obsolete/nginx/1.20/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.20/main/pre/nginx-description-pak rename to linux/obsolete/nginx/1.20/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.20/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/1.20/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.20/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/1.20/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.20/php/.env b/linux/obsolete/nginx/1.20/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.20/php/.env rename to linux/obsolete/nginx/1.20/php/.env diff --git a/linux/ecosystem/nginx/1.20/php/Dockerfile b/linux/obsolete/nginx/1.20/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.20/php/Dockerfile rename to linux/obsolete/nginx/1.20/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.20/php/Makefile b/linux/obsolete/nginx/1.20/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.20/php/Makefile rename to linux/obsolete/nginx/1.20/php/Makefile diff --git a/linux/ecosystem/nginx/1.20/php/README.md b/linux/obsolete/nginx/1.20/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.20/php/README.md rename to linux/obsolete/nginx/1.20/php/README.md diff --git a/linux/ecosystem/nginx/1.20/php/docker-compose.yml b/linux/obsolete/nginx/1.20/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.20/php/docker-compose.yml rename to linux/obsolete/nginx/1.20/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/.env b/linux/obsolete/nginx/1.20/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/.env rename to linux/obsolete/nginx/1.20/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/Dockerfile b/linux/obsolete/nginx/1.20/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/1.20/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/Makefile b/linux/obsolete/nginx/1.20/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/Makefile rename to linux/obsolete/nginx/1.20/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/README.md b/linux/obsolete/nginx/1.20/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/README.md rename to linux/obsolete/nginx/1.20/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/1.20/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/1.20/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/players/dash.html b/linux/obsolete/nginx/1.20/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/1.20/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/players/hls.html b/linux/obsolete/nginx/1.20/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/1.20/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/1.20/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/1.20/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/1.20/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/1.20/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/1.20/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/1.20/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/ecosystem/nginx/1.21/main/.env b/linux/obsolete/nginx/1.21/main/.env similarity index 100% rename from linux/ecosystem/nginx/1.21/main/.env rename to linux/obsolete/nginx/1.21/main/.env diff --git a/linux/ecosystem/nginx/1.21/main/Dockerfile b/linux/obsolete/nginx/1.21/main/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.21/main/Dockerfile rename to linux/obsolete/nginx/1.21/main/Dockerfile diff --git a/linux/ecosystem/nginx/1.21/main/Makefile b/linux/obsolete/nginx/1.21/main/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21/main/Makefile rename to linux/obsolete/nginx/1.21/main/Makefile diff --git a/linux/ecosystem/nginx/1.21/main/README.md b/linux/obsolete/nginx/1.21/main/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21/main/README.md rename to linux/obsolete/nginx/1.21/main/README.md diff --git a/linux/ecosystem/nginx/1.21/main/docker-compose.yml b/linux/obsolete/nginx/1.21/main/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21/main/docker-compose.yml rename to linux/obsolete/nginx/1.21/main/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21/main/pre/ip2location-description-pak b/linux/obsolete/nginx/1.21/main/pre/ip2location-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21/main/pre/ip2location-description-pak rename to linux/obsolete/nginx/1.21/main/pre/ip2location-description-pak diff --git a/linux/ecosystem/nginx/1.21/main/pre/luajit2-description-pak b/linux/obsolete/nginx/1.21/main/pre/luajit2-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21/main/pre/luajit2-description-pak rename to linux/obsolete/nginx/1.21/main/pre/luajit2-description-pak diff --git a/linux/ecosystem/nginx/1.21/main/pre/nginx-description-pak b/linux/obsolete/nginx/1.21/main/pre/nginx-description-pak similarity index 100% rename from linux/ecosystem/nginx/1.21/main/pre/nginx-description-pak rename to linux/obsolete/nginx/1.21/main/pre/nginx-description-pak diff --git a/linux/ecosystem/nginx/1.21/main/pre/ngninx.pre.tar.gz b/linux/obsolete/nginx/1.21/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/ecosystem/nginx/1.21/main/pre/ngninx.pre.tar.gz rename to linux/obsolete/nginx/1.21/main/pre/ngninx.pre.tar.gz diff --git a/linux/ecosystem/nginx/1.21/php/.env b/linux/obsolete/nginx/1.21/php/.env similarity index 100% rename from linux/ecosystem/nginx/1.21/php/.env rename to linux/obsolete/nginx/1.21/php/.env diff --git a/linux/ecosystem/nginx/1.21/php/Dockerfile b/linux/obsolete/nginx/1.21/php/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.21/php/Dockerfile rename to linux/obsolete/nginx/1.21/php/Dockerfile diff --git a/linux/ecosystem/nginx/1.21/php/Makefile b/linux/obsolete/nginx/1.21/php/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21/php/Makefile rename to linux/obsolete/nginx/1.21/php/Makefile diff --git a/linux/ecosystem/nginx/1.21/php/README.md b/linux/obsolete/nginx/1.21/php/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21/php/README.md rename to linux/obsolete/nginx/1.21/php/README.md diff --git a/linux/ecosystem/nginx/1.21/php/docker-compose.yml b/linux/obsolete/nginx/1.21/php/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21/php/docker-compose.yml rename to linux/obsolete/nginx/1.21/php/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/.env b/linux/obsolete/nginx/1.21/rtmp-hls/.env similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/.env rename to linux/obsolete/nginx/1.21/rtmp-hls/.env diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/Dockerfile b/linux/obsolete/nginx/1.21/rtmp-hls/Dockerfile similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/Dockerfile rename to linux/obsolete/nginx/1.21/rtmp-hls/Dockerfile diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/Makefile b/linux/obsolete/nginx/1.21/rtmp-hls/Makefile similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/Makefile rename to linux/obsolete/nginx/1.21/rtmp-hls/Makefile diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/README.md b/linux/obsolete/nginx/1.21/rtmp-hls/README.md similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/README.md rename to linux/obsolete/nginx/1.21/rtmp-hls/README.md diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx.conf b/linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx.conf rename to linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx.conf diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/docker-compose.yml b/linux/obsolete/nginx/1.21/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/docker-compose.yml rename to linux/obsolete/nginx/1.21/rtmp-hls/docker-compose.yml diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/players/dash.html b/linux/obsolete/nginx/1.21/rtmp-hls/players/dash.html similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/players/dash.html rename to linux/obsolete/nginx/1.21/rtmp-hls/players/dash.html diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/players/hls.html b/linux/obsolete/nginx/1.21/rtmp-hls/players/hls.html similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/players/hls.html rename to linux/obsolete/nginx/1.21/rtmp-hls/players/hls.html diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/players/hls_hlsjs.html b/linux/obsolete/nginx/1.21/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/players/hls_hlsjs.html rename to linux/obsolete/nginx/1.21/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp.html b/linux/obsolete/nginx/1.21/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp.html rename to linux/obsolete/nginx/1.21/rtmp-hls/players/rtmp.html diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp_hls.html b/linux/obsolete/nginx/1.21/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp_hls.html rename to linux/obsolete/nginx/1.21/rtmp-hls/players/rtmp_hls.html diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list b/linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list rename to linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list b/linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list rename to linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list b/linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list From f5f5f3893474b9efdabac9b36ae173cdfa0d0463 Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 29 Apr 2025 01:00:04 +0300 Subject: [PATCH 09/12] jira:7.0.9 --- .../common/files/versions/jira/7.jdk8p1.txt | 1 + linux/ecosystem/atlassian/jira/7/7.0.9/.env | 3 +- .../atlassian/jira/7/7.0.9/Dockerfile | 36 +++++++++++-------- .../atlassian/jira/7/7.0.9/docker-compose.yml | 9 ++--- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/bin/ansible/roles/common/files/versions/jira/7.jdk8p1.txt b/bin/ansible/roles/common/files/versions/jira/7.jdk8p1.txt index 3a2893b99..cb30cb235 100644 --- a/bin/ansible/roles/common/files/versions/jira/7.jdk8p1.txt +++ b/bin/ansible/roles/common/files/versions/jira/7.jdk8p1.txt @@ -2,6 +2,7 @@ 7.0.2 7.0.4 7.0.5 +7.0.9 7.0.10 7.1.0 7.1.1 diff --git a/linux/ecosystem/atlassian/jira/7/7.0.9/.env b/linux/ecosystem/atlassian/jira/7/7.0.9/.env index 5c9cf79f2..2d83f5f42 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.9/.env +++ b/linux/ecosystem/atlassian/jira/7/7.0.9/.env @@ -1,3 +1,2 @@ - RELEASE=7.0.9 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-core-7.0.9.tar.gz +DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz diff --git a/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile index 935f93e84..0320ea9b0 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile +++ b/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile @@ -1,13 +1,12 @@ -FROM quay.io/epicmorg/debian:bullseye-jdk8 +FROM quay.io/epicmorg/debian:bookworm-jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG RELEASE -ARG DOWNLOAD_URL - +ARG RELEASE=7.0.9 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz ################################################################## # Setup @@ -28,23 +27,30 @@ EXPOSE 8080 ################################################################## # Installing ################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ - update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ +ADD ${DOWNLOAD_URL} /tmp +RUN mkdir -p ${JIRA_INSTALL_DIR} && \ + tar -xzf /tmp/atlassian-jira-software-${RELEASE}-jira-${RELEASE}.tar.gz --strip-components=1 --directory "${JIRA_INSTALL_DIR}" && \ + chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ && \ + sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh && \ + sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml + +################################################################## +# cleanup +################################################################## +RUN echo "clean up" && \ apt-get clean -y && \ + apt-get autoremove -y && \ apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh CMD ["/entrypoint.sh", "-fg"] ENTRYPOINT ["/usr/bin/tini", "--"] + +RUN updatedb diff --git a/linux/ecosystem/atlassian/jira/7/7.0.9/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.0.9/docker-compose.yml index 2e0f226bd..ac7bd82b9 100644 --- a/linux/ecosystem/atlassian/jira/7/7.0.9/docker-compose.yml +++ b/linux/ecosystem/atlassian/jira/7/7.0.9/docker-compose.yml @@ -1,8 +1,9 @@ services: app: - image: "quay.io/epicmorg/jira:${RELEASE}" + image: "quay.io/epicmorg/jira:7.0.9" + build: + context: . + app-jdk8: + image: "quay.io/epicmorg/jira:7.0.9-jdk8" build: context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} From d68405b0888ae589a76edef05651460608cceae7 Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 29 Apr 2025 01:04:35 +0300 Subject: [PATCH 10/12] jira 7.1.0-m01 --- ...org.ecosystem.images.atlassian.jira.07.yml | 1 - .../ecosystem/atlassian/jira/7/7.1.0-m01/.env | 3 - .../atlassian/jira/7/7.1.0-m01/Dockerfile | 50 ----------- .../atlassian/jira/7/7.1.0-m01/Makefile | 44 --------- .../jira/7/7.1.0-m01/docker-compose.yml | 8 -- .../atlassian/jira/7/7.1.0-m01/entrypoint.sh | 89 ------------------- 6 files changed, 195 deletions(-) delete mode 100644 linux/ecosystem/atlassian/jira/7/7.1.0-m01/.env delete mode 100644 linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile delete mode 100644 linux/ecosystem/atlassian/jira/7/7.1.0-m01/Makefile delete mode 100644 linux/ecosystem/atlassian/jira/7/7.1.0-m01/docker-compose.yml delete mode 100755 linux/ecosystem/atlassian/jira/7/7.1.0-m01/entrypoint.sh diff --git a/.github/workflows/epicmorg.ecosystem.images.atlassian.jira.07.yml b/.github/workflows/epicmorg.ecosystem.images.atlassian.jira.07.yml index 93652718b..c6cd42c76 100644 --- a/.github/workflows/epicmorg.ecosystem.images.atlassian.jira.07.yml +++ b/.github/workflows/epicmorg.ecosystem.images.atlassian.jira.07.yml @@ -22,7 +22,6 @@ jobs: '7.10.0', '7.10.1', '7.10.2', - '7.1.0-m01', '7.1.1', '7.1.10', '7.11.0', diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/.env b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/.env deleted file mode 100644 index d550fd2c4..000000000 --- a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/.env +++ /dev/null @@ -1,3 +0,0 @@ - -RELEASE=7.1.0-m01 -DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-core-7.1.0-m01.tar.gz diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile deleted file mode 100644 index 935f93e84..000000000 --- a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM quay.io/epicmorg/debian:bullseye-jdk8 -LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ARG RELEASE -ARG DOWNLOAD_URL - - -################################################################## -# Setup -################################################################## -ENV RUN_USER daemon -ENV RUN_GROUP daemon - -# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files -ENV JIRA_HOME /var/atlassian/application-data/jira -ENV JIRA_INSTALL_DIR /opt/atlassian/jira - -VOLUME ["${JIRA_HOME}"] -WORKDIR $JIRA_HOME - -# Expose HTTP port -EXPOSE 8080 - -################################################################## -# Installing -################################################################## -RUN mkdir -p ${JIRA_INSTALL_DIR} \ - && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ - && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ - && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ - update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -RUN updatedb - -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Makefile b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Makefile deleted file mode 100644 index 1e4371492..000000000 --- a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: app - -app: - make pip - make build - make deploy - make clean - -build: - make build-buildah - -deploy: - make deploy-buildah - -build-buildah: - buildah-wrapper --build - -deploy-buildah: - buildah-wrapper --deploy - -build-kaniko: - kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run - -deploy-kaniko: - kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug - -build-compose: - docker-compose build --compress --parallel --progress plain - -deploy-compose: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af - buildah rm -a - buildah rmi -a - -pip: - pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper - pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper \ No newline at end of file diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/docker-compose.yml b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/docker-compose.yml deleted file mode 100644 index 2e0f226bd..000000000 --- a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -services: - app: - image: "quay.io/epicmorg/jira:${RELEASE}" - build: - context: . - args: - RELEASE: ${RELEASE} - DOWNLOAD_URL: ${DOWNLOAD_URL} diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/entrypoint.sh b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/entrypoint.sh deleted file mode 100755 index 50ee4ecd1..000000000 --- a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/entrypoint.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash -set -euo pipefail - -export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") -export JRE_HOME="$JAVA_HOME/jre" -export JAVA_BINARY="$JRE_HOME/bin/java" -export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') - -# Setup Catalina Opts -: ${CATALINA_CONNECTOR_PROXYNAME:=} -: ${CATALINA_CONNECTOR_PROXYPORT:=} -: ${CATALINA_CONNECTOR_SCHEME:=http} -: ${CATALINA_CONNECTOR_SECURE:=false} - -: ${CATALINA_OPTS:=} - -: ${JAVA_OPTS:=} - -CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" -CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" -CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" -CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" - -export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" - -# Setup Data Center configuration -if [ ! -f "/etc/container_id" ]; then - uuidgen > /etc/container_id -fi -CONTAINER_ID=$(cat /etc/container_id) -CONTAINER_SHORT_ID=${CONTAINER_ID::8} - -: ${CLUSTERED:=false} -: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} -: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} -: ${EHCACHE_PEER_DISCOVERY:=} -: ${EHCACHE_LISTENER_HOSTNAME:=} -: ${EHCACHE_LISTENER_PORT:=} -: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} -: ${EHCACHE_MULTICAST_ADDRESS:=} -: ${EHCACHE_MULTICAST_PORT:=} -: ${EHCACHE_MULTICAST_TIMETOLIVE:=} -: ${EHCACHE_MULTICAST_HOSTNAME:=} - -# Cleanly set/unset values in cluster.properties -function set_cluster_property { - if [ -z $2 ]; then - if [ -f "${JIRA_HOME}/cluster.properties" ]; then - sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" - fi - return - fi - if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then - echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" - elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then - sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" - else - echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" - fi -} - -if [ "${CLUSTERED}" == "true" ]; then - set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" - set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" - set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" - set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" - set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" - set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" - set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" - set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" - set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" - set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" -fi - - -# Start Jira as the correct user -if [ "${UID}" -eq 0 ]; then - echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" - PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") - EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 - if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then - chmod -R 700 "${JIRA_HOME}" && - chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" - fi - # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" -else - exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" -fi From d1955f9bbee827a81670e96f2cfc781a98b19fbc Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 29 Apr 2025 01:04:59 +0300 Subject: [PATCH 11/12] obsolete nginx versions --- linux/{obsolete => ecosystem}/nginx/1.14/main/.env | 0 .../nginx/1.14/main/Dockerfile | 0 .../nginx/1.14/main/Makefile | 0 .../nginx/1.14/main/README.md | 0 .../nginx/1.14/main/docker-compose.yml | 0 .../nginx/1.14/main/pre/ip2location-description-pak | 0 .../nginx/1.14/main/pre/luajit2-description-pak | 0 .../nginx/1.14/main/pre/nginx-description-pak | 0 .../nginx/1.14/main/pre/ngninx.pre.tar.gz | Bin linux/{obsolete => ecosystem}/nginx/1.14/php/.env | 0 .../nginx/1.14/php/Dockerfile | 0 .../{obsolete => ecosystem}/nginx/1.14/php/Makefile | 0 .../nginx/1.14/php/README.md | 0 .../nginx/1.14/php/docker-compose.yml | 0 .../nginx/1.14/rtmp-hls/.env | 0 .../nginx/1.14/rtmp-hls/Dockerfile | 0 .../nginx/1.14/rtmp-hls/Makefile | 0 .../nginx/1.14/rtmp-hls/README.md | 0 .../nginx/1.14/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.14/rtmp-hls/docker-compose.yml | 0 .../nginx/1.14/rtmp-hls/players/dash.html | 0 .../nginx/1.14/rtmp-hls/players/hls.html | 0 .../nginx/1.14/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.14/rtmp-hls/players/rtmp.html | 0 .../nginx/1.14/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.14/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{obsolete => ecosystem}/nginx/1.15/main/.env | 0 .../nginx/1.15/main/Dockerfile | 0 .../nginx/1.15/main/Makefile | 0 .../nginx/1.15/main/README.md | 0 .../nginx/1.15/main/docker-compose.yml | 0 .../nginx/1.15/main/pre/ip2location-description-pak | 0 .../nginx/1.15/main/pre/luajit2-description-pak | 0 .../nginx/1.15/main/pre/nginx-description-pak | 0 .../nginx/1.15/main/pre/ngninx.pre.tar.gz | Bin linux/{obsolete => ecosystem}/nginx/1.15/php/.env | 0 .../nginx/1.15/php/Dockerfile | 0 .../{obsolete => ecosystem}/nginx/1.15/php/Makefile | 0 .../nginx/1.15/php/README.md | 0 .../nginx/1.15/php/docker-compose.yml | 0 .../nginx/1.15/rtmp-hls/.env | 0 .../nginx/1.15/rtmp-hls/Dockerfile | 0 .../nginx/1.15/rtmp-hls/Makefile | 0 .../nginx/1.15/rtmp-hls/README.md | 0 .../nginx/1.15/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.15/rtmp-hls/docker-compose.yml | 0 .../nginx/1.15/rtmp-hls/players/dash.html | 0 .../nginx/1.15/rtmp-hls/players/hls.html | 0 .../nginx/1.15/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.15/rtmp-hls/players/rtmp.html | 0 .../nginx/1.15/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.15/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{obsolete => ecosystem}/nginx/1.16/main/.env | 0 .../nginx/1.16/main/Dockerfile | 0 .../nginx/1.16/main/Makefile | 0 .../nginx/1.16/main/README.md | 0 .../nginx/1.16/main/docker-compose.yml | 0 .../nginx/1.16/main/pre/ip2location-description-pak | 0 .../nginx/1.16/main/pre/luajit2-description-pak | 0 .../nginx/1.16/main/pre/nginx-description-pak | 0 .../nginx/1.16/main/pre/ngninx.pre.tar.gz | Bin linux/{obsolete => ecosystem}/nginx/1.16/php/.env | 0 .../nginx/1.16/php/Dockerfile | 0 .../{obsolete => ecosystem}/nginx/1.16/php/Makefile | 0 .../nginx/1.16/php/README.md | 0 .../nginx/1.16/php/docker-compose.yml | 0 .../nginx/1.16/rtmp-hls/.env | 0 .../nginx/1.16/rtmp-hls/Dockerfile | 0 .../nginx/1.16/rtmp-hls/Makefile | 0 .../nginx/1.16/rtmp-hls/README.md | 0 .../nginx/1.16/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.16/rtmp-hls/docker-compose.yml | 0 .../nginx/1.16/rtmp-hls/players/dash.html | 0 .../nginx/1.16/rtmp-hls/players/hls.html | 0 .../nginx/1.16/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.16/rtmp-hls/players/rtmp.html | 0 .../nginx/1.16/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.16/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{obsolete => ecosystem}/nginx/1.17/main/.env | 0 .../nginx/1.17/main/Dockerfile | 0 .../nginx/1.17/main/Makefile | 0 .../nginx/1.17/main/README.md | 0 .../nginx/1.17/main/docker-compose.yml | 0 .../nginx/1.17/main/pre/ip2location-description-pak | 0 .../nginx/1.17/main/pre/luajit2-description-pak | 0 .../nginx/1.17/main/pre/nginx-description-pak | 0 .../nginx/1.17/main/pre/ngninx.pre.tar.gz | Bin linux/{obsolete => ecosystem}/nginx/1.17/php/.env | 0 .../nginx/1.17/php/Dockerfile | 0 .../{obsolete => ecosystem}/nginx/1.17/php/Makefile | 0 .../nginx/1.17/php/README.md | 0 .../nginx/1.17/php/docker-compose.yml | 0 .../nginx/1.17/rtmp-hls/.env | 0 .../nginx/1.17/rtmp-hls/Dockerfile | 0 .../nginx/1.17/rtmp-hls/Makefile | 0 .../nginx/1.17/rtmp-hls/README.md | 0 .../nginx/1.17/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.17/rtmp-hls/docker-compose.yml | 0 .../nginx/1.17/rtmp-hls/players/dash.html | 0 .../nginx/1.17/rtmp-hls/players/hls.html | 0 .../nginx/1.17/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.17/rtmp-hls/players/rtmp.html | 0 .../nginx/1.17/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.17/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{obsolete => ecosystem}/nginx/1.18/main/.env | 0 .../nginx/1.18/main/Dockerfile | 0 .../nginx/1.18/main/Makefile | 0 .../nginx/1.18/main/README.md | 0 .../nginx/1.18/main/docker-compose.yml | 0 .../nginx/1.18/main/pre/ip2location-description-pak | 0 .../nginx/1.18/main/pre/luajit2-description-pak | 0 .../nginx/1.18/main/pre/nginx-description-pak | 0 .../nginx/1.18/main/pre/ngninx.pre.tar.gz | Bin linux/{obsolete => ecosystem}/nginx/1.18/php/.env | 0 .../nginx/1.18/php/Dockerfile | 0 .../{obsolete => ecosystem}/nginx/1.18/php/Makefile | 0 .../nginx/1.18/php/README.md | 0 .../nginx/1.18/php/docker-compose.yml | 0 .../nginx/1.18/rtmp-hls/.env | 0 .../nginx/1.18/rtmp-hls/Dockerfile | 0 .../nginx/1.18/rtmp-hls/Makefile | 0 .../nginx/1.18/rtmp-hls/README.md | 0 .../nginx/1.18/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.18/rtmp-hls/docker-compose.yml | 0 .../nginx/1.18/rtmp-hls/players/dash.html | 0 .../nginx/1.18/rtmp-hls/players/hls.html | 0 .../nginx/1.18/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.18/rtmp-hls/players/rtmp.html | 0 .../nginx/1.18/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.18/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{obsolete => ecosystem}/nginx/1.19/main/.env | 0 .../nginx/1.19/main/Dockerfile | 0 .../nginx/1.19/main/Makefile | 0 .../nginx/1.19/main/README.md | 0 .../nginx/1.19/main/docker-compose.yml | 0 .../nginx/1.19/main/pre/ip2location-description-pak | 0 .../nginx/1.19/main/pre/luajit2-description-pak | 0 .../nginx/1.19/main/pre/nginx-description-pak | 0 .../nginx/1.19/main/pre/ngninx.pre.tar.gz | Bin linux/{obsolete => ecosystem}/nginx/1.19/php/.env | 0 .../nginx/1.19/php/Dockerfile | 0 .../{obsolete => ecosystem}/nginx/1.19/php/Makefile | 0 .../nginx/1.19/php/README.md | 0 .../nginx/1.19/php/docker-compose.yml | 0 .../nginx/1.19/rtmp-hls/.env | 0 .../nginx/1.19/rtmp-hls/Dockerfile | 0 .../nginx/1.19/rtmp-hls/Makefile | 0 .../nginx/1.19/rtmp-hls/README.md | 0 .../nginx/1.19/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.19/rtmp-hls/docker-compose.yml | 0 .../nginx/1.19/rtmp-hls/players/dash.html | 0 .../nginx/1.19/rtmp-hls/players/hls.html | 0 .../nginx/1.19/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.19/rtmp-hls/players/rtmp.html | 0 .../nginx/1.19/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.19/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{obsolete => ecosystem}/nginx/1.20/main/.env | 0 .../nginx/1.20/main/Dockerfile | 0 .../nginx/1.20/main/Makefile | 0 .../nginx/1.20/main/README.md | 0 .../nginx/1.20/main/docker-compose.yml | 0 .../nginx/1.20/main/pre/ip2location-description-pak | 0 .../nginx/1.20/main/pre/luajit2-description-pak | 0 .../nginx/1.20/main/pre/nginx-description-pak | 0 .../nginx/1.20/main/pre/ngninx.pre.tar.gz | Bin linux/{obsolete => ecosystem}/nginx/1.20/php/.env | 0 .../nginx/1.20/php/Dockerfile | 0 .../{obsolete => ecosystem}/nginx/1.20/php/Makefile | 0 .../nginx/1.20/php/README.md | 0 .../nginx/1.20/php/docker-compose.yml | 0 .../nginx/1.20/rtmp-hls/.env | 0 .../nginx/1.20/rtmp-hls/Dockerfile | 0 .../nginx/1.20/rtmp-hls/Makefile | 0 .../nginx/1.20/rtmp-hls/README.md | 0 .../nginx/1.20/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.20/rtmp-hls/docker-compose.yml | 0 .../nginx/1.20/rtmp-hls/players/dash.html | 0 .../nginx/1.20/rtmp-hls/players/hls.html | 0 .../nginx/1.20/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.20/rtmp-hls/players/rtmp.html | 0 .../nginx/1.20/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.20/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 linux/{obsolete => ecosystem}/nginx/1.21/main/.env | 0 .../nginx/1.21/main/Dockerfile | 0 .../nginx/1.21/main/Makefile | 0 .../nginx/1.21/main/README.md | 0 .../nginx/1.21/main/docker-compose.yml | 0 .../nginx/1.21/main/pre/ip2location-description-pak | 0 .../nginx/1.21/main/pre/luajit2-description-pak | 0 .../nginx/1.21/main/pre/nginx-description-pak | 0 .../nginx/1.21/main/pre/ngninx.pre.tar.gz | Bin linux/{obsolete => ecosystem}/nginx/1.21/php/.env | 0 .../nginx/1.21/php/Dockerfile | 0 .../{obsolete => ecosystem}/nginx/1.21/php/Makefile | 0 .../nginx/1.21/php/README.md | 0 .../nginx/1.21/php/docker-compose.yml | 0 .../nginx/1.21/rtmp-hls/.env | 0 .../nginx/1.21/rtmp-hls/Dockerfile | 0 .../nginx/1.21/rtmp-hls/Makefile | 0 .../nginx/1.21/rtmp-hls/README.md | 0 .../nginx/1.21/rtmp-hls/conf/nginx.conf | 0 .../nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf | 0 .../rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf | 0 .../nginx/1.21/rtmp-hls/docker-compose.yml | 0 .../nginx/1.21/rtmp-hls/players/dash.html | 0 .../nginx/1.21/rtmp-hls/players/hls.html | 0 .../nginx/1.21/rtmp-hls/players/hls_hlsjs.html | 0 .../nginx/1.21/rtmp-hls/players/rtmp.html | 0 .../nginx/1.21/rtmp-hls/players/rtmp_hls.html | 0 .../rtmp-hls/sources.list.d/sources.buster.list | 0 .../1.21/rtmp-hls/sources.list.d/sources.sid.list | 0 .../rtmp-hls/sources.list.d/sources.stretch.list | 0 240 files changed, 0 insertions(+), 0 deletions(-) rename linux/{obsolete => ecosystem}/nginx/1.14/main/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/main/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/main/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/main/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/main/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/main/pre/ip2location-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/main/pre/luajit2-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/main/pre/nginx-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/main/pre/ngninx.pre.tar.gz (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/php/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/php/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/php/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/php/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/php/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/conf/nginx.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/players/dash.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/players/hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/players/rtmp.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/pre/ip2location-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/pre/luajit2-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/pre/nginx-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/main/pre/ngninx.pre.tar.gz (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/php/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/php/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/php/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/php/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/php/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/conf/nginx.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/players/dash.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/players/hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/players/rtmp.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/pre/ip2location-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/pre/luajit2-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/pre/nginx-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/main/pre/ngninx.pre.tar.gz (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/php/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/php/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/php/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/php/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/php/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/conf/nginx.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/players/dash.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/players/hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/players/rtmp.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/pre/ip2location-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/pre/luajit2-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/pre/nginx-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/main/pre/ngninx.pre.tar.gz (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/php/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/php/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/php/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/php/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/php/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/conf/nginx.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/players/dash.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/players/hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/players/rtmp.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/pre/ip2location-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/pre/luajit2-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/pre/nginx-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/main/pre/ngninx.pre.tar.gz (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/php/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/php/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/php/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/php/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/php/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/conf/nginx.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/players/dash.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/players/hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/players/rtmp.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/pre/ip2location-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/pre/luajit2-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/pre/nginx-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/main/pre/ngninx.pre.tar.gz (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/php/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/php/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/php/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/php/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/php/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/conf/nginx.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/players/dash.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/players/hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/players/rtmp.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/pre/ip2location-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/pre/luajit2-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/pre/nginx-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/main/pre/ngninx.pre.tar.gz (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/php/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/php/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/php/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/php/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/php/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/conf/nginx.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/players/dash.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/players/hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/players/rtmp.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/pre/ip2location-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/pre/luajit2-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/pre/nginx-description-pak (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/main/pre/ngninx.pre.tar.gz (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/php/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/php/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/php/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/php/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/php/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/.env (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/Dockerfile (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/Makefile (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/README.md (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/conf/nginx.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/docker-compose.yml (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/players/dash.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/players/hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/players/hls_hlsjs.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/players/rtmp.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/players/rtmp_hls.html (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list (100%) rename linux/{obsolete => ecosystem}/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list (100%) diff --git a/linux/obsolete/nginx/1.14/main/.env b/linux/ecosystem/nginx/1.14/main/.env similarity index 100% rename from linux/obsolete/nginx/1.14/main/.env rename to linux/ecosystem/nginx/1.14/main/.env diff --git a/linux/obsolete/nginx/1.14/main/Dockerfile b/linux/ecosystem/nginx/1.14/main/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.14/main/Dockerfile rename to linux/ecosystem/nginx/1.14/main/Dockerfile diff --git a/linux/obsolete/nginx/1.14/main/Makefile b/linux/ecosystem/nginx/1.14/main/Makefile similarity index 100% rename from linux/obsolete/nginx/1.14/main/Makefile rename to linux/ecosystem/nginx/1.14/main/Makefile diff --git a/linux/obsolete/nginx/1.14/main/README.md b/linux/ecosystem/nginx/1.14/main/README.md similarity index 100% rename from linux/obsolete/nginx/1.14/main/README.md rename to linux/ecosystem/nginx/1.14/main/README.md diff --git a/linux/obsolete/nginx/1.14/main/docker-compose.yml b/linux/ecosystem/nginx/1.14/main/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.14/main/docker-compose.yml rename to linux/ecosystem/nginx/1.14/main/docker-compose.yml diff --git a/linux/obsolete/nginx/1.14/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.14/main/pre/ip2location-description-pak similarity index 100% rename from linux/obsolete/nginx/1.14/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.14/main/pre/ip2location-description-pak diff --git a/linux/obsolete/nginx/1.14/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.14/main/pre/luajit2-description-pak similarity index 100% rename from linux/obsolete/nginx/1.14/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.14/main/pre/luajit2-description-pak diff --git a/linux/obsolete/nginx/1.14/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.14/main/pre/nginx-description-pak similarity index 100% rename from linux/obsolete/nginx/1.14/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.14/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/1.14/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.14/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/obsolete/nginx/1.14/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.14/main/pre/ngninx.pre.tar.gz diff --git a/linux/obsolete/nginx/1.14/php/.env b/linux/ecosystem/nginx/1.14/php/.env similarity index 100% rename from linux/obsolete/nginx/1.14/php/.env rename to linux/ecosystem/nginx/1.14/php/.env diff --git a/linux/obsolete/nginx/1.14/php/Dockerfile b/linux/ecosystem/nginx/1.14/php/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.14/php/Dockerfile rename to linux/ecosystem/nginx/1.14/php/Dockerfile diff --git a/linux/obsolete/nginx/1.14/php/Makefile b/linux/ecosystem/nginx/1.14/php/Makefile similarity index 100% rename from linux/obsolete/nginx/1.14/php/Makefile rename to linux/ecosystem/nginx/1.14/php/Makefile diff --git a/linux/obsolete/nginx/1.14/php/README.md b/linux/ecosystem/nginx/1.14/php/README.md similarity index 100% rename from linux/obsolete/nginx/1.14/php/README.md rename to linux/ecosystem/nginx/1.14/php/README.md diff --git a/linux/obsolete/nginx/1.14/php/docker-compose.yml b/linux/ecosystem/nginx/1.14/php/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.14/php/docker-compose.yml rename to linux/ecosystem/nginx/1.14/php/docker-compose.yml diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/.env b/linux/ecosystem/nginx/1.14/rtmp-hls/.env similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/.env rename to linux/ecosystem/nginx/1.14/rtmp-hls/.env diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.14/rtmp-hls/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.14/rtmp-hls/Dockerfile diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.14/rtmp-hls/Makefile similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.14/rtmp-hls/Makefile diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/README.md b/linux/ecosystem/nginx/1.14/rtmp-hls/README.md similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.14/rtmp-hls/README.md diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx.conf diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.14/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.14/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.14/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/dash.html similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/dash.html diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/hls.html similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/hls.html diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp.html diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.14/rtmp-hls/players/rtmp_hls.html diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/obsolete/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.14/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/obsolete/nginx/1.15/main/.env b/linux/ecosystem/nginx/1.15/main/.env similarity index 100% rename from linux/obsolete/nginx/1.15/main/.env rename to linux/ecosystem/nginx/1.15/main/.env diff --git a/linux/obsolete/nginx/1.15/main/Dockerfile b/linux/ecosystem/nginx/1.15/main/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.15/main/Dockerfile rename to linux/ecosystem/nginx/1.15/main/Dockerfile diff --git a/linux/obsolete/nginx/1.15/main/Makefile b/linux/ecosystem/nginx/1.15/main/Makefile similarity index 100% rename from linux/obsolete/nginx/1.15/main/Makefile rename to linux/ecosystem/nginx/1.15/main/Makefile diff --git a/linux/obsolete/nginx/1.15/main/README.md b/linux/ecosystem/nginx/1.15/main/README.md similarity index 100% rename from linux/obsolete/nginx/1.15/main/README.md rename to linux/ecosystem/nginx/1.15/main/README.md diff --git a/linux/obsolete/nginx/1.15/main/docker-compose.yml b/linux/ecosystem/nginx/1.15/main/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.15/main/docker-compose.yml rename to linux/ecosystem/nginx/1.15/main/docker-compose.yml diff --git a/linux/obsolete/nginx/1.15/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.15/main/pre/ip2location-description-pak similarity index 100% rename from linux/obsolete/nginx/1.15/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.15/main/pre/ip2location-description-pak diff --git a/linux/obsolete/nginx/1.15/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.15/main/pre/luajit2-description-pak similarity index 100% rename from linux/obsolete/nginx/1.15/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.15/main/pre/luajit2-description-pak diff --git a/linux/obsolete/nginx/1.15/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.15/main/pre/nginx-description-pak similarity index 100% rename from linux/obsolete/nginx/1.15/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.15/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/1.15/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.15/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/obsolete/nginx/1.15/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.15/main/pre/ngninx.pre.tar.gz diff --git a/linux/obsolete/nginx/1.15/php/.env b/linux/ecosystem/nginx/1.15/php/.env similarity index 100% rename from linux/obsolete/nginx/1.15/php/.env rename to linux/ecosystem/nginx/1.15/php/.env diff --git a/linux/obsolete/nginx/1.15/php/Dockerfile b/linux/ecosystem/nginx/1.15/php/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.15/php/Dockerfile rename to linux/ecosystem/nginx/1.15/php/Dockerfile diff --git a/linux/obsolete/nginx/1.15/php/Makefile b/linux/ecosystem/nginx/1.15/php/Makefile similarity index 100% rename from linux/obsolete/nginx/1.15/php/Makefile rename to linux/ecosystem/nginx/1.15/php/Makefile diff --git a/linux/obsolete/nginx/1.15/php/README.md b/linux/ecosystem/nginx/1.15/php/README.md similarity index 100% rename from linux/obsolete/nginx/1.15/php/README.md rename to linux/ecosystem/nginx/1.15/php/README.md diff --git a/linux/obsolete/nginx/1.15/php/docker-compose.yml b/linux/ecosystem/nginx/1.15/php/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.15/php/docker-compose.yml rename to linux/ecosystem/nginx/1.15/php/docker-compose.yml diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/.env b/linux/ecosystem/nginx/1.15/rtmp-hls/.env similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/.env rename to linux/ecosystem/nginx/1.15/rtmp-hls/.env diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.15/rtmp-hls/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.15/rtmp-hls/Dockerfile diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.15/rtmp-hls/Makefile similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.15/rtmp-hls/Makefile diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/README.md b/linux/ecosystem/nginx/1.15/rtmp-hls/README.md similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.15/rtmp-hls/README.md diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx.conf diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.15/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.15/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.15/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/dash.html similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/dash.html diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/hls.html similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/hls.html diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp.html diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.15/rtmp-hls/players/rtmp_hls.html diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/obsolete/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.15/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/obsolete/nginx/1.16/main/.env b/linux/ecosystem/nginx/1.16/main/.env similarity index 100% rename from linux/obsolete/nginx/1.16/main/.env rename to linux/ecosystem/nginx/1.16/main/.env diff --git a/linux/obsolete/nginx/1.16/main/Dockerfile b/linux/ecosystem/nginx/1.16/main/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.16/main/Dockerfile rename to linux/ecosystem/nginx/1.16/main/Dockerfile diff --git a/linux/obsolete/nginx/1.16/main/Makefile b/linux/ecosystem/nginx/1.16/main/Makefile similarity index 100% rename from linux/obsolete/nginx/1.16/main/Makefile rename to linux/ecosystem/nginx/1.16/main/Makefile diff --git a/linux/obsolete/nginx/1.16/main/README.md b/linux/ecosystem/nginx/1.16/main/README.md similarity index 100% rename from linux/obsolete/nginx/1.16/main/README.md rename to linux/ecosystem/nginx/1.16/main/README.md diff --git a/linux/obsolete/nginx/1.16/main/docker-compose.yml b/linux/ecosystem/nginx/1.16/main/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.16/main/docker-compose.yml rename to linux/ecosystem/nginx/1.16/main/docker-compose.yml diff --git a/linux/obsolete/nginx/1.16/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.16/main/pre/ip2location-description-pak similarity index 100% rename from linux/obsolete/nginx/1.16/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.16/main/pre/ip2location-description-pak diff --git a/linux/obsolete/nginx/1.16/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.16/main/pre/luajit2-description-pak similarity index 100% rename from linux/obsolete/nginx/1.16/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.16/main/pre/luajit2-description-pak diff --git a/linux/obsolete/nginx/1.16/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.16/main/pre/nginx-description-pak similarity index 100% rename from linux/obsolete/nginx/1.16/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.16/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/1.16/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.16/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/obsolete/nginx/1.16/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.16/main/pre/ngninx.pre.tar.gz diff --git a/linux/obsolete/nginx/1.16/php/.env b/linux/ecosystem/nginx/1.16/php/.env similarity index 100% rename from linux/obsolete/nginx/1.16/php/.env rename to linux/ecosystem/nginx/1.16/php/.env diff --git a/linux/obsolete/nginx/1.16/php/Dockerfile b/linux/ecosystem/nginx/1.16/php/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.16/php/Dockerfile rename to linux/ecosystem/nginx/1.16/php/Dockerfile diff --git a/linux/obsolete/nginx/1.16/php/Makefile b/linux/ecosystem/nginx/1.16/php/Makefile similarity index 100% rename from linux/obsolete/nginx/1.16/php/Makefile rename to linux/ecosystem/nginx/1.16/php/Makefile diff --git a/linux/obsolete/nginx/1.16/php/README.md b/linux/ecosystem/nginx/1.16/php/README.md similarity index 100% rename from linux/obsolete/nginx/1.16/php/README.md rename to linux/ecosystem/nginx/1.16/php/README.md diff --git a/linux/obsolete/nginx/1.16/php/docker-compose.yml b/linux/ecosystem/nginx/1.16/php/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.16/php/docker-compose.yml rename to linux/ecosystem/nginx/1.16/php/docker-compose.yml diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/.env b/linux/ecosystem/nginx/1.16/rtmp-hls/.env similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/.env rename to linux/ecosystem/nginx/1.16/rtmp-hls/.env diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.16/rtmp-hls/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.16/rtmp-hls/Dockerfile diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.16/rtmp-hls/Makefile similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.16/rtmp-hls/Makefile diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/README.md b/linux/ecosystem/nginx/1.16/rtmp-hls/README.md similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.16/rtmp-hls/README.md diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx.conf diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.16/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.16/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.16/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/dash.html similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/dash.html diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/hls.html similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/hls.html diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp.html diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.16/rtmp-hls/players/rtmp_hls.html diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/obsolete/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.16/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/obsolete/nginx/1.17/main/.env b/linux/ecosystem/nginx/1.17/main/.env similarity index 100% rename from linux/obsolete/nginx/1.17/main/.env rename to linux/ecosystem/nginx/1.17/main/.env diff --git a/linux/obsolete/nginx/1.17/main/Dockerfile b/linux/ecosystem/nginx/1.17/main/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.17/main/Dockerfile rename to linux/ecosystem/nginx/1.17/main/Dockerfile diff --git a/linux/obsolete/nginx/1.17/main/Makefile b/linux/ecosystem/nginx/1.17/main/Makefile similarity index 100% rename from linux/obsolete/nginx/1.17/main/Makefile rename to linux/ecosystem/nginx/1.17/main/Makefile diff --git a/linux/obsolete/nginx/1.17/main/README.md b/linux/ecosystem/nginx/1.17/main/README.md similarity index 100% rename from linux/obsolete/nginx/1.17/main/README.md rename to linux/ecosystem/nginx/1.17/main/README.md diff --git a/linux/obsolete/nginx/1.17/main/docker-compose.yml b/linux/ecosystem/nginx/1.17/main/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.17/main/docker-compose.yml rename to linux/ecosystem/nginx/1.17/main/docker-compose.yml diff --git a/linux/obsolete/nginx/1.17/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.17/main/pre/ip2location-description-pak similarity index 100% rename from linux/obsolete/nginx/1.17/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.17/main/pre/ip2location-description-pak diff --git a/linux/obsolete/nginx/1.17/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.17/main/pre/luajit2-description-pak similarity index 100% rename from linux/obsolete/nginx/1.17/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.17/main/pre/luajit2-description-pak diff --git a/linux/obsolete/nginx/1.17/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.17/main/pre/nginx-description-pak similarity index 100% rename from linux/obsolete/nginx/1.17/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.17/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/1.17/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.17/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/obsolete/nginx/1.17/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.17/main/pre/ngninx.pre.tar.gz diff --git a/linux/obsolete/nginx/1.17/php/.env b/linux/ecosystem/nginx/1.17/php/.env similarity index 100% rename from linux/obsolete/nginx/1.17/php/.env rename to linux/ecosystem/nginx/1.17/php/.env diff --git a/linux/obsolete/nginx/1.17/php/Dockerfile b/linux/ecosystem/nginx/1.17/php/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.17/php/Dockerfile rename to linux/ecosystem/nginx/1.17/php/Dockerfile diff --git a/linux/obsolete/nginx/1.17/php/Makefile b/linux/ecosystem/nginx/1.17/php/Makefile similarity index 100% rename from linux/obsolete/nginx/1.17/php/Makefile rename to linux/ecosystem/nginx/1.17/php/Makefile diff --git a/linux/obsolete/nginx/1.17/php/README.md b/linux/ecosystem/nginx/1.17/php/README.md similarity index 100% rename from linux/obsolete/nginx/1.17/php/README.md rename to linux/ecosystem/nginx/1.17/php/README.md diff --git a/linux/obsolete/nginx/1.17/php/docker-compose.yml b/linux/ecosystem/nginx/1.17/php/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.17/php/docker-compose.yml rename to linux/ecosystem/nginx/1.17/php/docker-compose.yml diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/.env b/linux/ecosystem/nginx/1.17/rtmp-hls/.env similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/.env rename to linux/ecosystem/nginx/1.17/rtmp-hls/.env diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.17/rtmp-hls/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.17/rtmp-hls/Dockerfile diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.17/rtmp-hls/Makefile similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.17/rtmp-hls/Makefile diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/README.md b/linux/ecosystem/nginx/1.17/rtmp-hls/README.md similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.17/rtmp-hls/README.md diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx.conf diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.17/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.17/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.17/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/dash.html similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/dash.html diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/hls.html similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/hls.html diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp.html diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.17/rtmp-hls/players/rtmp_hls.html diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/obsolete/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.17/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/obsolete/nginx/1.18/main/.env b/linux/ecosystem/nginx/1.18/main/.env similarity index 100% rename from linux/obsolete/nginx/1.18/main/.env rename to linux/ecosystem/nginx/1.18/main/.env diff --git a/linux/obsolete/nginx/1.18/main/Dockerfile b/linux/ecosystem/nginx/1.18/main/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.18/main/Dockerfile rename to linux/ecosystem/nginx/1.18/main/Dockerfile diff --git a/linux/obsolete/nginx/1.18/main/Makefile b/linux/ecosystem/nginx/1.18/main/Makefile similarity index 100% rename from linux/obsolete/nginx/1.18/main/Makefile rename to linux/ecosystem/nginx/1.18/main/Makefile diff --git a/linux/obsolete/nginx/1.18/main/README.md b/linux/ecosystem/nginx/1.18/main/README.md similarity index 100% rename from linux/obsolete/nginx/1.18/main/README.md rename to linux/ecosystem/nginx/1.18/main/README.md diff --git a/linux/obsolete/nginx/1.18/main/docker-compose.yml b/linux/ecosystem/nginx/1.18/main/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.18/main/docker-compose.yml rename to linux/ecosystem/nginx/1.18/main/docker-compose.yml diff --git a/linux/obsolete/nginx/1.18/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.18/main/pre/ip2location-description-pak similarity index 100% rename from linux/obsolete/nginx/1.18/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.18/main/pre/ip2location-description-pak diff --git a/linux/obsolete/nginx/1.18/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.18/main/pre/luajit2-description-pak similarity index 100% rename from linux/obsolete/nginx/1.18/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.18/main/pre/luajit2-description-pak diff --git a/linux/obsolete/nginx/1.18/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.18/main/pre/nginx-description-pak similarity index 100% rename from linux/obsolete/nginx/1.18/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.18/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/1.18/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.18/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/obsolete/nginx/1.18/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.18/main/pre/ngninx.pre.tar.gz diff --git a/linux/obsolete/nginx/1.18/php/.env b/linux/ecosystem/nginx/1.18/php/.env similarity index 100% rename from linux/obsolete/nginx/1.18/php/.env rename to linux/ecosystem/nginx/1.18/php/.env diff --git a/linux/obsolete/nginx/1.18/php/Dockerfile b/linux/ecosystem/nginx/1.18/php/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.18/php/Dockerfile rename to linux/ecosystem/nginx/1.18/php/Dockerfile diff --git a/linux/obsolete/nginx/1.18/php/Makefile b/linux/ecosystem/nginx/1.18/php/Makefile similarity index 100% rename from linux/obsolete/nginx/1.18/php/Makefile rename to linux/ecosystem/nginx/1.18/php/Makefile diff --git a/linux/obsolete/nginx/1.18/php/README.md b/linux/ecosystem/nginx/1.18/php/README.md similarity index 100% rename from linux/obsolete/nginx/1.18/php/README.md rename to linux/ecosystem/nginx/1.18/php/README.md diff --git a/linux/obsolete/nginx/1.18/php/docker-compose.yml b/linux/ecosystem/nginx/1.18/php/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.18/php/docker-compose.yml rename to linux/ecosystem/nginx/1.18/php/docker-compose.yml diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/.env b/linux/ecosystem/nginx/1.18/rtmp-hls/.env similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/.env rename to linux/ecosystem/nginx/1.18/rtmp-hls/.env diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.18/rtmp-hls/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.18/rtmp-hls/Dockerfile diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.18/rtmp-hls/Makefile similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.18/rtmp-hls/Makefile diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/README.md b/linux/ecosystem/nginx/1.18/rtmp-hls/README.md similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.18/rtmp-hls/README.md diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx.conf diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.18/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.18/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.18/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/dash.html similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/dash.html diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/hls.html similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/hls.html diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp.html diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.18/rtmp-hls/players/rtmp_hls.html diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/obsolete/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.18/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/obsolete/nginx/1.19/main/.env b/linux/ecosystem/nginx/1.19/main/.env similarity index 100% rename from linux/obsolete/nginx/1.19/main/.env rename to linux/ecosystem/nginx/1.19/main/.env diff --git a/linux/obsolete/nginx/1.19/main/Dockerfile b/linux/ecosystem/nginx/1.19/main/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.19/main/Dockerfile rename to linux/ecosystem/nginx/1.19/main/Dockerfile diff --git a/linux/obsolete/nginx/1.19/main/Makefile b/linux/ecosystem/nginx/1.19/main/Makefile similarity index 100% rename from linux/obsolete/nginx/1.19/main/Makefile rename to linux/ecosystem/nginx/1.19/main/Makefile diff --git a/linux/obsolete/nginx/1.19/main/README.md b/linux/ecosystem/nginx/1.19/main/README.md similarity index 100% rename from linux/obsolete/nginx/1.19/main/README.md rename to linux/ecosystem/nginx/1.19/main/README.md diff --git a/linux/obsolete/nginx/1.19/main/docker-compose.yml b/linux/ecosystem/nginx/1.19/main/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.19/main/docker-compose.yml rename to linux/ecosystem/nginx/1.19/main/docker-compose.yml diff --git a/linux/obsolete/nginx/1.19/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.19/main/pre/ip2location-description-pak similarity index 100% rename from linux/obsolete/nginx/1.19/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.19/main/pre/ip2location-description-pak diff --git a/linux/obsolete/nginx/1.19/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.19/main/pre/luajit2-description-pak similarity index 100% rename from linux/obsolete/nginx/1.19/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.19/main/pre/luajit2-description-pak diff --git a/linux/obsolete/nginx/1.19/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.19/main/pre/nginx-description-pak similarity index 100% rename from linux/obsolete/nginx/1.19/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.19/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/1.19/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.19/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/obsolete/nginx/1.19/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.19/main/pre/ngninx.pre.tar.gz diff --git a/linux/obsolete/nginx/1.19/php/.env b/linux/ecosystem/nginx/1.19/php/.env similarity index 100% rename from linux/obsolete/nginx/1.19/php/.env rename to linux/ecosystem/nginx/1.19/php/.env diff --git a/linux/obsolete/nginx/1.19/php/Dockerfile b/linux/ecosystem/nginx/1.19/php/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.19/php/Dockerfile rename to linux/ecosystem/nginx/1.19/php/Dockerfile diff --git a/linux/obsolete/nginx/1.19/php/Makefile b/linux/ecosystem/nginx/1.19/php/Makefile similarity index 100% rename from linux/obsolete/nginx/1.19/php/Makefile rename to linux/ecosystem/nginx/1.19/php/Makefile diff --git a/linux/obsolete/nginx/1.19/php/README.md b/linux/ecosystem/nginx/1.19/php/README.md similarity index 100% rename from linux/obsolete/nginx/1.19/php/README.md rename to linux/ecosystem/nginx/1.19/php/README.md diff --git a/linux/obsolete/nginx/1.19/php/docker-compose.yml b/linux/ecosystem/nginx/1.19/php/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.19/php/docker-compose.yml rename to linux/ecosystem/nginx/1.19/php/docker-compose.yml diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/.env b/linux/ecosystem/nginx/1.19/rtmp-hls/.env similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/.env rename to linux/ecosystem/nginx/1.19/rtmp-hls/.env diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.19/rtmp-hls/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.19/rtmp-hls/Dockerfile diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.19/rtmp-hls/Makefile similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.19/rtmp-hls/Makefile diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/README.md b/linux/ecosystem/nginx/1.19/rtmp-hls/README.md similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.19/rtmp-hls/README.md diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx.conf diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.19/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.19/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.19/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/dash.html similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/dash.html diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/hls.html similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/hls.html diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp.html diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.19/rtmp-hls/players/rtmp_hls.html diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/obsolete/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.19/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/obsolete/nginx/1.20/main/.env b/linux/ecosystem/nginx/1.20/main/.env similarity index 100% rename from linux/obsolete/nginx/1.20/main/.env rename to linux/ecosystem/nginx/1.20/main/.env diff --git a/linux/obsolete/nginx/1.20/main/Dockerfile b/linux/ecosystem/nginx/1.20/main/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.20/main/Dockerfile rename to linux/ecosystem/nginx/1.20/main/Dockerfile diff --git a/linux/obsolete/nginx/1.20/main/Makefile b/linux/ecosystem/nginx/1.20/main/Makefile similarity index 100% rename from linux/obsolete/nginx/1.20/main/Makefile rename to linux/ecosystem/nginx/1.20/main/Makefile diff --git a/linux/obsolete/nginx/1.20/main/README.md b/linux/ecosystem/nginx/1.20/main/README.md similarity index 100% rename from linux/obsolete/nginx/1.20/main/README.md rename to linux/ecosystem/nginx/1.20/main/README.md diff --git a/linux/obsolete/nginx/1.20/main/docker-compose.yml b/linux/ecosystem/nginx/1.20/main/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.20/main/docker-compose.yml rename to linux/ecosystem/nginx/1.20/main/docker-compose.yml diff --git a/linux/obsolete/nginx/1.20/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.20/main/pre/ip2location-description-pak similarity index 100% rename from linux/obsolete/nginx/1.20/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.20/main/pre/ip2location-description-pak diff --git a/linux/obsolete/nginx/1.20/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.20/main/pre/luajit2-description-pak similarity index 100% rename from linux/obsolete/nginx/1.20/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.20/main/pre/luajit2-description-pak diff --git a/linux/obsolete/nginx/1.20/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.20/main/pre/nginx-description-pak similarity index 100% rename from linux/obsolete/nginx/1.20/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.20/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/1.20/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.20/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/obsolete/nginx/1.20/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.20/main/pre/ngninx.pre.tar.gz diff --git a/linux/obsolete/nginx/1.20/php/.env b/linux/ecosystem/nginx/1.20/php/.env similarity index 100% rename from linux/obsolete/nginx/1.20/php/.env rename to linux/ecosystem/nginx/1.20/php/.env diff --git a/linux/obsolete/nginx/1.20/php/Dockerfile b/linux/ecosystem/nginx/1.20/php/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.20/php/Dockerfile rename to linux/ecosystem/nginx/1.20/php/Dockerfile diff --git a/linux/obsolete/nginx/1.20/php/Makefile b/linux/ecosystem/nginx/1.20/php/Makefile similarity index 100% rename from linux/obsolete/nginx/1.20/php/Makefile rename to linux/ecosystem/nginx/1.20/php/Makefile diff --git a/linux/obsolete/nginx/1.20/php/README.md b/linux/ecosystem/nginx/1.20/php/README.md similarity index 100% rename from linux/obsolete/nginx/1.20/php/README.md rename to linux/ecosystem/nginx/1.20/php/README.md diff --git a/linux/obsolete/nginx/1.20/php/docker-compose.yml b/linux/ecosystem/nginx/1.20/php/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.20/php/docker-compose.yml rename to linux/ecosystem/nginx/1.20/php/docker-compose.yml diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/.env b/linux/ecosystem/nginx/1.20/rtmp-hls/.env similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/.env rename to linux/ecosystem/nginx/1.20/rtmp-hls/.env diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.20/rtmp-hls/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.20/rtmp-hls/Dockerfile diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.20/rtmp-hls/Makefile similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.20/rtmp-hls/Makefile diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/README.md b/linux/ecosystem/nginx/1.20/rtmp-hls/README.md similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.20/rtmp-hls/README.md diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx.conf diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.20/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.20/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.20/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/dash.html similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/dash.html diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/hls.html similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/hls.html diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp.html diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.20/rtmp-hls/players/rtmp_hls.html diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/obsolete/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.20/rtmp-hls/sources.list.d/sources.stretch.list diff --git a/linux/obsolete/nginx/1.21/main/.env b/linux/ecosystem/nginx/1.21/main/.env similarity index 100% rename from linux/obsolete/nginx/1.21/main/.env rename to linux/ecosystem/nginx/1.21/main/.env diff --git a/linux/obsolete/nginx/1.21/main/Dockerfile b/linux/ecosystem/nginx/1.21/main/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.21/main/Dockerfile rename to linux/ecosystem/nginx/1.21/main/Dockerfile diff --git a/linux/obsolete/nginx/1.21/main/Makefile b/linux/ecosystem/nginx/1.21/main/Makefile similarity index 100% rename from linux/obsolete/nginx/1.21/main/Makefile rename to linux/ecosystem/nginx/1.21/main/Makefile diff --git a/linux/obsolete/nginx/1.21/main/README.md b/linux/ecosystem/nginx/1.21/main/README.md similarity index 100% rename from linux/obsolete/nginx/1.21/main/README.md rename to linux/ecosystem/nginx/1.21/main/README.md diff --git a/linux/obsolete/nginx/1.21/main/docker-compose.yml b/linux/ecosystem/nginx/1.21/main/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.21/main/docker-compose.yml rename to linux/ecosystem/nginx/1.21/main/docker-compose.yml diff --git a/linux/obsolete/nginx/1.21/main/pre/ip2location-description-pak b/linux/ecosystem/nginx/1.21/main/pre/ip2location-description-pak similarity index 100% rename from linux/obsolete/nginx/1.21/main/pre/ip2location-description-pak rename to linux/ecosystem/nginx/1.21/main/pre/ip2location-description-pak diff --git a/linux/obsolete/nginx/1.21/main/pre/luajit2-description-pak b/linux/ecosystem/nginx/1.21/main/pre/luajit2-description-pak similarity index 100% rename from linux/obsolete/nginx/1.21/main/pre/luajit2-description-pak rename to linux/ecosystem/nginx/1.21/main/pre/luajit2-description-pak diff --git a/linux/obsolete/nginx/1.21/main/pre/nginx-description-pak b/linux/ecosystem/nginx/1.21/main/pre/nginx-description-pak similarity index 100% rename from linux/obsolete/nginx/1.21/main/pre/nginx-description-pak rename to linux/ecosystem/nginx/1.21/main/pre/nginx-description-pak diff --git a/linux/obsolete/nginx/1.21/main/pre/ngninx.pre.tar.gz b/linux/ecosystem/nginx/1.21/main/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/obsolete/nginx/1.21/main/pre/ngninx.pre.tar.gz rename to linux/ecosystem/nginx/1.21/main/pre/ngninx.pre.tar.gz diff --git a/linux/obsolete/nginx/1.21/php/.env b/linux/ecosystem/nginx/1.21/php/.env similarity index 100% rename from linux/obsolete/nginx/1.21/php/.env rename to linux/ecosystem/nginx/1.21/php/.env diff --git a/linux/obsolete/nginx/1.21/php/Dockerfile b/linux/ecosystem/nginx/1.21/php/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.21/php/Dockerfile rename to linux/ecosystem/nginx/1.21/php/Dockerfile diff --git a/linux/obsolete/nginx/1.21/php/Makefile b/linux/ecosystem/nginx/1.21/php/Makefile similarity index 100% rename from linux/obsolete/nginx/1.21/php/Makefile rename to linux/ecosystem/nginx/1.21/php/Makefile diff --git a/linux/obsolete/nginx/1.21/php/README.md b/linux/ecosystem/nginx/1.21/php/README.md similarity index 100% rename from linux/obsolete/nginx/1.21/php/README.md rename to linux/ecosystem/nginx/1.21/php/README.md diff --git a/linux/obsolete/nginx/1.21/php/docker-compose.yml b/linux/ecosystem/nginx/1.21/php/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.21/php/docker-compose.yml rename to linux/ecosystem/nginx/1.21/php/docker-compose.yml diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/.env b/linux/ecosystem/nginx/1.21/rtmp-hls/.env similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/.env rename to linux/ecosystem/nginx/1.21/rtmp-hls/.env diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/Dockerfile b/linux/ecosystem/nginx/1.21/rtmp-hls/Dockerfile similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/Dockerfile rename to linux/ecosystem/nginx/1.21/rtmp-hls/Dockerfile diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/Makefile b/linux/ecosystem/nginx/1.21/rtmp-hls/Makefile similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/Makefile rename to linux/ecosystem/nginx/1.21/rtmp-hls/Makefile diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/README.md b/linux/ecosystem/nginx/1.21/rtmp-hls/README.md similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/README.md rename to linux/ecosystem/nginx/1.21/rtmp-hls/README.md diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx.conf b/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx.conf rename to linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx.conf diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/ecosystem/nginx/1.21/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/docker-compose.yml b/linux/ecosystem/nginx/1.21/rtmp-hls/docker-compose.yml similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/docker-compose.yml rename to linux/ecosystem/nginx/1.21/rtmp-hls/docker-compose.yml diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/players/dash.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/dash.html similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/players/dash.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/dash.html diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/players/hls.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/hls.html similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/players/hls.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/hls.html diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/players/hls_hlsjs.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/players/hls_hlsjs.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/players/rtmp.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/players/rtmp.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp.html diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/players/rtmp_hls.html b/linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/players/rtmp_hls.html rename to linux/ecosystem/nginx/1.21/rtmp-hls/players/rtmp_hls.html diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list b/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list rename to linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list b/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list rename to linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list b/linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/obsolete/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/ecosystem/nginx/1.21/rtmp-hls/sources.list.d/sources.stretch.list From 9231bc8755c42e7261967cf6ef795c583174a39b Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 29 Apr 2025 01:09:39 +0300 Subject: [PATCH 12/12] atlassian jira 4 fix --- linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile | 2 +- linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile | 2 +- linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile | 2 +- linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile index ed256625c..5541d46a3 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## ARG RELEASE=4.2.1 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b588-standalone.tar.gz -ARG TEMP_ARCHIVE=/tmp/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz +ARG TEMP_ARCHIVE=/tmp/atlassian-jira-enterprise-${RELEASE}-b588-standalone.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile index ceb9ef6d3..8cbc1c0c2 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## ARG RELEASE=4.2.2 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b589-standalone.tar.gz -ARG TEMP_ARCHIVE=/tmp/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz +ARG TEMP_ARCHIVE=/tmp/atlassian-jira-enterprise-${RELEASE}-b589-standalone.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile index 58a6103fa..7e21da196 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## ARG RELEASE=4.2.3 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b590-standalone.tar.gz -ARG TEMP_ARCHIVE=/tmp/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz +ARG TEMP_ARCHIVE=/tmp/atlassian-jira-enterprise-${RELEASE}-b590-standalone.tar.gz ################################################################## # Setup diff --git a/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile index 1e6713a78..d4c7ad48a 100644 --- a/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile +++ b/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## ARG RELEASE=4.2.4 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-${RELEASE}-b591-standalone.tar.gz -ARG TEMP_ARCHIVE=/tmp/atlassian-jira-enterprise-${RELEASE}-standalone.tar.gz +ARG TEMP_ARCHIVE=/tmp/atlassian-jira-enterprise-${RELEASE}-b591-standalone.tar.gz ################################################################## # Setup