Merge branch 'release/1.2.21'

.github/workflows/build-and-push-docker-images.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ["12", "14", "16"]
+        node: ["12", "14", "16", "18"]
     name: node-dev-base ${{ matrix.node }} images
     steps:
       - name: Check out the repository
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ["7.4", "8.0"]
+        php: ["7.4", "8.0", "8.1", "8.2"]
     name: php-dev-base ${{ matrix.php }} images
     steps:
       - name: Check out the repository

.github/workflows/build-docker-images.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node: ["12", "14", "16"]
+        node: ["12", "14", "16", "18"]
     name: node-dev-base ${{ matrix.node }} images
     steps:
       - name: Check out the repository
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ["7.4", "8.0"]
+        php: ["7.4", "8.0", "8.1", "8.2"]
     name: php-dev-base ${{ matrix.php }} images
     steps:
       - name: Check out the repository

CHANGELOG.md

@@ -1,5 +1,13 @@
 # nystudio107/docker-images Change Log
 
+## 1.2.21 - 2023.07.19
+### Added
+* Add `node-18-alpine` image
+* Add `php-prod-base:8.1-alpine` image
+* Add `php-dev-base:8.1-alpine` image
+* Add `php-prod-base:8.2-alpine` image
+* Add `php-dev-base:8.2-alpine` image
+
 ## 1.2.20 - 2021.11.24
 ### Added
 * Add `node-16-alpine` image

php-dev-base/php-8.1-alpine/Dockerfile

