From d5421aa456a932d8c4958e845addc5c5fcb94345 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Mon, 16 Dec 2024 19:44:21 +0700 Subject: [PATCH] Updated php5 alpine --- 5/Dockerfile.alpine | 4 ++-- 5/Dockerfile.apache-alpine | 18 ++++++++++++------ 5/scripts/alpine-setup.sh | 4 +++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/5/Dockerfile.alpine b/5/Dockerfile.alpine index b55a03d..29c576f 100644 --- a/5/Dockerfile.alpine +++ b/5/Dockerfile.alpine @@ -1,5 +1,5 @@ -# PHP 5.6 == 3.5 -ARG OS_VERSION=3.5 +# PHP 5.6 == 3.6 +ARG OS_VERSION=3.6 FROM quay.io/sindigilive/alpine:${OS_VERSION} AS builder LABEL maintainer=" map@sindigilive.com" diff --git a/5/Dockerfile.apache-alpine b/5/Dockerfile.apache-alpine index 5ff8f9a..c9ef841 100644 --- a/5/Dockerfile.apache-alpine +++ b/5/Dockerfile.apache-alpine @@ -1,5 +1,5 @@ -# PHP 5.6 == 3.5 -ARG OS_VERSION=3.5 +# PHP 5.6 == 3.6 +ARG OS_VERSION=3.6 FROM quay.io/sindigilive/alpine:${OS_VERSION} AS builder LABEL maintainer=" map@sindigilive.com" @@ -13,11 +13,12 @@ ENV FLAVOR=${FLAVOR} ENV WITH_APACHE=${WITH_APACHE} ENV PHP_VERSION=${PHP_VERSION} ENV PHP_VER_SHORT=${PHP_VER_SHORT} +ENV SERVER_ROOT=/app WORKDIR /root ADD 5/scripts/alpine-setup.sh /tmp/setup.sh -ADD scripts/entrypoint.sh /usr/local/bin +ADD scripts/entrypoint.sh /usr/local/bin/ # Create directory, and install required php app RUN /bin/mkdir -p /app ; \ @@ -28,7 +29,7 @@ RUN /bin/mkdir -p /app ; \ /bin/sh /tmp/setup.sh; \ /bin/rm -f /tmp/*.sh; -ADD htdocs /app/htdocs +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 @@ -37,7 +38,10 @@ RUN ln -ns /usr/bin/php${PHP_VER_SHORT} /usr/bin/php ; exit 0 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 ; \ - chown apache:apache /app/htdocs; \ + 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 ; \ rm -vrf /var/cache/apk/* FROM scratch @@ -61,7 +65,9 @@ LABEL io.k8s.display-name="PHP ${PHP_VERSION}" COPY --from=builder / / -WORKDIR /app +USER apache + +WORKDIR /app/htdocs STOPSIGNAL SIGQUIT diff --git a/5/scripts/alpine-setup.sh b/5/scripts/alpine-setup.sh index 531bcca..3029f49 100644 --- a/5/scripts/alpine-setup.sh +++ b/5/scripts/alpine-setup.sh @@ -37,7 +37,7 @@ 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; + /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 ; @@ -50,7 +50,9 @@ if [ "$WITH_APACHE" == "true" ]; then 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 fi \ No newline at end of file