Merge branch 'main' of https://git.siane.kr/firstgarden/php-apache

# Conflicts: # 8.4/Dockerfile
2025-12-26 11:42:00 +09:00
parent 53a9c68922 627b404081
commit 8bc3744b0e
2 changed files with 134 additions and 131 deletions
--- a/8.2/Dockerfile
+++ b/8.2/Dockerfile
@ -1,143 +1,75 @@
 FROM php:8.2-apache
-# persistent dependencies
+
+# 기본 패키지
 RUN set -eux; \
    apt update; \
    apt install -y --no-install-recommends \
-# Ghostscript is required for rendering PDF previews
-                ghostscript \
-        ; \
-        rm -rf /var/lib/apt/lists/*
-# install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions)
-RUN set -ex; \
-        \
-        savedAptMark="$(apt-mark showmanual)"; \
-        \
-        apt update; \
-        apt install -y --no-install-recommends \
+        vim \
        unzip \
+        curl \
+        ghostscript \
        libfreetype6-dev \
        libicu-dev \
        libjpeg-dev \
-                libmagickwand-dev \
        libpng-dev \
        libwebp-dev \
        libzip-dev \
        libxml2-dev \
+        libmagickwand-dev \
    ; \
-	apt clean -y \
-        ;\
-	\
+    rm -rf /var/lib/apt/lists/*
+
+# PHP extensions (카페24 환경 최대한 유사)
+RUN set -eux; \
    docker-php-ext-configure gd \
        --with-freetype \
        --with-jpeg \
        --with-webp \
    ; \
-        docker-php-ext-install -j "$(nproc)" \
+    docker-php-ext-install -j$(nproc) \
        bcmath \
        exif \
        gd \
        intl \
        mysqli \
+        pdo_mysql \
        zip \
        soap \
+        opcache \
    ; \
-# https://pecl.php.net/package/imagick
    pecl install imagick-3.6.0; \
-        docker-php-ext-enable imagick; \
-        rm -r /tmp/pear; \
-        \
-# some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967)
-        out="$(php -r 'exit(0);')"; \
-        [ -z "$out" ]; \
-        err="$(php -r 'exit(0);' 3>&1 1>&2 2>&3)"; \
-        [ -z "$err" ]; \
-        \
-        extDir="$(php -r 'echo ini_get("extension_dir");')"; \
-        [ -d "$extDir" ]; \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-        apt-mark auto '.*' > /dev/null; \
-        apt-mark manual $savedAptMark; \
-        ldd "$extDir"/*.so \
-                | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
-                | sort -u \
-                | xargs -r dpkg-query --search \
-                | cut -d: -f1 \
-                | sort -u \
-                | xargs -rt apt-mark manual; \
-        \
-        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        rm -rf /var/lib/apt/lists/*; \
-        \
-        ! { ldd "$extDir"/*.so | grep 'not found'; }; \
-# check for output like "PHP Warning:  PHP Startup: Unable to load dynamic library 'foo' (tried: ...)
-        err="$(php --version 3>&1 1>&2 2>&3)"; \
-        [ -z "$err" ]
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -eux; \
-        docker-php-ext-enable opcache; \
-        { \
-                echo 'opcache.memory_consumption=128'; \
-                echo 'opcache.interned_strings_buffer=8'; \
-                echo 'opcache.max_accelerated_files=4000'; \
-                echo 'opcache.revalidate_freq=2'; \
-        } > /usr/local/etc/php/conf.d/opcache-recommended.ini
-# https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
-# https://www.php.net/manual/en/errorfunc.constants.php
-# https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
-                echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
-                echo 'display_errors = Off'; \
-                echo 'display_startup_errors = Off'; \
-                echo 'log_errors = On'; \
-                echo 'error_log = /dev/stderr'; \
-                echo 'log_errors_max_len = 1024'; \
-                echo 'ignore_repeated_errors = On'; \
-                echo 'ignore_repeated_source = Off'; \
-                echo 'html_errors = Off'; \
-        } > /usr/local/etc/php/conf.d/error-logging.ini
+    docker-php-ext-enable imagick

-RUN set -eux; \
-        a2enmod rewrite expires; \
-        \
-# https://httpd.apache.org/docs/2.4/mod/mod_remoteip.html
-        a2enmod remoteip; \
-        { \
+# Apache 모듈
+RUN a2enmod rewrite headers expires remoteip
+
+# RemoteIP (카페24 프록시 환경 대응)
+RUN { \
    echo 'RemoteIPHeader X-Forwarded-For'; \
-# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
    echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
    echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
    echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
-                echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
-                echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
-        } > /etc/apache2/conf-available/remoteip.conf; \
-        a2enconf remoteip; \
-# https://github.com/docker-library/wordpress/issues/383#issuecomment-507886512
-# (replace all instances of "%h" with "%a" in LogFormat)
-        find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
-# Install Composer
-###
-# install homepage
-#RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-#    && php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
-#    && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
-#    && php -r "unlink('composer-setup.php');"
+} > /etc/apache2/conf-available/remoteip.conf \
+ && a2enconf remoteip

-###
-# shell
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer
+# PHP 기본 설정 (카페24 성향 반영)
+RUN { \
+    echo 'upload_max_filesize=64M'; \
+    echo 'post_max_size=64M'; \
+    echo 'memory_limit=256M'; \
+    echo 'max_execution_time=300'; \
+    echo 'date.timezone=Asia/Seoul'; \
+} > /usr/local/etc/php/conf.d/custom.ini

-# Install Google Cloud API
-RUN composer require google/cloud
-# Install simplexls
-RUN composer require shuchkin/simplexlsx
+# Composer
+RUN curl -sS https://getcomposer.org/installer | php \
+    -- --install-dir=/usr/local/bin --filename=composer

+WORKDIR /var/www/html
 VOLUME /var/www/html

-COPY entrypoint.sh /usr/local/bin
-RUN chmod 755 /usr/local/bin/entrypoint.sh
+COPY entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/entrypoint.sh

 ENTRYPOINT ["entrypoint.sh"]
 CMD ["apache2-foreground"]
-
-
--- a/8.4/Dockerfile
+++ b/8.4/Dockerfile
@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # =========================
 # Build stage (확장 설치)
 # =========================
@ -14,33 +15,68 @@ RUN set -eux; \
        libicu-dev \
        libjpeg-dev \
        libmagickwand-dev \
+=======
+FROM php:8.4-apache
+
+# 기본 패키지
+RUN set -eux; \
+    apt update; \
+    apt install -y --no-install-recommends \
+        vim \
+        unzip \
+        curl \
+        ghostscript \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg-dev \
+>>>>>>> 627b404081a96f36103d454c7d5a928777566a0e
        libpng-dev \
        libwebp-dev \
        libzip-dev \
        libxml2-dev \
+<<<<<<< HEAD
        ghostscript \
    ; \
    rm -rf /var/lib/apt/lists/*

 # Configure and install PHP extensions
+=======
+        libmagickwand-dev \
+    ; \
+    rm -rf /var/lib/apt/lists/*
+
+# PHP extensions (카페24 환경 최대한 유사)
+>>>>>>> 627b404081a96f36103d454c7d5a928777566a0e
 RUN set -eux; \
    docker-php-ext-configure gd \
        --with-freetype \
        --with-jpeg \
        --with-webp \
    ; \
+<<<<<<< HEAD
    docker-php-ext-install -j"$(nproc)" \
+=======
+    docker-php-ext-install -j$(nproc) \
+>>>>>>> 627b404081a96f36103d454c7d5a928777566a0e
        bcmath \
        exif \
        gd \
        intl \
        mysqli \
+<<<<<<< HEAD
        zip \
        soap \
+=======
+        pdo_mysql \
+        zip \
+        soap \
+        opcache \
+>>>>>>> 627b404081a96f36103d454c7d5a928777566a0e
    ; \
    pecl install imagick-3.6.0; \
    docker-php-ext-enable imagick

+<<<<<<< HEAD
 # Enable Opcache with recommended settings
 RUN set -eux; \
    docker-php-ext-enable opcache; \
@ -105,3 +141,38 @@ VOLUME /var/www/html
 ENTRYPOINT ["entrypoint.sh"]
 CMD ["apache2-foreground"]

+=======
+# Apache 모듈
+RUN a2enmod rewrite headers expires remoteip
+
+# RemoteIP (카페24 프록시 환경 대응)
+RUN { \
+    echo 'RemoteIPHeader X-Forwarded-For'; \
+    echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+    echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+    echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+} > /etc/apache2/conf-available/remoteip.conf \
+ && a2enconf remoteip
+
+# PHP 기본 설정 (카페24 성향 반영)
+RUN { \
+    echo 'upload_max_filesize=64M'; \
+    echo 'post_max_size=64M'; \
+    echo 'memory_limit=256M'; \
+    echo 'max_execution_time=300'; \
+    echo 'date.timezone=Asia/Seoul'; \
+} > /usr/local/etc/php/conf.d/custom.ini
+
+# Composer
+RUN curl -sS https://getcomposer.org/installer | php \
+    -- --install-dir=/usr/local/bin --filename=composer
+
+WORKDIR /var/www/html
+VOLUME /var/www/html
+
+COPY entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+ENTRYPOINT ["entrypoint.sh"]
+CMD ["apache2-foreground"]
+>>>>>>> 627b404081a96f36103d454c7d5a928777566a0e