@@ -0,0 +1,46 @@
+FROM nystudio107/php-prod-base:8.1-alpine
+
+# dependencies required for running "phpize"
+# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
+ENV PHPIZE_DEPS \
+        autoconf \
+        dpkg-dev \
+        dpkg \
+        file \
+        g++ \
+        gcc \
+        libc-dev \
+        make \
+        pkgconf \
+        re2c \
+        linux-headers \
+        wget
+
+# Install packages
+RUN set -eux; \
+    # Packages needed only for build
+    apk add --no-cache --virtual .build-deps \
+        $PHPIZE_DEPS \
+    && \
+    # pecl PHP extensions
+    pecl install \
+        xdebug \
+    && \
+    # Enable PHP extensions
+    docker-php-ext-enable \
+        xdebug \
+    && \
+    # Remove the build deps
+    apk del .build-deps \
+    && \
+    # Clean out directories that don't need to be part of the image
+    rm -rf /tmp/* /var/tmp/*
+
+# Copy the `xdebug.ini` file into place for xdebug
+COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
+
+# Copy the `zzz-docker-php.ini` file into place for php
+COPY zzz-docker-php.ini /usr/local/etc/php/conf.d/
+
+# Copy the `zzz-docker-php-fpm.conf` file into place for php-fpm
+COPY zzz-docker-php-fpm.conf /usr/local/etc/php-fpm.d/

php-dev-base/php-8.1-alpine/xdebug.ini

@@ -0,0 +1,4 @@
+xdebug.mode=develop,debug,profile
+xdebug.start_with_request=trigger
+xdebug.client_host=host.docker.internal
+xdebug.output_dir = "/var/www/project/cms/storage/logs"

php-dev-base/php-8.1-alpine/zzz-docker-php-fpm.conf

@@ -0,0 +1,4 @@
+[www]
+pm.max_children = 5
+pm.process_idle_timeout = 30s
+pm.max_requests = 1000

php-dev-base/php-8.1-alpine/zzz-docker-php.ini

@@ -0,0 +1,9 @@
+[php]
+memory_limit=256M
+max_execution_time=300
+max_input_time=300
+max_input_vars=5000
+upload_max_filesize=100M
+post_max_size=100M
+[opcache]
+opcache.enable=0

php-dev-base/php-8.2-alpine/Dockerfile

@@ -0,0 +1,46 @@
+FROM nystudio107/php-prod-base:8.2-alpine
+
+# dependencies required for running "phpize"
+# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
+ENV PHPIZE_DEPS \
+        autoconf \
+        dpkg-dev \
+        dpkg \
+        file \
+        g++ \
+        gcc \
+        libc-dev \
+        make \
+        pkgconf \
+        re2c \
+        linux-headers \
+        wget
+
+# Install packages
+RUN set -eux; \
+    # Packages needed only for build
+    apk add --no-cache --virtual .build-deps \
+        $PHPIZE_DEPS \
+    && \
+    # pecl PHP extensions
+    pecl install \
+        xdebug \
+    && \
+    # Enable PHP extensions
+    docker-php-ext-enable \
+        xdebug \
+    && \
+    # Remove the build deps
+    apk del .build-deps \
+    && \
+    # Clean out directories that don't need to be part of the image
+    rm -rf /tmp/* /var/tmp/*
+
+# Copy the `xdebug.ini` file into place for xdebug
+COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
+
+# Copy the `zzz-docker-php.ini` file into place for php
+COPY zzz-docker-php.ini /usr/local/etc/php/conf.d/
+
+# Copy the `zzz-docker-php-fpm.conf` file into place for php-fpm
+COPY zzz-docker-php-fpm.conf /usr/local/etc/php-fpm.d/

php-dev-base/php-8.2-alpine/xdebug.ini

@@ -0,0 +1,4 @@
+xdebug.mode=develop,debug,profile
+xdebug.start_with_request=trigger
+xdebug.client_host=host.docker.internal
+xdebug.output_dir = "/var/www/project/cms/storage/logs"

php-dev-base/php-8.2-alpine/zzz-docker-php-fpm.conf

@@ -0,0 +1,4 @@
+[www]
+pm.max_children = 5
+pm.process_idle_timeout = 30s
+pm.max_requests = 1000

php-dev-base/php-8.2-alpine/zzz-docker-php.ini

@@ -0,0 +1,9 @@
+[php]
+memory_limit=256M
+max_execution_time=300
+max_input_time=300
+max_input_vars=5000
+upload_max_filesize=100M
+post_max_size=100M
+[opcache]
+opcache.enable=0

php-prod-base/php-8.1-alpine/Dockerfile

@@ -0,0 +1,94 @@
+FROM php:8.1-fpm-alpine3.17
+
+# dependencies required for running "phpize"
+# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
+ENV PHPIZE_DEPS \
+        autoconf \
+        dpkg-dev \
+        dpkg \
+        file \
+        g++ \
+        gcc \
+        libc-dev \
+        make \
+        pkgconf \
+        re2c \
+        zlib-dev \
+        wget
+
+# Install packages
+RUN set -eux; \
+    # Packages needed only for build
+    apk add --no-cache --virtual .build-deps \
+        $PHPIZE_DEPS \
+    && \
+    # Packages to install
+    apk add --no-cache \
+        bzip2-dev \
+        ca-certificates \
+        curl \
+        fcgi \
+        freetype-dev \
+        gettext-dev \
+        icu-dev \
+        icu-data-full \
+        imagemagick-dev \
+        jpeg-dev \
+        libpng-dev \
+        libwebp-dev \
+        libzip-dev \
+        libmcrypt-dev \
+        libressl-dev \
+        libtool \
+        libxml2-dev \
+        libzip-dev \
+        oniguruma-dev \
+        unzip \
+    && \
+    # pecl PHP extensions
+    pecl install \
+        redis \
+    && \
+    # Configure PHP extensions
+    docker-php-ext-configure \
+        # ref: https://github.com/docker-library/php/issues/920#issuecomment-562864296
+        gd --enable-gd --with-freetype --with-jpeg --with-webp \
+    && \
+    pecl install \
+        imagick \
+    && \
+    # Install PHP extensions
+    docker-php-ext-install -j$(nproc) \
+        bcmath \
+        bz2 \
+        exif \
+        ftp \
+        gettext \
+        gd \
+        intl \
+        mbstring \
+        opcache \
+        pdo \
+        shmop \
+        sockets \
+        sysvmsg \
+        sysvsem \
+        sysvshm \
+        zip \
+    && \
+    # Enable PHP extensions
+    docker-php-ext-enable \
+        imagick \
+        redis \
+    && \
+    # Remove the build deps
+    apk del .build-deps \
+    && \
+    # Clean out directories that don't need to be part of the image
+    rm -rf /tmp/* /var/tmp/*
+
+# Copy the `zzz-docker-php.ini` file into place for php
+COPY zzz-docker-php.ini /usr/local/etc/php/conf.d/
+
+# Copy the `zzz-docker-php-fpm.conf` file into place for php-fpm
+COPY zzz-docker-php-fpm.conf /usr/local/etc/php-fpm.d/

php-prod-base/php-8.1-alpine/zzz-docker-php-fpm.conf

@@ -0,0 +1,4 @@
+[www]
+pm.max_children = 10
+pm.process_idle_timeout = 30s
+pm.max_requests = 1000

php-prod-base/php-8.1-alpine/zzz-docker-php.ini

@@ -0,0 +1,13 @@
+[php]
+memory_limit=256M
+max_execution_time=300
+max_input_time=300
+max_input_vars=5000
+upload_max_filesize=100M
+post_max_size=100M
+[opcache]
+opcache.enable=1
+opcache.revalidate_freq=0
+opcache.validate_timestamps=1
+opcache.jit_buffer_size=100M
+opcache.jit=tracing

php-prod-base/php-8.2-alpine/Dockerfile

@@ -0,0 +1,94 @@
+FROM php:8.2-fpm-alpine3.17
+
+# dependencies required for running "phpize"
+# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
+ENV PHPIZE_DEPS \
+        autoconf \
+        dpkg-dev \
+        dpkg \
+        file \
+        g++ \
+        gcc \
+        libc-dev \
+        make \
+        pkgconf \
+        re2c \
+        zlib-dev \
+        wget
+
+# Install packages
+RUN set -eux; \
+    # Packages needed only for build
+    apk add --no-cache --virtual .build-deps \
+        $PHPIZE_DEPS \
+    && \
+    # Packages to install
+    apk add --no-cache \
+        bzip2-dev \
+        ca-certificates \
+        curl \
+        fcgi \
+        freetype-dev \
+        gettext-dev \
+        icu-dev \
+        icu-data-full \
+        imagemagick-dev \
+        jpeg-dev \
+        libpng-dev \
+        libwebp-dev \
+        libzip-dev \
+        libmcrypt-dev \
+        libressl-dev \
+        libtool \
+        libxml2-dev \
+        libzip-dev \
+        oniguruma-dev \
+        unzip \
+    && \
+    # pecl PHP extensions
+    pecl install \
+        redis \
+    && \
+    # Configure PHP extensions
+    docker-php-ext-configure \
+        # ref: https://github.com/docker-library/php/issues/920#issuecomment-562864296
+        gd --enable-gd --with-freetype --with-jpeg --with-webp \
+    && \
+    pecl install \
+        imagick \
+    && \
+    # Install PHP extensions
+    docker-php-ext-install -j$(nproc) \
+        bcmath \
+        bz2 \
+        exif \
+        ftp \
+        gettext \
+        gd \
+        intl \
+        mbstring \
+        opcache \
+        pdo \
+        shmop \
+        sockets \
+        sysvmsg \
+        sysvsem \
+        sysvshm \
+        zip \
+    && \
+    # Enable PHP extensions
+    docker-php-ext-enable \
+        imagick \
+        redis \
+    && \
+    # Remove the build deps
+    apk del .build-deps \
+    && \
+    # Clean out directories that don't need to be part of the image
+    rm -rf /tmp/* /var/tmp/*
+
+# Copy the `zzz-docker-php.ini` file into place for php
+COPY zzz-docker-php.ini /usr/local/etc/php/conf.d/
+
+# Copy the `zzz-docker-php-fpm.conf` file into place for php-fpm
+COPY zzz-docker-php-fpm.conf /usr/local/etc/php-fpm.d/

php-prod-base/php-8.2-alpine/zzz-docker-php-fpm.conf

@@ -0,0 +1,4 @@
+[www]
+pm.max_children = 10
+pm.process_idle_timeout = 30s
+pm.max_requests = 1000