From 8159c09fa03ffe605d2550e9c2708ed4667b9e83 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Fri, 16 Feb 2024 17:47:18 +0100
Subject: [PATCH] Version bumps

Base
- Alpine v3.19.1
- Docker v25.0.3
- Docker Compose v2.23.3
- Minio CLI v2024-02-14

PHP
- PHP 8.2
- Composer v2.7.1
- Drush v8.4.12
- WP CLI v2.10.0
---
 base/Dockerfile | 10 +++++-----
 php/Dockerfile  | 40 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 154b622..d4fa2ec 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17.1
+FROM alpine:3.19.1
 
 # Install basic pacakges
 RUN set -xe; \
@@ -17,9 +17,9 @@ RUN set -xe; \
 
 # Install docker packages
 # Lookup available version for Alpine at
-# https://pkgs.alpinelinux.org/packages?name=docker*&branch=v3.14&arch=x86_64
-ARG DOCKER_VERSION=20.10.21-r2
-ARG DOCKER_COMPOSE_VERSION=1.29.2-r2
+# https://pkgs.alpinelinux.org/packages?name=docker*&branch=v3.19&arch=x86_64
+ARG DOCKER_VERSION=25.0.3-r0
+ARG DOCKER_COMPOSE_VERSION=2.23.3-r0
 RUN set -xe; \
 	apk add --update --no-cache \
 		docker-cli=${DOCKER_VERSION} \
@@ -28,7 +28,7 @@ RUN set -xe; \
 	rm -rf /var/cache/apk/*;
 
 # Install minio client (mc)
-ARG MINIO_VERSION="RELEASE.2021-03-23T05-46-11Z"
+ARG MINIO_VERSION="RELEASE.2024-02-14T21-19-52Z"
 RUN set -xe; \
 	curl -fsSL https://dl.min.io/client/mc/release/linux-amd64/archive/mc.${MINIO_VERSION} -o /usr/local/bin/mc; \
 	chmod +x /usr/local/bin/mc
diff --git a/php/Dockerfile b/php/Dockerfile
index 4a71be2..b823dda 100644
--- a/php/Dockerfile
+++ b/php/Dockerfile
@@ -6,29 +6,29 @@ USER root
 RUN set -xe; \
 	apk add --update --no-cache \
 		mysql-client \
-		php81 \
-		php81-ctype \
-		php81-curl \
-		php81-dom \
-		php81-gd \
-		php81-json \
-		php81-mbstring \
-		php81-openssl \
-		php81-pdo_mysql \
-		php81-phar \
-		php81-posix \
-		php81-simplexml \
-		php81-tokenizer \
-		php81-xml \
-		php81-xmlreader \
-		php81-xmlwriter \
-		php81-zlib; \
+		php82 \
+		php82-ctype \
+		php82-curl \
+		php82-dom \
+		php82-gd \
+		php82-json \
+		php82-mbstring \
+		php82-openssl \
+		php82-pdo_mysql \
+		php82-phar \
+		php82-posix \
+		php82-simplexml \
+		php82-tokenizer \
+		php82-xml \
+		php82-xmlreader \
+		php82-xmlwriter \
+		php82-zlib; \
 	rm -rf /var/cache/apk/*;
 
-ENV COMPOSER_VERSION=2.5.1 \
-	DRUSH_VERSION=8.4.11 \
+ENV COMPOSER_VERSION=2.7.1 \
+	DRUSH_VERSION=8.4.12 \
 	DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \
-	WPCLI_VERSION=2.6.0
+	WPCLI_VERSION=2.10.0
 RUN set -xe; \
 	# Composer
 	curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer; \