Merge branch 'release/1.0.15'

.docker-config/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM nystudio107/spin-up-craft-base:8.1-alpine
+FROM nystudio107/spin-up-craft-base:8.2-alpine
 
 WORKDIR /var/www
 

.docker-config/spin-up-craft-base-dev/php-8.1-alpine/build_and_push.sh

@@ -5,5 +5,4 @@ docker buildx build \
 --push \
 --no-cache \
 --platform linux/arm64/v8,linux/amd64 \
---tag nystudio107/spin-up-craft-base-dev:8.1-alpine \
---tag nystudio107/spin-up-craft-base-dev:latest .
+--tag nystudio107/spin-up-craft-base-dev:8.1-alpine .

.docker-config/spin-up-craft-base-dev/php-8.2-alpine/Dockerfile

@@ -0,0 +1,44 @@
+FROM nystudio107/php-dev-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 \
+    && \
+    # Packages to install
+    apk add --no-cache \
+        su-exec \
+        nano \
+        mysql-client \
+        mariadb-connector-c \
+    && \
+    # Install PHP extensions
+    docker-php-ext-install \
+        pdo_mysql \
+        soap \
+    && \
+    # Install Composer
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
+    && \
+    # Remove the build deps
+    apk del .build-deps \
+    && \
+    # Clean out directories that don't need to be part of the image
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

.docker-config/spin-up-craft-base-dev/php-8.2-alpine/build_and_push.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# Build this image, and push it to DockerHub.com
+
+docker buildx build \
+--push \
+--no-cache \
+--platform linux/arm64/v8,linux/amd64 \
+--tag nystudio107/spin-up-craft-base-dev:8.2-alpine \
+--tag nystudio107/spin-up-craft-base-dev:latest .

.docker-config/spin-up-craft-base/php-8.1-alpine/build_and_push.sh

@@ -5,5 +5,4 @@ docker buildx build \
 --push \
 --no-cache \
 --platform linux/arm64/v8,linux/amd64 \
---tag nystudio107/spin-up-craft-base:8.1-alpine \
---tag nystudio107/spin-up-craft-base:latest .
+--tag nystudio107/spin-up-craft-base:8.1-alpine .

.docker-config/spin-up-craft-base/php-8.2-alpine/Dockerfile

@@ -0,0 +1,44 @@
+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 \
+    && \
+    # Packages to install
+    apk add --no-cache \
+        su-exec \
+        nano \
+        mysql-client \
+        mariadb-connector-c \
+    && \
+    # Install PHP extensions
+    docker-php-ext-install \
+        pdo_mysql \
+        soap \
+    && \
+    # Install Composer
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
+    && \
+    # Remove the build deps
+    apk del .build-deps \
+    && \
+    # Clean out directories that don't need to be part of the image
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

.docker-config/spin-up-craft-base/php-8.2-alpine/build_and_push.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# Build this image, and push it to DockerHub.com
+
+docker buildx build \
+--push \
+--no-cache \
+--platform linux/arm64/v8,linux/amd64 \
+--tag nystudio107/spin-up-craft-base:8.2-alpine \
+--tag nystudio107/spin-up-craft-base:latest .

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

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ["8.0", "8.1"]
+        php: ["8.0", "8.1", "8.2"]
         images: ["spin-up-craft-base", "spin-up-craft-base-dev"]
     name: ${{ matrix.images }} ${{ matrix.php }} images
     steps:

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

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ["8.0", "8.1"]
+        php: ["8.0", "8.1", "8.2"]
         images: ["spin-up-craft-base", "spin-up-craft-base-dev"]
     name: ${{ matrix.images }} ${{ matrix.php }} images
     steps:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # nystudio107/spin-up-craft Change Log
 
+## 1.0.15 - 2023.07.24
+### Added
+* Use PHP 8.2 as the base for `spin-up-craft-base` Docker images
+
 ## 1.0.14 - 2023.04.25
 ### Fixed
 * Wait not just for the database to be available, but also that the `info` table has been populated before proceeding with the `queue` container ([#2](https://github.com/nystudio107/spin-up-craft/issues/2))