From d12dee4fce3b4e60db6110893f173fd5f7d93c5d Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Wed, 18 Dec 2024 01:49:00 +0700 Subject: [PATCH 01/14] Composer now available on all images --- 5/Dockerfile.alpine | 26 +++++++++++++++++++++----- 5/scripts/alpine-setup.sh | 4 ++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/5/Dockerfile.alpine b/5/Dockerfile.alpine index e96f11a..0815fdd 100644 --- a/5/Dockerfile.alpine +++ b/5/Dockerfile.alpine @@ -9,23 +9,39 @@ ARG WITH_APACHE=false ARG WITH_DATABASE=false ARG PHP_VERSION=5.6 ARG PHP_VER_SHORT=5 +ARG COMPOSER_VERSION=2.2.25 +ARG COMPOSER_VER_SHORT=2.2 ENV FLAVOR=${FLAVOR} ENV WITH_APACHE=${WITH_APACHE} ENV WITH_DATABASE=${WITH_DATABASE} ENV PHP_VERSION=${PHP_VERSION} ENV PHP_VER_SHORT=${PHP_VER_SHORT} +ENV COMPOSER_VERSION=${COMPOSER_VERSION} +ENV COMPOSER_VER_SHORT=${COMPOSER_VER_SHORT} -WORKDIR /root +# Set composer home +ENV COMPOSER_HOME=/app +ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache -ADD 5/scripts/alpine-setup.sh /tmp/setup.sh +WORKDIR /tmp + +ADD 5/scripts/alpine-setup.sh ./setup.sh + +# Download and install composer +ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer # Create directory, and install required php app -RUN /bin/mkdir -p /app ; \ +RUN /bin/mkdir -p ${COMPOSER_HOME}/build ${COMPOSER_CACHE_DIR}/files \ + ${COMPOSER_CACHE_DIR}/repo ${COMPOSER_CACHE_DIR}/vcs ; \ + /app ; \ + /usr/sbin/addgroup -g 10001 php ; \ + /usr/sbin/adduser -D -u 10001 -G php -s /sbin/nologin -h ${COMPOSER_HOME}/build php ; \ + /bin/mkdir -p /app ; \ /sbin/apk add --update --no-cache \ php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ - php${PHP_VER_SHORT}-cli ; \ - /bin/chmod +x /tmp/setup.sh; \ + php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \ + /bin/chmod +x /tmp/setup.sh /usr/local/bin/composer ; \ /bin/sh /tmp/setup.sh; \ /bin/rm -f /tmp/*.sh; diff --git a/5/scripts/alpine-setup.sh b/5/scripts/alpine-setup.sh index ae2311f..903fae6 100644 --- a/5/scripts/alpine-setup.sh +++ b/5/scripts/alpine-setup.sh @@ -35,8 +35,8 @@ fi # Only setup apache with full flavor parameters if [ "$WITH_APACHE" == "true" ]; then if [ "$FLAVOR" == "full" ] || [ "$FLAVOR" == "debug" ]; then - /usr/sbin/addgroup -g 10001 apache ; - /usr/sbin/adduser -D -u 10001 -G apache -s /bin/sh -h $APP_ROOT apache ; + /usr/sbin/addgroup -g 10002 apache ; + /usr/sbin/adduser -D -u 10002 -G apache -s /sbin/nologin -h $APP_ROOT apache ; /sbin/apk add --update --no-cache apache2 php$PHP_VER_SHORT-apache2 ; sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf ; From 2577409c2f212ce735c26190ffebf172d1abc143 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 00:26:48 +0700 Subject: [PATCH 02/14] Added composer for all php7 image --- 7/Dockerfile.alpine | 7 +++++-- 7/Dockerfile.apache-alpine | 9 ++++++--- 7/scripts/alpine-setup.sh | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/7/Dockerfile.alpine b/7/Dockerfile.alpine index 72e03fc..6fb18f0 100644 --- a/7/Dockerfile.alpine +++ b/7/Dockerfile.alpine @@ -11,23 +11,26 @@ ARG WITH_APACHE=false ARG WITH_DATABASE=false ARG PHP_VERSION=7.4 ARG PHP_VER_SHORT=7 +ARG COMPOSER_VERSION=2.8.4 ENV FLAVOR=${FLAVOR} ENV WITH_APACHE=${WITH_APACHE} ENV WITH_DATABASE=${WITH_DATABASE} ENV PHP_VERSION=${PHP_VERSION} ENV PHP_VER_SHORT=${PHP_VER_SHORT} +ENV COMPOSER_VERSION=${COMPOSER_VERSION} WORKDIR /root ADD 7/scripts/alpine-setup.sh /tmp/setup.sh +ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer # Create directory, and install required php app RUN /bin/mkdir -p /app ; \ /sbin/apk add --update --no-cache \ php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ - php${PHP_VER_SHORT}-cli ; \ - /bin/chmod +x /tmp/setup.sh; \ + php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \ + /bin/chmod +x /tmp/setup.sh; /usr/local/bin/composer \ /bin/sh /tmp/setup.sh; \ /bin/rm -f /tmp/*.sh; diff --git a/7/Dockerfile.apache-alpine b/7/Dockerfile.apache-alpine index 5c64c41..3627a83 100644 --- a/7/Dockerfile.apache-alpine +++ b/7/Dockerfile.apache-alpine @@ -11,6 +11,7 @@ ARG WITH_APACHE=false ARG WITH_DATABASE=false ARG PHP_VERSION=7.4 ARG PHP_VER_SHORT=7 +ARG COMPOSER_VERSION=2.8.4 ENV FLAVOR=${FLAVOR} ENV WITH_APACHE=${WITH_APACHE} @@ -18,20 +19,22 @@ ENV WITH_DATABASE=${WITH_DATABASE} ENV PHP_VERSION=${PHP_VERSION} ENV PHP_VER_SHORT=${PHP_VER_SHORT} ENV SERVER_ROOT=/app +ENV COMPOSER_VERSION=${COMPOSER_VERSION} WORKDIR /root ADD 7/scripts/alpine-setup.sh /tmp/setup.sh ADD scripts/entrypoint.sh /usr/local/bin/ +ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer # Create directory, and install required php app RUN /bin/mkdir -p /app ; \ /sbin/apk add --update --no-cache \ php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ - php${PHP_VER_SHORT}-cli ; \ - /bin/chmod +x /tmp/setup.sh /usr/local/bin/entrypoint.sh ; \ + php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \ + /bin/chmod +x /tmp/setup.sh /usr/local/bin/entrypoint.sh /usr/local/bin/composer; \ /bin/sh /tmp/setup.sh; \ - /bin/rm -f /tmp/*.sh; + /bin/rm -f /tmp/*.sh; ADD htdocs ${SERVER_ROOT}/htdocs diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh index 7844136..f6e4092 100644 --- a/7/scripts/alpine-setup.sh +++ b/7/scripts/alpine-setup.sh @@ -5,7 +5,7 @@ ctype,curl,dba,dom,embed, enchant,exif,fileinfo,ftp,gd, gettext,gmp,iconv,imap,intl, json,ldap,mbstring,opcache,openssl, -pcntl,pdo,pear,phar,posix, +pcntl,pdo,pear,posix, pspell,shmop,snmp,soap,sockets, sysvmsg,sysvsem,sysvshm,tidy,tokenizer, xml,xmlreader,xmlrpc,xsl,zip" From 587a5430f32f8a8856f61e8ef8fdf4ed94689ede Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 00:34:06 +0700 Subject: [PATCH 03/14] Added php 7.2 and 7.3 flavor --- .gitea/workflows/php7-alpine.yaml | 128 ++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/.gitea/workflows/php7-alpine.yaml b/.gitea/workflows/php7-alpine.yaml index 2f0562d..7a4c3e4 100644 --- a/.gitea/workflows/php7-alpine.yaml +++ b/.gitea/workflows/php7-alpine.yaml @@ -77,6 +77,134 @@ jobs: mode: debug with_server: "apache" with_database: "postgresql" + + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: cli + with_server: "false" + with_database: "false" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: full + with_server: "false" + with_database: "false" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: debug + with_server: "false" + with_database: "false" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: full + with_server: "apache" + with_database: "false" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: full + with_server: "apache" + with_database: "mysql" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: full + with_server: "apache" + with_database: "postgresql" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: debug + with_server: "apache" + with_database: "false" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: debug + with_server: "apache" + with_database: "mysql" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + mode: debug + with_server: "apache" + with_database: "postgresql" + + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: cli + with_server: "false" + with_database: "false" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: full + with_server: "false" + with_database: "false" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: debug + with_server: "false" + with_database: "false" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: full + with_server: "apache" + with_database: "false" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: full + with_server: "apache" + with_database: "mysql" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: full + with_server: "apache" + with_database: "postgresql" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: debug + with_server: "apache" + with_database: "false" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: debug + with_server: "apache" + with_database: "mysql" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + mode: debug + with_server: "apache" + with_database: "postgresql" steps: - name: Check out repository code uses: actions/checkout@v4 From f83c5460f2bd192b856e329d1284f8b33eeb30a0 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 01:13:27 +0700 Subject: [PATCH 04/14] Fixed wrong chmod compsoer command --- 7/Dockerfile.alpine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7/Dockerfile.alpine b/7/Dockerfile.alpine index 6fb18f0..4323ef2 100644 --- a/7/Dockerfile.alpine +++ b/7/Dockerfile.alpine @@ -30,7 +30,7 @@ RUN /bin/mkdir -p /app ; \ /sbin/apk add --update --no-cache \ php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \ - /bin/chmod +x /tmp/setup.sh; /usr/local/bin/composer \ + /bin/chmod +x /tmp/setup.sh /usr/local/bin/composer ; \ /bin/sh /tmp/setup.sh; \ /bin/rm -f /tmp/*.sh; From 57efb4a31b4107637ead11b178cf844ea7b7759c Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 01:58:28 +0700 Subject: [PATCH 05/14] Added missing iconv and mbstring for composer to run --- 7/Dockerfile.alpine | 3 ++- 7/Dockerfile.apache-alpine | 3 ++- 7/scripts/alpine-setup.sh | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/7/Dockerfile.alpine b/7/Dockerfile.alpine index 4323ef2..c139c50 100644 --- a/7/Dockerfile.alpine +++ b/7/Dockerfile.alpine @@ -29,7 +29,8 @@ ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/c RUN /bin/mkdir -p /app ; \ /sbin/apk add --update --no-cache \ php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ - php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \ + php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \ + php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring ; \ /bin/chmod +x /tmp/setup.sh /usr/local/bin/composer ; \ /bin/sh /tmp/setup.sh; \ /bin/rm -f /tmp/*.sh; diff --git a/7/Dockerfile.apache-alpine b/7/Dockerfile.apache-alpine index 3627a83..1275a0e 100644 --- a/7/Dockerfile.apache-alpine +++ b/7/Dockerfile.apache-alpine @@ -31,7 +31,8 @@ ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/c RUN /bin/mkdir -p /app ; \ /sbin/apk add --update --no-cache \ php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ - php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \ + php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \ + php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring ; \ /bin/chmod +x /tmp/setup.sh /usr/local/bin/entrypoint.sh /usr/local/bin/composer; \ /bin/sh /tmp/setup.sh; \ /bin/rm -f /tmp/*.sh; diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh index f6e4092..0dbd77d 100644 --- a/7/scripts/alpine-setup.sh +++ b/7/scripts/alpine-setup.sh @@ -3,8 +3,8 @@ PHP_LIST="bcmath,brotli,bz2,calendar,cgi, ctype,curl,dba,dom,embed, enchant,exif,fileinfo,ftp,gd, -gettext,gmp,iconv,imap,intl, -json,ldap,mbstring,opcache,openssl, +gettext,gmp,imap,intl, +json,ldap,opcache,openssl, pcntl,pdo,pear,posix, pspell,shmop,snmp,soap,sockets, sysvmsg,sysvsem,sysvshm,tidy,tokenizer, From 4fa3d87ffe6f58d5986e6a1d07be140947b5adc9 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 03:18:28 +0700 Subject: [PATCH 06/14] Removed debug flavor --- .gitea/workflows/php7-alpine.yaml | 85 +------------------------------ 7/scripts/alpine-setup.sh | 2 +- 2 files changed, 2 insertions(+), 85 deletions(-) diff --git a/.gitea/workflows/php7-alpine.yaml b/.gitea/workflows/php7-alpine.yaml index 7a4c3e4..f644950 100644 --- a/.gitea/workflows/php7-alpine.yaml +++ b/.gitea/workflows/php7-alpine.yaml @@ -28,13 +28,6 @@ jobs: mode: full with_server: "false" with_database: "false" - - os: "alpine" - os_version: "3.15" - php_version: "7.4" - php_ver_short: "7" - mode: debug - with_server: "false" - with_database: "false" - os: "alpine" os_version: "3.15" php_version: "7.4" @@ -56,27 +49,6 @@ jobs: mode: full with_server: "apache" with_database: "postgresql" - - os: "alpine" - os_version: "3.15" - php_version: "7.4" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "false" - - os: "alpine" - os_version: "3.15" - php_version: "7.4" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "mysql" - - os: "alpine" - os_version: "3.15" - php_version: "7.4" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "postgresql" - os: "alpine" os_version: "3.12" @@ -92,13 +64,6 @@ jobs: mode: full with_server: "false" with_database: "false" - - os: "alpine" - os_version: "3.12" - php_version: "7.3" - php_ver_short: "7" - mode: debug - with_server: "false" - with_database: "false" - os: "alpine" os_version: "3.12" php_version: "7.3" @@ -120,27 +85,6 @@ jobs: mode: full with_server: "apache" with_database: "postgresql" - - os: "alpine" - os_version: "3.12" - php_version: "7.3" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "false" - - os: "alpine" - os_version: "3.12" - php_version: "7.3" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "mysql" - - os: "alpine" - os_version: "3.12" - php_version: "7.3" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "postgresql" - os: "alpine" os_version: "3.9" @@ -156,13 +100,6 @@ jobs: mode: full with_server: "false" with_database: "false" - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: debug - with_server: "false" - with_database: "false" - os: "alpine" os_version: "3.9" php_version: "7.2" @@ -184,27 +121,7 @@ jobs: mode: full with_server: "apache" with_database: "postgresql" - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "false" - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "mysql" - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: debug - with_server: "apache" - with_database: "postgresql" + steps: - name: Check out repository code uses: actions/checkout@v4 diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh index 0dbd77d..4c6cc98 100644 --- a/7/scripts/alpine-setup.sh +++ b/7/scripts/alpine-setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -PHP_LIST="bcmath,brotli,bz2,calendar,cgi, +PHP_LIST="bcmath,bz2,calendar,cgi, ctype,curl,dba,dom,embed, enchant,exif,fileinfo,ftp,gd, gettext,gmp,imap,intl, From e8af87d5b3fe06e7e8b38f44495f651882bbcc72 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 03:47:13 +0700 Subject: [PATCH 07/14] Added user php with uid 10000 --- 7/Dockerfile.alpine | 2 ++ 7/scripts/alpine-setup.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/7/Dockerfile.alpine b/7/Dockerfile.alpine index c139c50..77b6af4 100644 --- a/7/Dockerfile.alpine +++ b/7/Dockerfile.alpine @@ -64,6 +64,8 @@ COPY --from=builder / / WORKDIR /app +USER php + STOPSIGNAL SIGQUIT CMD ["/usr/bin/php", "-v"] diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh index 4c6cc98..fd69074 100644 --- a/7/scripts/alpine-setup.sh +++ b/7/scripts/alpine-setup.sh @@ -15,8 +15,10 @@ SERVER_ROOT="/app" APP_ROOT="$SERVER_ROOT/htdocs" LOG_LEVEL="info" -# Setup php flavor +/usr/sbin/addgroup -g 10000 php ; +/usr/sbin/adduser -D -u 10000 -G php -s /bin/sh -h $APP_ROOT php ; +# Setup php flavor if [[ "$FLAVOR" == "debug" ]]; then LOG_LEVEL="debug" /sbin/apk add --update --no-cache php$PHP_VER_SHORT-dbg \ From 5d1d47aa7e64d08a4c141a3423d9a0e834bbeb58 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 04:32:01 +0700 Subject: [PATCH 08/14] Fixed entrypoint permission --- 7/Dockerfile.apache-alpine | 2 +- 7/scripts/alpine-setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/7/Dockerfile.apache-alpine b/7/Dockerfile.apache-alpine index 1275a0e..d2c5701 100644 --- a/7/Dockerfile.apache-alpine +++ b/7/Dockerfile.apache-alpine @@ -33,7 +33,7 @@ RUN /bin/mkdir -p /app ; \ php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \ php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring ; \ - /bin/chmod +x /tmp/setup.sh /usr/local/bin/entrypoint.sh /usr/local/bin/composer; \ + /bin/chmod +rx /tmp/setup.sh /usr/local/bin/entrypoint.sh /usr/local/bin/composer; \ /bin/sh /tmp/setup.sh; \ /bin/rm -f /tmp/*.sh; diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh index fd69074..e9b33bf 100644 --- a/7/scripts/alpine-setup.sh +++ b/7/scripts/alpine-setup.sh @@ -16,7 +16,7 @@ APP_ROOT="$SERVER_ROOT/htdocs" LOG_LEVEL="info" /usr/sbin/addgroup -g 10000 php ; -/usr/sbin/adduser -D -u 10000 -G php -s /bin/sh -h $APP_ROOT php ; +/usr/sbin/adduser -D -u 10000 -G php -s /bin/sh -h $SERVER_ROOT php ; # Setup php flavor if [[ "$FLAVOR" == "debug" ]]; then From 5a39b19d12cefefa15ca89fc3653242e872e6691 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 13:41:06 +0700 Subject: [PATCH 09/14] Fixed docker command on php 7 apache --- 7/Dockerfile.apache-alpine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7/Dockerfile.apache-alpine b/7/Dockerfile.apache-alpine index d2c5701..5c54004 100644 --- a/7/Dockerfile.apache-alpine +++ b/7/Dockerfile.apache-alpine @@ -79,4 +79,4 @@ WORKDIR /app/htdocs STOPSIGNAL SIGQUIT -CMD ["/usr/bin/php", "-v"] +CMD ["/usr/local/bin/entrypoint.sh"] From 4e294414b84399e3758e25c35c4df5b7a25d06dd Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 13:42:45 +0700 Subject: [PATCH 10/14] Updated apache alpine dockerfile --- 7/Dockerfile.apache-alpine | 2 +- scripts/{entrypoint.sh => apache-entrypoint.sh} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename scripts/{entrypoint.sh => apache-entrypoint.sh} (100%) diff --git a/7/Dockerfile.apache-alpine b/7/Dockerfile.apache-alpine index 5c54004..9e73181 100644 --- a/7/Dockerfile.apache-alpine +++ b/7/Dockerfile.apache-alpine @@ -24,7 +24,7 @@ ENV COMPOSER_VERSION=${COMPOSER_VERSION} WORKDIR /root ADD 7/scripts/alpine-setup.sh /tmp/setup.sh -ADD scripts/entrypoint.sh /usr/local/bin/ +ADD scripts/apache-entrypoint.sh /usr/local/bin/entrypoint.sh ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer # Create directory, and install required php app diff --git a/scripts/entrypoint.sh b/scripts/apache-entrypoint.sh similarity index 100% rename from scripts/entrypoint.sh rename to scripts/apache-entrypoint.sh From 5554649963535fb97773bc12a51afbfc383d4c32 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 13:59:57 +0700 Subject: [PATCH 11/14] Added builder image for all build --- .gitea/workflows/php7-alpine.yaml | 309 +++++++++--------- ...apache-alpine => Dockerfile.alpine-apache} | 0 7/Dockerfile.alpine-builder | 43 +++ 7/scripts/alpine-setup.sh | 52 ++- 4 files changed, 225 insertions(+), 179 deletions(-) rename 7/{Dockerfile.apache-alpine => Dockerfile.alpine-apache} (100%) create mode 100644 7/Dockerfile.alpine-builder diff --git a/.gitea/workflows/php7-alpine.yaml b/.gitea/workflows/php7-alpine.yaml index f644950..a92709b 100644 --- a/.gitea/workflows/php7-alpine.yaml +++ b/.gitea/workflows/php7-alpine.yaml @@ -6,8 +6,8 @@ on: - php7-alpine jobs: - build: - name: Build PHP 7 container images + builder: + name: Build PHP 7 builder container images runs-on: ubuntu-latest container: image: ghcr.io/catthehacker/ubuntu:act-latest @@ -15,113 +15,17 @@ jobs: matrix: flavors: - os: "alpine" - os_version: "3.15" - php_version: "7.4" + os_version: "3.9" + php_version: "7.2" php_ver_short: "7" - mode: cli - with_server: "false" - with_database: "false" - - os: "alpine" - os_version: "3.15" - php_version: "7.4" - php_ver_short: "7" - mode: full - with_server: "false" - with_database: "false" - - os: "alpine" - os_version: "3.15" - php_version: "7.4" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "false" - - os: "alpine" - os_version: "3.15" - php_version: "7.4" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "mysql" - - os: "alpine" - os_version: "3.15" - php_version: "7.4" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "postgresql" - - os: "alpine" os_version: "3.12" php_version: "7.3" php_ver_short: "7" - mode: cli - with_server: "false" - with_database: "false" - os: "alpine" - os_version: "3.12" - php_version: "7.3" + os_version: "3.15" + php_version: "7.4" php_ver_short: "7" - mode: full - with_server: "false" - with_database: "false" - - os: "alpine" - os_version: "3.12" - php_version: "7.3" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "false" - - os: "alpine" - os_version: "3.12" - php_version: "7.3" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "mysql" - - os: "alpine" - os_version: "3.12" - php_version: "7.3" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "postgresql" - - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: cli - with_server: "false" - with_database: "false" - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: full - with_server: "false" - with_database: "false" - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "false" - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "mysql" - - os: "alpine" - os_version: "3.9" - php_version: "7.2" - php_ver_short: "7" - mode: full - with_server: "apache" - with_database: "postgresql" - steps: - name: Check out repository code uses: actions/checkout@v4 @@ -135,58 +39,134 @@ jobs: # uses: docker/setup-qemu-action@v3 - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 - - if: ${{ matrix.flavors.with_server == 'false' && matrix.flavors.with_database == 'false' }} - name: Build and push php7 + - name: Build and push php7 builder uses: docker/build-push-action@v5 with: push: true context: . - file: 7/Dockerfile.${{ matrix.flavors.os }} + file: 7/Dockerfile.${{ matrix.flavors.os }}-builder build-args: | OS_VERSION=${{ matrix.flavors.os_version }} - FLAVOR=${{ matrix.flavors.mode }} PHP_VERSION=${{ matrix.flavors.php_version }} PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} tags: | - quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.os }} - - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database == 'false' }} - name: Build and push php7 with webserver - uses: docker/build-push-action@v5 - with: - push: true - context: . - file: 7/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} - build-args: | - OS_VERSION=${{ matrix.flavors.os_version }} - FLAVOR=${{ matrix.flavors.mode }} - PHP_VERSION=${{ matrix.flavors.php_version }} - PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} - WITH_APACHE=true - tags: | - quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} - - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database != 'false' }} - name: Build and push php7 with apache2 and database connector library - uses: docker/build-push-action@v5 - with: - push: true - context: . - file: 7/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} - build-args: | - OS_VERSION=${{ matrix.flavors.os_version }} - FLAVOR=${{ matrix.flavors.mode }} - PHP_VERSION=${{ matrix.flavors.php_version }} - PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} - WITH_APACHE=true - WITH_DATABASE=${{ matrix.flavors.with_database }} - tags: | - quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.with_database }}-${{ matrix.flavors.os }} - # build-latest: - # name: Build latest nginx alpine based container images + quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-builder-${{ matrix.flavors.os }} + # flavors: + # name: Build PHP 7 container images # runs-on: ubuntu-latest - # needs: - # - build # container: # image: ghcr.io/catthehacker/ubuntu:act-latest + # strategy: + # matrix: + # flavors: + # - os: "alpine" + # os_version: "3.15" + # php_version: "7.4" + # php_ver_short: "7" + # mode: cli + # with_server: "false" + # with_database: "false" + # - os: "alpine" + # os_version: "3.15" + # php_version: "7.4" + # php_ver_short: "7" + # mode: full + # with_server: "false" + # with_database: "false" + # - os: "alpine" + # os_version: "3.15" + # php_version: "7.4" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "false" + # - os: "alpine" + # os_version: "3.15" + # php_version: "7.4" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "mysql" + # - os: "alpine" + # os_version: "3.15" + # php_version: "7.4" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "postgresql" + + # - os: "alpine" + # os_version: "3.12" + # php_version: "7.3" + # php_ver_short: "7" + # mode: cli + # with_server: "false" + # with_database: "false" + # - os: "alpine" + # os_version: "3.12" + # php_version: "7.3" + # php_ver_short: "7" + # mode: full + # with_server: "false" + # with_database: "false" + # - os: "alpine" + # os_version: "3.12" + # php_version: "7.3" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "false" + # - os: "alpine" + # os_version: "3.12" + # php_version: "7.3" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "mysql" + # - os: "alpine" + # os_version: "3.12" + # php_version: "7.3" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "postgresql" + + # - os: "alpine" + # os_version: "3.9" + # php_version: "7.2" + # php_ver_short: "7" + # mode: cli + # with_server: "false" + # with_database: "false" + # - os: "alpine" + # os_version: "3.9" + # php_version: "7.2" + # php_ver_short: "7" + # mode: full + # with_server: "false" + # with_database: "false" + # - os: "alpine" + # os_version: "3.9" + # php_version: "7.2" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "false" + # - os: "alpine" + # os_version: "3.9" + # php_version: "7.2" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "mysql" + # - os: "alpine" + # os_version: "3.9" + # php_version: "7.2" + # php_ver_short: "7" + # mode: full + # with_server: "apache" + # with_database: "postgresql" + # steps: # - name: Check out repository code # uses: actions/checkout@v4 @@ -200,13 +180,48 @@ jobs: # # uses: docker/setup-qemu-action@v3 # - name: Setup Docker buildx # uses: docker/setup-buildx-action@v3 - # - name: Build and push latest nginx + # - if: ${{ matrix.flavors.with_server == 'false' && matrix.flavors.with_database == 'false' }} + # name: Build and push php7 # uses: docker/build-push-action@v5 # with: - # # platforms: linux/amd64,linux/arm64 # push: true # context: . - # file: Dockerfile.alpine + # file: 7/Dockerfile.${{ matrix.flavors.os }} + # build-args: | + # OS_VERSION=${{ matrix.flavors.os_version }} + # FLAVOR=${{ matrix.flavors.mode }} + # PHP_VERSION=${{ matrix.flavors.php_version }} + # PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} # tags: | - # quay.io/sindigilive/nginx:alpine - # quay.io/sindigilive/nginx:latest + # quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.os }} + # - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database == 'false' }} + # name: Build and push php7 with webserver + # uses: docker/build-push-action@v5 + # with: + # push: true + # context: . + # file: 7/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} + # build-args: | + # OS_VERSION=${{ matrix.flavors.os_version }} + # FLAVOR=${{ matrix.flavors.mode }} + # PHP_VERSION=${{ matrix.flavors.php_version }} + # PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} + # WITH_APACHE=true + # tags: | + # quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} + # - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database != 'false' }} + # name: Build and push php7 with apache2 and database connector library + # uses: docker/build-push-action@v5 + # with: + # push: true + # context: . + # file: 7/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} + # build-args: | + # OS_VERSION=${{ matrix.flavors.os_version }} + # FLAVOR=${{ matrix.flavors.mode }} + # PHP_VERSION=${{ matrix.flavors.php_version }} + # PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} + # WITH_APACHE=true + # WITH_DATABASE=${{ matrix.flavors.with_database }} + # tags: | + # quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.with_database }}-${{ matrix.flavors.os }} \ No newline at end of file diff --git a/7/Dockerfile.apache-alpine b/7/Dockerfile.alpine-apache similarity index 100% rename from 7/Dockerfile.apache-alpine rename to 7/Dockerfile.alpine-apache diff --git a/7/Dockerfile.alpine-builder b/7/Dockerfile.alpine-builder new file mode 100644 index 0000000..9ad1121 --- /dev/null +++ b/7/Dockerfile.alpine-builder @@ -0,0 +1,43 @@ +# PHP 7.2 == 3.9 +# PHP 7.3 == 3.12 +# PHP 7.4 == 3.15 +ARG OS_VERSION=3.15 + +FROM quay.io/sindigilive/alpine:${OS_VERSION} AS builder +LABEL maintainer=" map@sindigilive.com" + +ARG WITH_APACHE=false +ARG WITH_DATABASE=false +ARG PHP_VERSION=7.4 +ARG PHP_VER_SHORT=7 +ARG COMPOSER_VERSION=2.8.4 + +ENV WITH_APACHE=${WITH_APACHE} +ENV WITH_DATABASE=${WITH_DATABASE} +ENV PHP_VERSION=${PHP_VERSION} +ENV PHP_VER_SHORT=${PHP_VER_SHORT} +ENV COMPOSER_VERSION=${COMPOSER_VERSION} +ENV SERVER_ROOT=/app + +WORKDIR ${SERVER_ROOT} + +ADD 7/scripts/alpine-setup.sh /tmp/setup.sh +ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer + +# Create directory, and install required php app +RUN /bin/mkdir -p /app ; \ + /usr/sbin/addgroup -g 10000 php ; \ + /usr/sbin/adduser -D -u 10000 -G php -s /bin/sh -h $SERVER_ROOT php ; \ + /bin/chown -R php:php /app ; \ + /sbin/apk add --update --no-cache \ + php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ + php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \ + php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring \ + php${PHP_VER_SHORT}-json ; \ + /bin/chmod +x /tmp/setup.sh /usr/local/bin/composer ; + +# Create symlinks to /usr/bin/php in case it doesn't exists +RUN ln -ns /usr/bin/php${PHP_VER_SHORT} /usr/bin/php ; exit 0 + +# CLEAN APK CACHES +RUN rm -vrf /var/cache/apk/* \ No newline at end of file diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh index e9b33bf..8e36604 100644 --- a/7/scripts/alpine-setup.sh +++ b/7/scripts/alpine-setup.sh @@ -4,7 +4,7 @@ PHP_LIST="bcmath,bz2,calendar,cgi, ctype,curl,dba,dom,embed, enchant,exif,fileinfo,ftp,gd, gettext,gmp,imap,intl, -json,ldap,opcache,openssl, +ldap,opcache,openssl, pcntl,pdo,pear,posix, pspell,shmop,snmp,soap,sockets, sysvmsg,sysvsem,sysvshm,tidy,tokenizer, @@ -15,17 +15,7 @@ SERVER_ROOT="/app" APP_ROOT="$SERVER_ROOT/htdocs" LOG_LEVEL="info" -/usr/sbin/addgroup -g 10000 php ; -/usr/sbin/adduser -D -u 10000 -G php -s /bin/sh -h $SERVER_ROOT php ; - -# Setup php flavor -if [[ "$FLAVOR" == "debug" ]]; then - LOG_LEVEL="debug" - /sbin/apk add --update --no-cache php$PHP_VER_SHORT-dbg \ - php$PHP_VER_SHORT-phpdbg php$PHP_VER_SHORT-dev; -fi - -if [ "$FLAVOR" == "full" ] || [ "$FLAVOR" == "debug" ]; then +if [ "$FLAVOR" == "full" ] then for i in $(echo $PHP_LIST | tr "," "\n"); do PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i "; done @@ -35,27 +25,25 @@ fi # Only setup apache with full flavor parameters if [ "$WITH_APACHE" == "true" ]; then - if [ "$FLAVOR" == "full" ] || [ "$FLAVOR" == "debug" ]; then - /usr/sbin/addgroup -g 10001 apache ; - /usr/sbin/adduser -D -u 10001 -G apache -s /bin/sh -h $APP_ROOT apache ; - /sbin/apk add --update --no-cache apache2 php$PHP_VER_SHORT-apache2 ; + /usr/sbin/addgroup -g 10001 apache ; + /usr/sbin/adduser -D -u 10001 -G apache -s /bin/sh -h $APP_ROOT apache ; + /sbin/apk add --update --no-cache apache2 php$PHP_VER_SHORT-apache2 ; - sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf ; - sed -i "s|ServerAdmin you@example.com| ServerAdmin map@sindigilive.com|" /etc/apache2/httpd.conf ; - sed -i "s|DocumentRoot \"/var/www/localhost/htdocs\"|DocumentRoot \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ; - sed -i "s|Directory \"/var/www/localhost/htdocs\"|Directory \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ; - sed -i "s|AllowOverride None|AllowOverride All|" /etc/apache2/httpd.conf ; - sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/apache2/httpd.conf ; - sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/apache2/httpd.conf ; - sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/apache2/httpd.conf ; - sed -i "s|#LoadModule rewrite_module|LoadModule rewrite_module|" /etc/apache2/httpd.conf ; - sed -i "s|#LoadModule deflate_module|LoadModule deflate_module|" /etc/apache2/httpd.conf ; - sed -i "s|#LoadModule expires_module|LoadModule expires_module|" /etc/apache2/httpd.conf ; - sed -i "s|/var/www/localhost/cgi-bin/|/app/cgi-bin/|" /etc/apache2/httpd.conf ; - sed -i "s|Require host .example.com|#Require host .example.com|" /etc/apache2/conf.d/info.conf ; - sed -i "s|Require ip 127|Require all granted|" /etc/apache2/conf.d/info.conf ; - sed -i "s|/run/apache2/httpd.pid|${SERVER_ROOT}/run/httpd.pid|" /etc/apache2/conf.d/mpm.conf ; - fi + sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf ; + sed -i "s|ServerAdmin you@example.com| ServerAdmin map@sindigilive.com|" /etc/apache2/httpd.conf ; + sed -i "s|DocumentRoot \"/var/www/localhost/htdocs\"|DocumentRoot \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ; + sed -i "s|Directory \"/var/www/localhost/htdocs\"|Directory \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ; + sed -i "s|AllowOverride None|AllowOverride All|" /etc/apache2/httpd.conf ; + sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/apache2/httpd.conf ; + sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/apache2/httpd.conf ; + sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/apache2/httpd.conf ; + sed -i "s|#LoadModule rewrite_module|LoadModule rewrite_module|" /etc/apache2/httpd.conf ; + sed -i "s|#LoadModule deflate_module|LoadModule deflate_module|" /etc/apache2/httpd.conf ; + sed -i "s|#LoadModule expires_module|LoadModule expires_module|" /etc/apache2/httpd.conf ; + sed -i "s|/var/www/localhost/cgi-bin/|/app/cgi-bin/|" /etc/apache2/httpd.conf ; + sed -i "s|Require host .example.com|#Require host .example.com|" /etc/apache2/conf.d/info.conf ; + sed -i "s|Require ip 127|Require all granted|" /etc/apache2/conf.d/info.conf ; + sed -i "s|/run/apache2/httpd.pid|${SERVER_ROOT}/run/httpd.pid|" /etc/apache2/conf.d/mpm.conf ; fi if [ "$WITH_DATABASE" == "postgresql" ]; then From f9a47ed3a94fbbe2138956b2c0caf3d1be7b4731 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 14:05:53 +0700 Subject: [PATCH 12/14] Updated builder setup --- 7/Dockerfile.alpine-builder | 2 +- 7/scripts/alpine-setup.sh | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/7/Dockerfile.alpine-builder b/7/Dockerfile.alpine-builder index 9ad1121..f7b32ec 100644 --- a/7/Dockerfile.alpine-builder +++ b/7/Dockerfile.alpine-builder @@ -3,7 +3,7 @@ # PHP 7.4 == 3.15 ARG OS_VERSION=3.15 -FROM quay.io/sindigilive/alpine:${OS_VERSION} AS builder +FROM quay.io/sindigilive/alpine:${OS_VERSION} LABEL maintainer=" map@sindigilive.com" ARG WITH_APACHE=false diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh index 8e36604..8271934 100644 --- a/7/scripts/alpine-setup.sh +++ b/7/scripts/alpine-setup.sh @@ -15,15 +15,13 @@ SERVER_ROOT="/app" APP_ROOT="$SERVER_ROOT/htdocs" LOG_LEVEL="info" -if [ "$FLAVOR" == "full" ] then - for i in $(echo $PHP_LIST | tr "," "\n"); do - PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i "; - done +for i in $(echo $PHP_LIST | tr "," "\n"); do + PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i "; +done /sbin/apk add --update --no-cache $PHP_DEPS; -fi -# Only setup apache with full flavor parameters +# Setup apache2 if [ "$WITH_APACHE" == "true" ]; then /usr/sbin/addgroup -g 10001 apache ; /usr/sbin/adduser -D -u 10001 -G apache -s /bin/sh -h $APP_ROOT apache ; From 3db317a6820fc767b08803c521caea0b3bf57b63 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 14:26:33 +0700 Subject: [PATCH 13/14] Updated php7 dockerfile and workflows --- .gitea/workflows/php7-alpine.yaml | 311 +++++++++++++----------------- 7/Dockerfile.alpine | 38 +--- 7/Dockerfile.alpine-apache | 47 +---- 7/Dockerfile.alpine-builder | 4 - 4 files changed, 152 insertions(+), 248 deletions(-) diff --git a/.gitea/workflows/php7-alpine.yaml b/.gitea/workflows/php7-alpine.yaml index a92709b..0a32c0d 100644 --- a/.gitea/workflows/php7-alpine.yaml +++ b/.gitea/workflows/php7-alpine.yaml @@ -51,177 +51,144 @@ jobs: PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} tags: | quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-builder-${{ matrix.flavors.os }} - # flavors: - # name: Build PHP 7 container images - # runs-on: ubuntu-latest - # container: - # image: ghcr.io/catthehacker/ubuntu:act-latest - # strategy: - # matrix: - # flavors: - # - os: "alpine" - # os_version: "3.15" - # php_version: "7.4" - # php_ver_short: "7" - # mode: cli - # with_server: "false" - # with_database: "false" - # - os: "alpine" - # os_version: "3.15" - # php_version: "7.4" - # php_ver_short: "7" - # mode: full - # with_server: "false" - # with_database: "false" - # - os: "alpine" - # os_version: "3.15" - # php_version: "7.4" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "false" - # - os: "alpine" - # os_version: "3.15" - # php_version: "7.4" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "mysql" - # - os: "alpine" - # os_version: "3.15" - # php_version: "7.4" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "postgresql" - - # - os: "alpine" - # os_version: "3.12" - # php_version: "7.3" - # php_ver_short: "7" - # mode: cli - # with_server: "false" - # with_database: "false" - # - os: "alpine" - # os_version: "3.12" - # php_version: "7.3" - # php_ver_short: "7" - # mode: full - # with_server: "false" - # with_database: "false" - # - os: "alpine" - # os_version: "3.12" - # php_version: "7.3" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "false" - # - os: "alpine" - # os_version: "3.12" - # php_version: "7.3" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "mysql" - # - os: "alpine" - # os_version: "3.12" - # php_version: "7.3" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "postgresql" + flavors: + name: Build PHP 7 container images + runs-on: ubuntu-latest + needs: + - builder + container: + image: ghcr.io/catthehacker/ubuntu:act-latest + strategy: + matrix: + flavors: + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + with_server: "false" + with_database: "false" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + with_server: "false" + with_database: "false" + - os: "alpine" + os_version: "3.15" + php_version: "7.4" + php_ver_short: "7" + with_server: "false" + with_database: "false" - # - os: "alpine" - # os_version: "3.9" - # php_version: "7.2" - # php_ver_short: "7" - # mode: cli - # with_server: "false" - # with_database: "false" - # - os: "alpine" - # os_version: "3.9" - # php_version: "7.2" - # php_ver_short: "7" - # mode: full - # with_server: "false" - # with_database: "false" - # - os: "alpine" - # os_version: "3.9" - # php_version: "7.2" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "false" - # - os: "alpine" - # os_version: "3.9" - # php_version: "7.2" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "mysql" - # - os: "alpine" - # os_version: "3.9" - # php_version: "7.2" - # php_ver_short: "7" - # mode: full - # with_server: "apache" - # with_database: "postgresql" + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + with_server: "apache" + with_database: "false" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + with_server: "apache" + with_database: "false" + - os: "alpine" + os_version: "3.15" + php_version: "7.4" + php_ver_short: "7" + with_server: "apache" + with_database: "false" - # steps: - # - name: Check out repository code - # uses: actions/checkout@v4 - # - name: Login to quay.io - # uses: docker/login-action@v3 - # with: - # registry: quay.io - # username: ${{ vars.QUAY_USERNAME }} - # password: ${{ secrets.QUAY_SECRET }} - # # - name: Set up QEMU - # # uses: docker/setup-qemu-action@v3 - # - name: Setup Docker buildx - # uses: docker/setup-buildx-action@v3 - # - if: ${{ matrix.flavors.with_server == 'false' && matrix.flavors.with_database == 'false' }} - # name: Build and push php7 - # uses: docker/build-push-action@v5 - # with: - # push: true - # context: . - # file: 7/Dockerfile.${{ matrix.flavors.os }} - # build-args: | - # OS_VERSION=${{ matrix.flavors.os_version }} - # FLAVOR=${{ matrix.flavors.mode }} - # PHP_VERSION=${{ matrix.flavors.php_version }} - # PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} - # tags: | - # quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.os }} - # - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database == 'false' }} - # name: Build and push php7 with webserver - # uses: docker/build-push-action@v5 - # with: - # push: true - # context: . - # file: 7/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} - # build-args: | - # OS_VERSION=${{ matrix.flavors.os_version }} - # FLAVOR=${{ matrix.flavors.mode }} - # PHP_VERSION=${{ matrix.flavors.php_version }} - # PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} - # WITH_APACHE=true - # tags: | - # quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} - # - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database != 'false' }} - # name: Build and push php7 with apache2 and database connector library - # uses: docker/build-push-action@v5 - # with: - # push: true - # context: . - # file: 7/Dockerfile.${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} - # build-args: | - # OS_VERSION=${{ matrix.flavors.os_version }} - # FLAVOR=${{ matrix.flavors.mode }} - # PHP_VERSION=${{ matrix.flavors.php_version }} - # PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} - # WITH_APACHE=true - # WITH_DATABASE=${{ matrix.flavors.with_database }} - # tags: | - # quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.mode }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.with_database }}-${{ matrix.flavors.os }} \ No newline at end of file + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + with_server: "apache" + with_database: "mysql" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + with_server: "apache" + with_database: "mysql" + - os: "alpine" + os_version: "3.15" + php_version: "7.4" + php_ver_short: "7" + with_server: "apache" + with_database: "mysql" + + - os: "alpine" + os_version: "3.9" + php_version: "7.2" + php_ver_short: "7" + with_server: "apache" + with_database: "postgresql" + - os: "alpine" + os_version: "3.12" + php_version: "7.3" + php_ver_short: "7" + with_server: "apache" + with_database: "postgresql" + - os: "alpine" + os_version: "3.15" + php_version: "7.4" + php_ver_short: "7" + with_server: "apache" + with_database: "postgresql" + + steps: + - name: Check out repository code + uses: actions/checkout@v4 + - name: Login to quay.io + uses: docker/login-action@v3 + with: + registry: quay.io + username: ${{ vars.QUAY_USERNAME }} + password: ${{ secrets.QUAY_SECRET }} + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 + - name: Setup Docker buildx + uses: docker/setup-buildx-action@v3 + - if: ${{ matrix.flavors.with_server == 'false' && matrix.flavors.with_database == 'false' }} + name: Build and push php7 + uses: docker/build-push-action@v5 + with: + push: true + context: . + file: 7/Dockerfile.${{ matrix.flavors.os }} + build-args: | + OS_VERSION=${{ matrix.flavors.os_version }} + PHP_VERSION=${{ matrix.flavors.php_version }} + PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} + tags: | + quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.os }} + - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database == 'false' }} + name: Build and push php7 with webserver + uses: docker/build-push-action@v5 + with: + push: true + context: . + file: 7/Dockerfile.${{ matrix.flavors.os }}-${{ matrix.flavors.with_server }} + build-args: | + OS_VERSION=${{ matrix.flavors.os_version }} + PHP_VERSION=${{ matrix.flavors.php_version }} + PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} + WITH_APACHE=true + tags: | + quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.os }} + - if: ${{ matrix.flavors.with_server != 'false' && matrix.flavors.with_database != 'false' }} + name: Build and push php7 with webserver and database connector library + uses: docker/build-push-action@v5 + with: + push: true + context: . + file: 7/Dockerfile.${{ matrix.flavors.os }}-${{ matrix.flavors.with_server }} + build-args: | + OS_VERSION=${{ matrix.flavors.os_version }} + PHP_VERSION=${{ matrix.flavors.php_version }} + PHP_VER_SHORT=${{ matrix.flavors.php_ver_short }} + WITH_APACHE=true + WITH_DATABASE=${{ matrix.flavors.with_database }} + tags: | + quay.io/sindigilive/php:${{ matrix.flavors.php_version }}-${{ matrix.flavors.with_server }}-${{ matrix.flavors.with_database }}-${{ matrix.flavors.os }} \ No newline at end of file diff --git a/7/Dockerfile.alpine b/7/Dockerfile.alpine index 77b6af4..c92a8d8 100644 --- a/7/Dockerfile.alpine +++ b/7/Dockerfile.alpine @@ -2,49 +2,25 @@ # PHP 7.3 == 3.12 # PHP 7.4 == 3.15 ARG OS_VERSION=3.15 +ARG PHP_VERSION=7.4 -FROM quay.io/sindigilive/alpine:${OS_VERSION} AS builder -LABEL maintainer=" map@sindigilive.com" +FROM quay.io/sindigilive/php:${PHP_VERSION}-builder-alpine AS builder -ARG FLAVOR=cli ARG WITH_APACHE=false ARG WITH_DATABASE=false -ARG PHP_VERSION=7.4 -ARG PHP_VER_SHORT=7 -ARG COMPOSER_VERSION=2.8.4 -ENV FLAVOR=${FLAVOR} ENV WITH_APACHE=${WITH_APACHE} ENV WITH_DATABASE=${WITH_DATABASE} -ENV PHP_VERSION=${PHP_VERSION} -ENV PHP_VER_SHORT=${PHP_VER_SHORT} -ENV COMPOSER_VERSION=${COMPOSER_VERSION} - -WORKDIR /root - -ADD 7/scripts/alpine-setup.sh /tmp/setup.sh -ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer # Create directory, and install required php app -RUN /bin/mkdir -p /app ; \ - /sbin/apk add --update --no-cache \ - php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ - php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \ - php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring ; \ - /bin/chmod +x /tmp/setup.sh /usr/local/bin/composer ; \ - /bin/sh /tmp/setup.sh; \ - /bin/rm -f /tmp/*.sh; - -# Create symlinks to /usr/bin/php in case it doesn't exists -RUN ln -ns /usr/bin/php${PHP_VER_SHORT} /usr/bin/php ; exit 0 - -# CLEAN APK CACHES -RUN rm -vrf /var/cache/apk/* +RUN /bin/sh /tmp/setup.sh; \ + /bin/rm -f /tmp/*.sh; \ + rm -vrf /var/cache/apk/* FROM scratch -ARG PHP_VERSION=5.6 -ARG PHP_VER_SHORT=5 +ARG PHP_VERSION=7.4 +ARG PHP_VER_SHORT=7 ENV PHP_VERSION=${PHP_VERSION} ENV PHP_VER_SHORT=${PHP_VER_SHORT} diff --git a/7/Dockerfile.alpine-apache b/7/Dockerfile.alpine-apache index 9e73181..7a60849 100644 --- a/7/Dockerfile.alpine-apache +++ b/7/Dockerfile.alpine-apache @@ -2,60 +2,25 @@ # PHP 7.3 == 3.12 # PHP 7.4 == 3.15 ARG OS_VERSION=3.15 +ARG PHP_VERSION=7.4 -FROM quay.io/sindigilive/alpine:${OS_VERSION} AS builder -LABEL maintainer=" map@sindigilive.com" +FROM quay.io/sindigilive/php:${PHP_VERSION}-builder-alpine AS builder -ARG FLAVOR=cli ARG WITH_APACHE=false ARG WITH_DATABASE=false -ARG PHP_VERSION=7.4 -ARG PHP_VER_SHORT=7 -ARG COMPOSER_VERSION=2.8.4 -ENV FLAVOR=${FLAVOR} ENV WITH_APACHE=${WITH_APACHE} ENV WITH_DATABASE=${WITH_DATABASE} -ENV PHP_VERSION=${PHP_VERSION} -ENV PHP_VER_SHORT=${PHP_VER_SHORT} -ENV SERVER_ROOT=/app -ENV COMPOSER_VERSION=${COMPOSER_VERSION} - -WORKDIR /root - -ADD 7/scripts/alpine-setup.sh /tmp/setup.sh -ADD scripts/apache-entrypoint.sh /usr/local/bin/entrypoint.sh -ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer # Create directory, and install required php app -RUN /bin/mkdir -p /app ; \ - /sbin/apk add --update --no-cache \ - php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \ - php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \ - php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring ; \ - /bin/chmod +rx /tmp/setup.sh /usr/local/bin/entrypoint.sh /usr/local/bin/composer; \ - /bin/sh /tmp/setup.sh; \ - /bin/rm -f /tmp/*.sh; - -ADD htdocs ${SERVER_ROOT}/htdocs - -# Create symlinks to /usr/bin/php in case it doesn't exists -RUN ln -ns /usr/bin/php${PHP_VER_SHORT} /usr/bin/php ; exit 0 - -# CLEAN APK CACHES -RUN sed -i "s|#version#|${PHP_VERSION}|" /app/htdocs/index.html ; \ - sed -i "s|#os#|alpine|" /app/htdocs/index.html ; \ - sed -i "s|#flavor#|${FLAVOR}|" /app/htdocs/index.html ; \ - mkdir -p ${SERVER_ROOT}/logs ${SERVER_ROOT}/run /run/apache2 ; \ - ln -s /usr/lib/apache2 ${SERVER_ROOT}/modules ; \ - chmod -R 755 ${SERVER_ROOT}/logs ${SERVER_ROOT/run} ; \ - chown -R apache:apache ${SERVER_ROOT}/htdocs ${SERVER_ROOT}/logs ${SERVER_ROOT}/run /run/apache2 ; \ +RUN /bin/sh /tmp/setup.sh; \ + /bin/rm -f /tmp/*.sh; \ rm -vrf /var/cache/apk/* FROM scratch -ARG PHP_VERSION=5.6 -ARG PHP_VER_SHORT=5 +ARG PHP_VERSION=7.4 +ARG PHP_VER_SHORT=7 ENV PHP_VERSION=${PHP_VERSION} ENV PHP_VER_SHORT=${PHP_VER_SHORT} diff --git a/7/Dockerfile.alpine-builder b/7/Dockerfile.alpine-builder index f7b32ec..9479e20 100644 --- a/7/Dockerfile.alpine-builder +++ b/7/Dockerfile.alpine-builder @@ -6,14 +6,10 @@ ARG OS_VERSION=3.15 FROM quay.io/sindigilive/alpine:${OS_VERSION} LABEL maintainer=" map@sindigilive.com" -ARG WITH_APACHE=false -ARG WITH_DATABASE=false ARG PHP_VERSION=7.4 ARG PHP_VER_SHORT=7 ARG COMPOSER_VERSION=2.8.4 -ENV WITH_APACHE=${WITH_APACHE} -ENV WITH_DATABASE=${WITH_DATABASE} ENV PHP_VERSION=${PHP_VERSION} ENV PHP_VER_SHORT=${PHP_VER_SHORT} ENV COMPOSER_VERSION=${COMPOSER_VERSION} From edcb233a460518195b568a0aa024e7f36c0b9f16 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 27 Dec 2024 14:55:56 +0700 Subject: [PATCH 14/14] Updated alpine-setup.sh --- ...apache-alpine => Dockerfile.alpine-apache} | 0 5/scripts/alpine-setup.sh | 56 ++++++++----------- 2 files changed, 24 insertions(+), 32 deletions(-) rename 5/{Dockerfile.apache-alpine => Dockerfile.alpine-apache} (100%) diff --git a/5/Dockerfile.apache-alpine b/5/Dockerfile.alpine-apache similarity index 100% rename from 5/Dockerfile.apache-alpine rename to 5/Dockerfile.alpine-apache diff --git a/5/scripts/alpine-setup.sh b/5/scripts/alpine-setup.sh index 903fae6..73eb4c9 100644 --- a/5/scripts/alpine-setup.sh +++ b/5/scripts/alpine-setup.sh @@ -6,7 +6,7 @@ dom,embed,enchant,exif,ftp, gd,gettext,gmp,iconv,imap, intl,json,ldap,mcrypt, opcache,openssl,pcntl,pdo, -pear,phar,phpdbg, +pear,phpdbg, posix,pspell,shmop, snmp,soap,sockets,sysvmsg,sysvsem, sysvshm,wddx,xml,xmlreader, @@ -19,42 +19,33 @@ LOG_LEVEL="info" # Setup php flavor -if [[ "$FLAVOR" == "debug" ]]; then - LOG_LEVEL="debug" - /sbin/apk add --update --no-cache php$PHP_VER_SHORT-dbg; -fi - -if [ "$FLAVOR" == "full" ] || [ "$FLAVOR" == "debug" ]; then - for i in $(echo $PHP_LIST | tr "," "\n"); do - PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i "; - done +for i in $(echo $PHP_LIST | tr "," "\n"); do + PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i "; +done /sbin/apk add --update --no-cache $PHP_DEPS; -fi # Only setup apache with full flavor parameters if [ "$WITH_APACHE" == "true" ]; then - if [ "$FLAVOR" == "full" ] || [ "$FLAVOR" == "debug" ]; then - /usr/sbin/addgroup -g 10002 apache ; - /usr/sbin/adduser -D -u 10002 -G apache -s /sbin/nologin -h $APP_ROOT apache ; - /sbin/apk add --update --no-cache apache2 php$PHP_VER_SHORT-apache2 ; + /usr/sbin/addgroup -g 10001 apache ; + /usr/sbin/adduser -D -u 10001 -G apache -s /sbin/nologin -h $APP_ROOT apache ; + /sbin/apk add --update --no-cache apache2 php$PHP_VER_SHORT-apache2 ; - sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf ; - sed -i "s|ServerAdmin you@example.com| ServerAdmin map@sindigilive.com|" /etc/apache2/httpd.conf ; - sed -i "s|DocumentRoot \"/var/www/localhost/htdocs\"|DocumentRoot \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ; - sed -i "s|Directory \"/var/www/localhost/htdocs\"|Directory \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ; - sed -i "s|AllowOverride None|AllowOverride All|" /etc/apache2/httpd.conf ; - sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/apache2/httpd.conf ; - sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/apache2/httpd.conf ; - sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/apache2/httpd.conf ; - sed -i "s|#LoadModule rewrite_module|LoadModule rewrite_module|" /etc/apache2/httpd.conf ; - sed -i "s|#LoadModule deflate_module|LoadModule deflate_module|" /etc/apache2/httpd.conf ; - sed -i "s|#LoadModule expires_module|LoadModule expires_module|" /etc/apache2/httpd.conf ; - sed -i "s|/var/www/localhost/cgi-bin/|/app/cgi-bin/|" /etc/apache2/httpd.conf ; - sed -i "s|Require host .example.com|#Require host .example.com|" /etc/apache2/conf.d/info.conf ; - sed -i "s|Require ip 127|Require all granted|" /etc/apache2/conf.d/info.conf ; - sed -i "s|/run/apache2/httpd.pid|${SERVER_ROOT}/run/httpd.pid|" /etc/apache2/conf.d/mpm.conf ; - fi + sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf ; + sed -i "s|ServerAdmin you@example.com| ServerAdmin map@sindigilive.com|" /etc/apache2/httpd.conf ; + sed -i "s|DocumentRoot \"/var/www/localhost/htdocs\"|DocumentRoot \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ; + sed -i "s|Directory \"/var/www/localhost/htdocs\"|Directory \"${APP_ROOT}\"|" /etc/apache2/httpd.conf ; + sed -i "s|AllowOverride None|AllowOverride All|" /etc/apache2/httpd.conf ; + sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/apache2/httpd.conf ; + sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/apache2/httpd.conf ; + sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/apache2/httpd.conf ; + sed -i "s|#LoadModule rewrite_module|LoadModule rewrite_module|" /etc/apache2/httpd.conf ; + sed -i "s|#LoadModule deflate_module|LoadModule deflate_module|" /etc/apache2/httpd.conf ; + sed -i "s|#LoadModule expires_module|LoadModule expires_module|" /etc/apache2/httpd.conf ; + sed -i "s|/var/www/localhost/cgi-bin/|/app/cgi-bin/|" /etc/apache2/httpd.conf ; + sed -i "s|Require host .example.com|#Require host .example.com|" /etc/apache2/conf.d/info.conf ; + sed -i "s|Require ip 127|Require all granted|" /etc/apache2/conf.d/info.conf ; + sed -i "s|/run/apache2/httpd.pid|${SERVER_ROOT}/run/httpd.pid|" /etc/apache2/conf.d/mpm.conf ; fi if [ "$WITH_DATABASE" == "postgresql" ]; then @@ -62,5 +53,6 @@ if [ "$WITH_DATABASE" == "postgresql" ]; then fi if [ "$WITH_DATABASE" == "mysql" ]; then - /sbin/apk add --update --no-cache php$PHP_VER_SHORT-pdo php$PHP_VER_SHORT-pdo_mysql php$PHP_VER_SHORT-mysql php$PHP_VER_SHORT-mysqli ; + /sbin/apk add --update --no-cache php$PHP_VER_SHORT-pdo php$PHP_VER_SHORT-pdo_mysql php$PHP_VER_SHORT-mysql \ + php$PHP_VER_SHORT-mysqli ; fi \ No newline at end of file