From 26a731eec1c96adee8ccae1eb62848dc4cc41fd5 Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 10 Dec 2024 15:55:53 +0300 Subject: [PATCH] apache2 fixes, php fixes, epicmorg/php dropped --- .../teamcity/server/2022.04.7/Dockerfile | 2 +- .../teamcity/server/2022.10.6/Dockerfile | 2 +- .../teamcity/server/2023.05.6/Dockerfile | 2 +- .../teamcity/server/2024.03.3/Dockerfile | 2 +- .../teamcity/server/2024.07.3/Dockerfile | 2 +- .../teamcity/server/2024.12/Dockerfile | 2 +- .../teamcity/server/latest/Dockerfile | 2 +- .../advanced/vscode-server/latest/Dockerfile | 2 +- linux/discontinued/python/main/2.7/Dockerfile | 2 +- .../discontinued/python/main/3.10/Dockerfile | 2 +- .../discontinued/python/main/3.11/Dockerfile | 2 +- .../discontinued/python/main/3.12/Dockerfile | 2 +- .../discontinued/python/main/3.13/Dockerfile | 2 +- linux/discontinued/python/main/3.6/Dockerfile | 2 +- linux/discontinued/python/main/3.7/Dockerfile | 2 +- linux/discontinued/python/main/3.8/Dockerfile | 2 +- linux/discontinued/python/main/3.9/Dockerfile | 2 +- linux/ecosystem/apache2/php5.5/Dockerfile | 2 +- linux/ecosystem/apache2/php5.6/Dockerfile | 99 ++++++++ linux/ecosystem/apache2/php5.6/Makefile | 36 +++ linux/ecosystem/apache2/php5.6/README.md | 32 +++ .../apache2/php5.6/docker-compose.yml | 6 + .../apache2/php5.6/docker-entrypoint.sh | 18 ++ .../apache2/php5.6/etc/apache2/apache2.conf | 231 ++++++++++++++++++ .../etc/apache2/sites-enabled/localhost.conf | 8 + linux/ecosystem/apache2/php7.0/Dockerfile | 16 +- linux/ecosystem/apache2/php7.1/Dockerfile | 17 +- linux/ecosystem/apache2/php7.2/Dockerfile | 17 +- linux/ecosystem/apache2/php7.3/Dockerfile | 17 +- linux/ecosystem/apache2/php7.4/Dockerfile | 17 +- linux/ecosystem/apache2/php8.0/Dockerfile | 17 +- linux/ecosystem/apache2/php8.1/Dockerfile | 17 +- linux/ecosystem/apache2/php8.2/Dockerfile | 17 +- linux/ecosystem/apache2/php8.3/Dockerfile | 17 +- linux/ecosystem/apache2/php8.4/Dockerfile | 133 ++++++++++ linux/ecosystem/apache2/php8.4/Makefile | 36 +++ linux/ecosystem/apache2/php8.4/README.md | 32 +++ .../apache2/php8.4/docker-compose.yml | 6 + .../apache2/php8.4/docker-entrypoint.sh | 18 ++ .../apache2/php8.4/etc/apache2/apache2.conf | 231 ++++++++++++++++++ .../etc/apache2/sites-enabled/localhost.conf | 8 + .../epicmorg/debian/10-buster/main/Dockerfile | 2 +- .../debian/11-bullseye/main/Dockerfile | 2 +- .../debian/12-bookworm/main/Dockerfile | 2 +- .../12-bookworm/php/php5.5/docker-compose.yml | 2 +- .../12-bookworm/php/php5.6/docker-compose.yml | 2 +- .../12-bookworm/php/php7.0/docker-compose.yml | 2 +- .../12-bookworm/php/php7.1/docker-compose.yml | 2 +- .../12-bookworm/php/php7.2/docker-compose.yml | 2 +- .../12-bookworm/php/php7.3/docker-compose.yml | 2 +- .../12-bookworm/php/php7.4/docker-compose.yml | 2 +- .../12-bookworm/php/php8.0/docker-compose.yml | 2 +- .../12-bookworm/php/php8.1/docker-compose.yml | 2 +- .../12-bookworm/php/php8.2/docker-compose.yml | 2 +- .../12-bookworm/php/php8.3/docker-compose.yml | 2 +- .../12-bookworm/php/php8.4/docker-compose.yml | 2 +- .../epicmorg/debian/13-trixie/main/Dockerfile | 2 +- .../epicmorg/debian/sid/main/Dockerfile | 2 +- 58 files changed, 938 insertions(+), 178 deletions(-) create mode 100644 linux/ecosystem/apache2/php5.6/Dockerfile create mode 100644 linux/ecosystem/apache2/php5.6/Makefile create mode 100644 linux/ecosystem/apache2/php5.6/README.md create mode 100644 linux/ecosystem/apache2/php5.6/docker-compose.yml create mode 100755 linux/ecosystem/apache2/php5.6/docker-entrypoint.sh create mode 100644 linux/ecosystem/apache2/php5.6/etc/apache2/apache2.conf create mode 100644 linux/ecosystem/apache2/php5.6/etc/apache2/sites-enabled/localhost.conf create mode 100644 linux/ecosystem/apache2/php8.4/Dockerfile create mode 100644 linux/ecosystem/apache2/php8.4/Makefile create mode 100644 linux/ecosystem/apache2/php8.4/README.md create mode 100644 linux/ecosystem/apache2/php8.4/docker-compose.yml create mode 100755 linux/ecosystem/apache2/php8.4/docker-entrypoint.sh create mode 100644 linux/ecosystem/apache2/php8.4/etc/apache2/apache2.conf create mode 100644 linux/ecosystem/apache2/php8.4/etc/apache2/sites-enabled/localhost.conf diff --git a/linux/advanced/teamcity/server/2022.04.7/Dockerfile b/linux/advanced/teamcity/server/2022.04.7/Dockerfile index 323baa9c7..f11cc3d4f 100644 --- a/linux/advanced/teamcity/server/2022.04.7/Dockerfile +++ b/linux/advanced/teamcity/server/2022.04.7/Dockerfile @@ -396,7 +396,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/advanced/teamcity/server/2022.10.6/Dockerfile b/linux/advanced/teamcity/server/2022.10.6/Dockerfile index bd718dcfc..bb3592bd3 100644 --- a/linux/advanced/teamcity/server/2022.10.6/Dockerfile +++ b/linux/advanced/teamcity/server/2022.10.6/Dockerfile @@ -396,7 +396,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/advanced/teamcity/server/2023.05.6/Dockerfile b/linux/advanced/teamcity/server/2023.05.6/Dockerfile index 326da32b8..524cb585f 100644 --- a/linux/advanced/teamcity/server/2023.05.6/Dockerfile +++ b/linux/advanced/teamcity/server/2023.05.6/Dockerfile @@ -396,7 +396,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/advanced/teamcity/server/2024.03.3/Dockerfile b/linux/advanced/teamcity/server/2024.03.3/Dockerfile index 70baa35de..38ea75811 100644 --- a/linux/advanced/teamcity/server/2024.03.3/Dockerfile +++ b/linux/advanced/teamcity/server/2024.03.3/Dockerfile @@ -396,7 +396,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/advanced/teamcity/server/2024.07.3/Dockerfile b/linux/advanced/teamcity/server/2024.07.3/Dockerfile index 1e11a283c..db4105917 100644 --- a/linux/advanced/teamcity/server/2024.07.3/Dockerfile +++ b/linux/advanced/teamcity/server/2024.07.3/Dockerfile @@ -396,7 +396,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/advanced/teamcity/server/2024.12/Dockerfile b/linux/advanced/teamcity/server/2024.12/Dockerfile index 3297af45b..2b3df03de 100644 --- a/linux/advanced/teamcity/server/2024.12/Dockerfile +++ b/linux/advanced/teamcity/server/2024.12/Dockerfile @@ -396,7 +396,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/advanced/teamcity/server/latest/Dockerfile b/linux/advanced/teamcity/server/latest/Dockerfile index 70af2e7e7..fa6f936ad 100644 --- a/linux/advanced/teamcity/server/latest/Dockerfile +++ b/linux/advanced/teamcity/server/latest/Dockerfile @@ -396,7 +396,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/advanced/vscode-server/latest/Dockerfile b/linux/advanced/vscode-server/latest/Dockerfile index 86ec6a1eb..67cdddbf2 100644 --- a/linux/advanced/vscode-server/latest/Dockerfile +++ b/linux/advanced/vscode-server/latest/Dockerfile @@ -342,7 +342,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/2.7/Dockerfile b/linux/discontinued/python/main/2.7/Dockerfile index 0b2f258a0..12ec2f57e 100644 --- a/linux/discontinued/python/main/2.7/Dockerfile +++ b/linux/discontinued/python/main/2.7/Dockerfile @@ -264,7 +264,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/3.10/Dockerfile b/linux/discontinued/python/main/3.10/Dockerfile index e650cd4ca..6cca33e57 100644 --- a/linux/discontinued/python/main/3.10/Dockerfile +++ b/linux/discontinued/python/main/3.10/Dockerfile @@ -263,7 +263,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/3.11/Dockerfile b/linux/discontinued/python/main/3.11/Dockerfile index 888a2e41d..f99739d40 100644 --- a/linux/discontinued/python/main/3.11/Dockerfile +++ b/linux/discontinued/python/main/3.11/Dockerfile @@ -263,7 +263,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/3.12/Dockerfile b/linux/discontinued/python/main/3.12/Dockerfile index 668772a35..a4933e120 100644 --- a/linux/discontinued/python/main/3.12/Dockerfile +++ b/linux/discontinued/python/main/3.12/Dockerfile @@ -262,7 +262,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/3.13/Dockerfile b/linux/discontinued/python/main/3.13/Dockerfile index 0c9acb77a..330216ffc 100644 --- a/linux/discontinued/python/main/3.13/Dockerfile +++ b/linux/discontinued/python/main/3.13/Dockerfile @@ -262,7 +262,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/3.6/Dockerfile b/linux/discontinued/python/main/3.6/Dockerfile index 2d0708a81..39440ad0a 100644 --- a/linux/discontinued/python/main/3.6/Dockerfile +++ b/linux/discontinued/python/main/3.6/Dockerfile @@ -261,7 +261,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/3.7/Dockerfile b/linux/discontinued/python/main/3.7/Dockerfile index 039e5075f..e7d13a1f1 100644 --- a/linux/discontinued/python/main/3.7/Dockerfile +++ b/linux/discontinued/python/main/3.7/Dockerfile @@ -262,7 +262,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/3.8/Dockerfile b/linux/discontinued/python/main/3.8/Dockerfile index f6d66c254..5ba91651e 100644 --- a/linux/discontinued/python/main/3.8/Dockerfile +++ b/linux/discontinued/python/main/3.8/Dockerfile @@ -262,7 +262,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/discontinued/python/main/3.9/Dockerfile b/linux/discontinued/python/main/3.9/Dockerfile index 3a9fd70a7..659b1b081 100644 --- a/linux/discontinued/python/main/3.9/Dockerfile +++ b/linux/discontinued/python/main/3.9/Dockerfile @@ -263,7 +263,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/ecosystem/apache2/php5.5/Dockerfile b/linux/ecosystem/apache2/php5.5/Dockerfile index 7a14b0a67..4b2872d1d 100644 --- a/linux/ecosystem/apache2/php5.5/Dockerfile +++ b/linux/ecosystem/apache2/php5.5/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php5.5 +FROM epicmorg/debian:bookworm-php5.5 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/apache2/php5.6/Dockerfile b/linux/ecosystem/apache2/php5.6/Dockerfile new file mode 100644 index 000000000..d7327b194 --- /dev/null +++ b/linux/ecosystem/apache2/php5.6/Dockerfile @@ -0,0 +1,99 @@ +FROM epicmorg/debian:bookworm-php5.5 +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_VER=5.6 +ENV PHP_MODULE_PATH=/usr/local/lib/php/extensions/no-debug-non-zts-20121212 +ENV PHP_DIR=/etc/php/${PHP_VER} +ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing Apache2 +################################################################## +#installing apache2 repo +RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg +RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' + +#Install base packages +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + locate \ + apache2 \ + apache2-utils \ + libapache2-mod-php5.5 \ + libapache2-mod-webauth \ + libapache2-mod-xforward \ + libapache2-mod-security2 \ + libmemcached-dev && \ + a2enmod \ + php5.6 \ + rewrite \ + ldap \ + heartmonitor \ + auth_basic \ + authnz_ldap \ + headers \ + heartbeat \ + slotmem_shm \ + lua \ + mime \ + status \ + xml2enc \ + xforward \ + remoteip \ + filter \ + dav \ + dav_fs \ + alias && \ + ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \ + php -m && \ + php -v + +################################################################## +# Apache2 Fixes +################################################################## +RUN rm -fv /etc/apache2/sites-enabled/000-default.conf +RUN rm -fv /etc/apache2/apache2.conf +COPY etc/apache2/sites-enabled/localhost.conf /etc/apache2/sites-enabled/localhost.conf +COPY etc/apache2/apache2.conf /etc/apache2/apache2.conf + +################################################################## +# LDAP Fix +################################################################## +RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +RUN ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ + php -m && \ + php -v + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/* && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +#healthcheck. good practice +HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1 + +# Add image configuration and scripts +COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh +RUN chmod 755 /usr/bin/docker-entrypoint.sh + +RUN updatedb +RUN chown -Rf www-data:www-data /var/www + +#Final config +VOLUME ["/var/www"] +WORKDIR /var/www/ +EXPOSE 80 443 + +ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"] +CMD ["docker-entrypoint.sh"] diff --git a/linux/ecosystem/apache2/php5.6/Makefile b/linux/ecosystem/apache2/php5.6/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/apache2/php5.6/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + 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 + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + 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/ecosystem/apache2/php5.6/README.md b/linux/ecosystem/apache2/php5.6/README.md new file mode 100644 index 000000000..86a34d4b1 --- /dev/null +++ b/linux/ecosystem/apache2/php5.6/README.md @@ -0,0 +1,32 @@ +# Compose example + +```yml +version: '3.7' +services: + websites: + image: epicmorg/websites +# depends_on: +# - mysql +# - memcached + restart: unless-stopped + volumes: + - /etc/localtime:/etc/localtime + - /etc/timezone:/etc/timezone +# - /etc/letsencrypt:/etc/letsencrypt + - www:/var/www + - apache2:/etc/apache2 + - php:/etc/php + restart: unless-stopped +# extra_hosts: +# - "example.com:192.168.0.11" + tmpfs: + - /tmp + - /var/lib/php/sessions +volumes: + www: + external: true + apache2: + external: true + php: + external: true +``` diff --git a/linux/ecosystem/apache2/php5.6/docker-compose.yml b/linux/ecosystem/apache2/php5.6/docker-compose.yml new file mode 100644 index 000000000..2838ddcc3 --- /dev/null +++ b/linux/ecosystem/apache2/php5.6/docker-compose.yml @@ -0,0 +1,6 @@ +#version: '3' +services: + app: + image: "epicmorg/apache2:php5.6" + build: + context: . diff --git a/linux/ecosystem/apache2/php5.6/docker-entrypoint.sh b/linux/ecosystem/apache2/php5.6/docker-entrypoint.sh new file mode 100755 index 000000000..b421b8648 --- /dev/null +++ b/linux/ecosystem/apache2/php5.6/docker-entrypoint.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +if [[ -z "${FIX_WWW_DATA}" ]]; then + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." +elif [ "${FIX_WWW_DATA}" == "false" ]; then + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." +elif [ "${FIX_WWW_DATA}" == "true" ]; then + echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." + chown www-data:www-data /var/www -R + echo "[apache2] Done" +else + echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." +fi + +echo "[apache2] Starting up" +source /etc/apache2/envvars +tail -F /var/log/apache2/* & +exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php5.6/etc/apache2/apache2.conf b/linux/ecosystem/apache2/php5.6/etc/apache2/apache2.conf new file mode 100644 index 000000000..eedaac25c --- /dev/null +++ b/linux/ecosystem/apache2/php5.6/etc/apache2/apache2.conf @@ -0,0 +1,231 @@ +# This is the main Apache server configuration file. It contains the +# configuration directives that give the server its instructions. +# See http://httpd.apache.org/docs/2.4/ for detailed information about +# the directives and /usr/share/doc/apache2/README.Debian about Debian specific +# hints. +# +# +# Summary of how the Apache 2 configuration works in Debian: +# The Apache 2 web server configuration in Debian is quite different to +# upstream's suggested way to configure the web server. This is because Debian's +# default Apache2 installation attempts to make adding and removing modules, +# virtual hosts, and extra configuration directives as flexible as possible, in +# order to make automating the changes and administering the server as easy as +# possible. + +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf-enabled +# | `-- *.conf +# `-- sites-enabled +# `-- *.conf +# +# +# * apache2.conf is the main configuration file (this file). It puts the pieces +# together by including all remaining configuration files when starting up the +# web server. +# +# * ports.conf is always included from the main configuration file. It is +# supposed to determine listening ports for incoming connections which can be +# customized anytime. +# +# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/ +# directories contain particular configuration snippets which manage modules, +# global configuration fragments, or virtual host configurations, +# respectively. +# +# They are activated by symlinking available configuration files from their +# respective *-available/ counterparts. These should be managed by using our +# helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See +# their respective man pages for detailed information. +# +# * The binary is called apache2. Due to the use of environment variables, in +# the default configuration, apache2 needs to be started/stopped with +# /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not +# work with the default configuration. + + +# Global configuration +# + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# NOTE! If you intend to place this on an NFS (or otherwise network) +# mounted filesystem then please read the Mutex documentation (available +# at ); +# you will save yourself a lot of trouble. +# +# Do NOT add a slash at the end of the directory path. +# +#ServerRoot "/etc/apache2" + +# +# The accept serialization lock file MUST BE STORED ON A LOCAL DISK. +# +#Mutex file:${APACHE_LOCK_DIR} default + +# +# The directory where shm and other runtime files will be stored. +# + +DefaultRuntimeDir ${APACHE_RUN_DIR} + +# +# PidFile: The file in which the server should record its process +# identification number when it starts. +# This needs to be set in /etc/apache2/envvars +# +PidFile ${APACHE_PID_FILE} + +# +# Timeout: The number of seconds before receives and sends time out. +# +Timeout 300 + +# +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +# +KeepAlive On + +# +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +# +MaxKeepAliveRequests 100 + +# +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +# +KeepAliveTimeout 5 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} + +# +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +# +HostnameLookups Off + +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog ${APACHE_LOG_DIR}/error.log + +# +# LogLevel: Control the severity of messages logged to the error_log. +# Available values: trace8, ..., trace1, debug, info, notice, warn, +# error, crit, alert, emerg. +# It is also possible to configure the log level for particular modules, e.g. +# "LogLevel info ssl:warn" +# +LogLevel warn + +# Include module configuration: +IncludeOptional mods-enabled/*.load +IncludeOptional mods-enabled/*.conf + +# Include list of ports to listen on +Include ports.conf + + +# Sets the default security model of the Apache2 HTTPD server. It does +# not allow access to the root filesystem outside of /usr/share and /var/www. +# The former is used by web applications packaged in Debian, +# the latter may be used for local directories served by the web server. If +# your system is serving content from a sub-directory in /srv you must allow +# access here, or in any related virtual host. + + Options FollowSymLinks + AllowOverride None + Require all denied + + + + AllowOverride None + Require all granted + + + + Options Indexes FollowSymLinks + AllowOverride None + Require all granted + + +# +# Options Indexes FollowSymLinks +# AllowOverride None +# Require all granted +# + + + + +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +# +AccessFileName .htaccess + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + + +# +# The following directives define some format nicknames for use with +# a CustomLog directive. +# +# These deviate from the Common Log Format definitions in that they use %O +# (the actual bytes sent including headers) instead of %b (the size of the +# requested file), because the latter makes it impossible to detect partial +# requests. +# +# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended. +# Use mod_remoteip instead. +# +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +# Include of directories ignores editors' and dpkg's backup files, +# see README.Debian for details. + +# Include generic snippets of statements +IncludeOptional conf-enabled/*.conf + +# Include the virtual host configurations: +IncludeOptional sites-enabled/*.conf + +ServerName localhost + +#SecStatusEngine On + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/linux/ecosystem/apache2/php5.6/etc/apache2/sites-enabled/localhost.conf b/linux/ecosystem/apache2/php5.6/etc/apache2/sites-enabled/localhost.conf new file mode 100644 index 000000000..052ce2ec1 --- /dev/null +++ b/linux/ecosystem/apache2/php5.6/etc/apache2/sites-enabled/localhost.conf @@ -0,0 +1,8 @@ + + ServerName localhost + ServerAlias 127.0.0.1 + ServerAdmin webmaster@localhost + DocumentRoot /var/www/html + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + diff --git a/linux/ecosystem/apache2/php7.0/Dockerfile b/linux/ecosystem/apache2/php7.0/Dockerfile index a4c62310f..9c57eb8bd 100644 --- a/linux/ecosystem/apache2/php7.0/Dockerfile +++ b/linux/ecosystem/apache2/php7.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php7.0 +FROM epicmorg/debian:bookworm-php7.0 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -15,20 +15,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ diff --git a/linux/ecosystem/apache2/php7.1/Dockerfile b/linux/ecosystem/apache2/php7.1/Dockerfile index 1c753058f..f0cac4217 100644 --- a/linux/ecosystem/apache2/php7.1/Dockerfile +++ b/linux/ecosystem/apache2/php7.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php7.1 +FROM epicmorg/debian:bookworm-php7.1 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -14,21 +14,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini #installing apache2 repo RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ diff --git a/linux/ecosystem/apache2/php7.2/Dockerfile b/linux/ecosystem/apache2/php7.2/Dockerfile index 078085157..456505108 100644 --- a/linux/ecosystem/apache2/php7.2/Dockerfile +++ b/linux/ecosystem/apache2/php7.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php7.2 +FROM epicmorg/debian:bookworm-php7.2 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -14,21 +14,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini #installing apache2 repo RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ diff --git a/linux/ecosystem/apache2/php7.3/Dockerfile b/linux/ecosystem/apache2/php7.3/Dockerfile index 0d2912ed4..bf40233f6 100644 --- a/linux/ecosystem/apache2/php7.3/Dockerfile +++ b/linux/ecosystem/apache2/php7.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php7.3 +FROM epicmorg/debian:bookworm-php7.3 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -14,21 +14,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini #installing apache2 repo RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ diff --git a/linux/ecosystem/apache2/php7.4/Dockerfile b/linux/ecosystem/apache2/php7.4/Dockerfile index 05c1e6501..5228bf4b8 100644 --- a/linux/ecosystem/apache2/php7.4/Dockerfile +++ b/linux/ecosystem/apache2/php7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php7.4 +FROM epicmorg/debian:bookworm-php7.4 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -15,21 +15,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini #installing apache2 repo RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ diff --git a/linux/ecosystem/apache2/php8.0/Dockerfile b/linux/ecosystem/apache2/php8.0/Dockerfile index 95c5a2da1..5fcfff1f3 100644 --- a/linux/ecosystem/apache2/php8.0/Dockerfile +++ b/linux/ecosystem/apache2/php8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php8.0 +FROM epicmorg/debian:bookworm-php8.0 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -16,21 +16,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini #installing apache2 repo RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ diff --git a/linux/ecosystem/apache2/php8.1/Dockerfile b/linux/ecosystem/apache2/php8.1/Dockerfile index 28403b989..8b133e6f0 100644 --- a/linux/ecosystem/apache2/php8.1/Dockerfile +++ b/linux/ecosystem/apache2/php8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php8.1 +FROM epicmorg/debian:bookworm-php8.1 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -16,21 +16,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini #installing apache2 repo RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ diff --git a/linux/ecosystem/apache2/php8.2/Dockerfile b/linux/ecosystem/apache2/php8.2/Dockerfile index 10b5b4262..986e602f3 100644 --- a/linux/ecosystem/apache2/php8.2/Dockerfile +++ b/linux/ecosystem/apache2/php8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php8.2 +FROM epicmorg/debian:bookworm-php8.2 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -16,21 +16,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini #installing apache2 repo RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ diff --git a/linux/ecosystem/apache2/php8.3/Dockerfile b/linux/ecosystem/apache2/php8.3/Dockerfile index a25f8c635..56106488f 100644 --- a/linux/ecosystem/apache2/php8.3/Dockerfile +++ b/linux/ecosystem/apache2/php8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php8.3 +FROM epicmorg/debian:bookworm-php8.3 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -16,21 +16,6 @@ ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini #installing apache2 repo RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' -RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - -################################################################## -# gh official binary -################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --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 base packages RUN apt-get update && \ diff --git a/linux/ecosystem/apache2/php8.4/Dockerfile b/linux/ecosystem/apache2/php8.4/Dockerfile new file mode 100644 index 000000000..2621ba619 --- /dev/null +++ b/linux/ecosystem/apache2/php8.4/Dockerfile @@ -0,0 +1,133 @@ +FROM epicmorg/debian:bookworm-php8.4 +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +ENV PHP_MODULE_VER=20220830 +ENV PHP_MODULE_PATH=/usr/lib/php/${PHP_MODULE_VER} +ENV PHP_VER=8.3 +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 +ARG CAS_PHP_INI=${PHP_DIR}/mods-available/cassandra.ini + +################################################################## +# Installing Apache2 +################################################################## +#installing apache2 repo +RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://vault.center/mirror/apt/packages.sury.org/apache2/apt.gpg +RUN sh -c 'echo "deb https://vault.center/mirror/apt/packages.sury.org/apache2/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/apache2.list' + +#Install base packages +RUN apt-get update && \ + apt-get install -y --allow-unauthenticated \ + locate \ + apache2 \ + apache2-utils \ + libapache2-mod-php8.4 \ +# libapache2-mod-webauth \ + libapache2-mod-xforward \ + libapache2-mod-security2 && \ + a2enmod \ + php8.3 \ + rewrite \ + ldap \ + heartmonitor \ + auth_basic \ + authnz_ldap \ + headers \ + heartbeat \ + slotmem_shm \ + lua \ + mime \ + status \ + xml2enc \ + xforward \ + remoteip \ + filter \ + dav \ + dav_fs \ + alias && \ + ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \ + php -m && \ + php -v + +################################################################## +# Apache2 Fixes +################################################################## +RUN rm -fv /etc/apache2/sites-enabled/000-default.conf +RUN rm -fv /etc/apache2/apache2.conf +COPY etc/apache2/sites-enabled/localhost.conf /etc/apache2/sites-enabled/localhost.conf +COPY etc/apache2/apache2.conf /etc/apache2/apache2.conf + +################################################################## +# LDAP Fix +################################################################## +RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf + +############################################################################## +# Cassandra PHP Drivers Install +############################################################################## +#RUN ln -sf ${CAS_PHP_INI} ${PHP_DIR}/apache2/conf.d/cassandra.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing IOnCube addon +################################################################## +#RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_8.2.so" >> ${PHP_DIR}/apache2/php.ini && \ +# php -m && \ +# php -v + +################################################################## +# Installing Bolt addon +################################################################## +#RUN echo "extension = ${PHP_MODULE_PATH}/phpBolt-extension-1.0.4-php81.so" >> ${PHP_DIR}/apache2/php.ini + +################################################################## +# Installing timezonedb addon +################################################################## +RUN echo "extension = ${PHP_MODULE_PATH}/timezonedb.so" >> ${PHP_DIR}/apache2/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing imagic addon +################################################################## +RUN echo "extension = ${PHP_MODULE_PATH}/imagick.so" >> ${PHP_DIR}/apache2/php.ini && \ + php -m && \ + php -v + +################################################################## +# Installing smbclient addon +################################################################## +RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ + php -m && \ + php -v + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/* && \ + rm -rfv /root/tmp/* && \ + rm -rfv /tmp/* + +#healthcheck. good practice +HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1 + +# Add image configuration and scripts +COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh +RUN chmod 755 /usr/bin/docker-entrypoint.sh + +RUN updatedb +RUN chown -Rf www-data:www-data /var/www + +#Final config +VOLUME ["/var/www"] +WORKDIR /var/www/ +EXPOSE 80 443 + +ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"] +CMD ["docker-entrypoint.sh"] diff --git a/linux/ecosystem/apache2/php8.4/Makefile b/linux/ecosystem/apache2/php8.4/Makefile new file mode 100644 index 000000000..06e855b50 --- /dev/null +++ b/linux/ecosystem/apache2/php8.4/Makefile @@ -0,0 +1,36 @@ +PIP_BREAK_SYSTEM_PACKAGES=1 + +all: app + +app: + make build + make deploy + make clean + +build: + 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 + +build-compose: + docker-compose build --compress --parallel --progress plain + +deploy: + 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/ecosystem/apache2/php8.4/README.md b/linux/ecosystem/apache2/php8.4/README.md new file mode 100644 index 000000000..86a34d4b1 --- /dev/null +++ b/linux/ecosystem/apache2/php8.4/README.md @@ -0,0 +1,32 @@ +# Compose example + +```yml +version: '3.7' +services: + websites: + image: epicmorg/websites +# depends_on: +# - mysql +# - memcached + restart: unless-stopped + volumes: + - /etc/localtime:/etc/localtime + - /etc/timezone:/etc/timezone +# - /etc/letsencrypt:/etc/letsencrypt + - www:/var/www + - apache2:/etc/apache2 + - php:/etc/php + restart: unless-stopped +# extra_hosts: +# - "example.com:192.168.0.11" + tmpfs: + - /tmp + - /var/lib/php/sessions +volumes: + www: + external: true + apache2: + external: true + php: + external: true +``` diff --git a/linux/ecosystem/apache2/php8.4/docker-compose.yml b/linux/ecosystem/apache2/php8.4/docker-compose.yml new file mode 100644 index 000000000..c307ecc00 --- /dev/null +++ b/linux/ecosystem/apache2/php8.4/docker-compose.yml @@ -0,0 +1,6 @@ +#version: '3' +services: + app: + image: "epicmorg/apache2:php8.4" + build: + context: . diff --git a/linux/ecosystem/apache2/php8.4/docker-entrypoint.sh b/linux/ecosystem/apache2/php8.4/docker-entrypoint.sh new file mode 100755 index 000000000..b421b8648 --- /dev/null +++ b/linux/ecosystem/apache2/php8.4/docker-entrypoint.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +if [[ -z "${FIX_WWW_DATA}" ]]; then + echo "[apache2] env FIX_WWW_DATA is not set. Skipping..." +elif [ "${FIX_WWW_DATA}" == "false" ]; then + echo "[apache2] env FIX_WWW_DATA is set to false. Skipping..." +elif [ "${FIX_WWW_DATA}" == "true" ]; then + echo "[apache2] Changing permissions for /var/www path. Dont worry, please wait." + chown www-data:www-data /var/www -R + echo "[apache2] Done" +else + echo "[apache2] env FIX_WWW_DATA is set to strange value. Skipping..." +fi + +echo "[apache2] Starting up" +source /etc/apache2/envvars +tail -F /var/log/apache2/* & +exec apache2 -D FOREGROUND diff --git a/linux/ecosystem/apache2/php8.4/etc/apache2/apache2.conf b/linux/ecosystem/apache2/php8.4/etc/apache2/apache2.conf new file mode 100644 index 000000000..eedaac25c --- /dev/null +++ b/linux/ecosystem/apache2/php8.4/etc/apache2/apache2.conf @@ -0,0 +1,231 @@ +# This is the main Apache server configuration file. It contains the +# configuration directives that give the server its instructions. +# See http://httpd.apache.org/docs/2.4/ for detailed information about +# the directives and /usr/share/doc/apache2/README.Debian about Debian specific +# hints. +# +# +# Summary of how the Apache 2 configuration works in Debian: +# The Apache 2 web server configuration in Debian is quite different to +# upstream's suggested way to configure the web server. This is because Debian's +# default Apache2 installation attempts to make adding and removing modules, +# virtual hosts, and extra configuration directives as flexible as possible, in +# order to make automating the changes and administering the server as easy as +# possible. + +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf-enabled +# | `-- *.conf +# `-- sites-enabled +# `-- *.conf +# +# +# * apache2.conf is the main configuration file (this file). It puts the pieces +# together by including all remaining configuration files when starting up the +# web server. +# +# * ports.conf is always included from the main configuration file. It is +# supposed to determine listening ports for incoming connections which can be +# customized anytime. +# +# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/ +# directories contain particular configuration snippets which manage modules, +# global configuration fragments, or virtual host configurations, +# respectively. +# +# They are activated by symlinking available configuration files from their +# respective *-available/ counterparts. These should be managed by using our +# helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See +# their respective man pages for detailed information. +# +# * The binary is called apache2. Due to the use of environment variables, in +# the default configuration, apache2 needs to be started/stopped with +# /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not +# work with the default configuration. + + +# Global configuration +# + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# NOTE! If you intend to place this on an NFS (or otherwise network) +# mounted filesystem then please read the Mutex documentation (available +# at ); +# you will save yourself a lot of trouble. +# +# Do NOT add a slash at the end of the directory path. +# +#ServerRoot "/etc/apache2" + +# +# The accept serialization lock file MUST BE STORED ON A LOCAL DISK. +# +#Mutex file:${APACHE_LOCK_DIR} default + +# +# The directory where shm and other runtime files will be stored. +# + +DefaultRuntimeDir ${APACHE_RUN_DIR} + +# +# PidFile: The file in which the server should record its process +# identification number when it starts. +# This needs to be set in /etc/apache2/envvars +# +PidFile ${APACHE_PID_FILE} + +# +# Timeout: The number of seconds before receives and sends time out. +# +Timeout 300 + +# +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +# +KeepAlive On + +# +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +# +MaxKeepAliveRequests 100 + +# +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +# +KeepAliveTimeout 5 + + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} + +# +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +# +HostnameLookups Off + +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog ${APACHE_LOG_DIR}/error.log + +# +# LogLevel: Control the severity of messages logged to the error_log. +# Available values: trace8, ..., trace1, debug, info, notice, warn, +# error, crit, alert, emerg. +# It is also possible to configure the log level for particular modules, e.g. +# "LogLevel info ssl:warn" +# +LogLevel warn + +# Include module configuration: +IncludeOptional mods-enabled/*.load +IncludeOptional mods-enabled/*.conf + +# Include list of ports to listen on +Include ports.conf + + +# Sets the default security model of the Apache2 HTTPD server. It does +# not allow access to the root filesystem outside of /usr/share and /var/www. +# The former is used by web applications packaged in Debian, +# the latter may be used for local directories served by the web server. If +# your system is serving content from a sub-directory in /srv you must allow +# access here, or in any related virtual host. + + Options FollowSymLinks + AllowOverride None + Require all denied + + + + AllowOverride None + Require all granted + + + + Options Indexes FollowSymLinks + AllowOverride None + Require all granted + + +# +# Options Indexes FollowSymLinks +# AllowOverride None +# Require all granted +# + + + + +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +# +AccessFileName .htaccess + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + + +# +# The following directives define some format nicknames for use with +# a CustomLog directive. +# +# These deviate from the Common Log Format definitions in that they use %O +# (the actual bytes sent including headers) instead of %b (the size of the +# requested file), because the latter makes it impossible to detect partial +# requests. +# +# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended. +# Use mod_remoteip instead. +# +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +# Include of directories ignores editors' and dpkg's backup files, +# see README.Debian for details. + +# Include generic snippets of statements +IncludeOptional conf-enabled/*.conf + +# Include the virtual host configurations: +IncludeOptional sites-enabled/*.conf + +ServerName localhost + +#SecStatusEngine On + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/linux/ecosystem/apache2/php8.4/etc/apache2/sites-enabled/localhost.conf b/linux/ecosystem/apache2/php8.4/etc/apache2/sites-enabled/localhost.conf new file mode 100644 index 000000000..052ce2ec1 --- /dev/null +++ b/linux/ecosystem/apache2/php8.4/etc/apache2/sites-enabled/localhost.conf @@ -0,0 +1,8 @@ + + ServerName localhost + ServerAlias 127.0.0.1 + ServerAdmin webmaster@localhost + DocumentRoot /var/www/html + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile index f60c1b687..fe8e8ea28 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/Dockerfile @@ -200,7 +200,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile index 9690cd7cf..f76b3924f 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile @@ -198,7 +198,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile index daf0f1be9..c0a7eb471 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile @@ -197,7 +197,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.5/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.5/docker-compose.yml index a5caf1c4d..2833f978a 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.5/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.5/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php5.5" + image: "epicmorg/debian:bookworm-php5.5" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/docker-compose.yml index 0e3c2d42e..4629c1ba3 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php5.6" + image: "epicmorg/debian:bookworm-php5.6" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/docker-compose.yml index 3ef51d9ff..be8d6c8f4 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php7.0" + image: "epicmorg/debian:bookworm-php7.0" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/docker-compose.yml index 014c47eb5..15617e9aa 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php7.1" + image: "epicmorg/debian:bookworm-php7.1" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/docker-compose.yml index 9dad29ae1..bcb724235 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php7.2" + image: "epicmorg/debian:bookworm-php7.2" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/docker-compose.yml index 1736eab07..c0fec08cd 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php7.3" + image: "epicmorg/debian:bookworm-php7.3" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/docker-compose.yml index 3e3b7152b..0b54760c6 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php7.4" + image: "epicmorg/debian:bookworm-php7.4" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/docker-compose.yml index 210f80ad3..c00379905 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php8.0" + image: "epicmorg/debian:bookworm-php8.0" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/docker-compose.yml index a357d30b0..3254a8b10 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php8.1" + image: "epicmorg/debian:bookworm-php8.1" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/docker-compose.yml index 45322457a..182e9c553 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php8.2" + image: "epicmorg/debian:bookworm-php8.2" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/docker-compose.yml index 4b5c33c47..ef0ff57e1 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php8.3" + image: "epicmorg/debian:bookworm-php8.3" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/docker-compose.yml index 7912b965e..e13827e9b 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4/docker-compose.yml @@ -1,6 +1,6 @@ #version: '3' services: app: - image: "epicmorg/php:php8.4" + image: "epicmorg/debian:bookworm-php8.4" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile index 56ed3a3af..dbaa70d4b 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile @@ -198,7 +198,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \ diff --git a/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile index 7224ba7c2..c7ecb459e 100644 --- a/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile @@ -198,7 +198,7 @@ RUN echo "=============================================" && \ ################################################################## # gh official binary ################################################################## -RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ +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 && \