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

# Conflicts:
#	8.4/Dockerfile

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