From 80e9caa8e07a9f3350695cf8e0205c8979ed00ee Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 11 Jun 2022 14:11:39 -0700
Subject: [PATCH] Add PHP 8.1, bump to latest Debian LTS when possible

---
 .gitlab-ci.yml     | 18 ++++++++++++++++++
 php/7.1/Dockerfile |  2 +-
 php/7.2/Dockerfile |  2 +-
 php/7.3/Dockerfile |  2 +-
 php/7.4/Dockerfile |  2 +-
 php/8.0/Dockerfile |  2 +-
 php/8.1/Dockerfile | 17 +++++++++++++++++
 7 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 php/8.1/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f37e060..d75c3dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,6 +143,24 @@ build-debian-wp-org-deploy-build-dev:
   except:
     - master
 
+# PHP 8.1
+build-php-8.1-master:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/php:8.1" ./php/8.1
+    - docker push "$CI_REGISTRY_IMAGE/php:8.1"
+  only:
+    - master
+  when: manual
+
+build-php-8.1-dev:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/php:8.1-dev" ./php/8.1
+    - docker push "$CI_REGISTRY_IMAGE/php:8.1-dev"
+  except:
+    - master
+
 # PHP 8.0
 build-php-8.0-master:
   stage: deploy
diff --git a/php/7.1/Dockerfile b/php/7.1/Dockerfile
index 534296b..9dde489 100644
--- a/php/7.1/Dockerfile
+++ b/php/7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-stretch
+FROM php:7.1-buster
 
 LABEL maintainer="ethitter"
 LABEL version="1.0"
diff --git a/php/7.2/Dockerfile b/php/7.2/Dockerfile
index 9906471..b664f63 100644
--- a/php/7.2/Dockerfile
+++ b/php/7.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-stretch
+FROM php:7.2-buster
 
 LABEL maintainer="ethitter"
 LABEL version="1.0"
diff --git a/php/7.3/Dockerfile b/php/7.3/Dockerfile
index be21bd4..f0bb5a3 100644
--- a/php/7.3/Dockerfile
+++ b/php/7.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-stretch
+FROM php:7.3-bullseye
 
 LABEL maintainer="ethitter"
 LABEL version="1.0"
diff --git a/php/7.4/Dockerfile b/php/7.4/Dockerfile
index 2977116..5f5ebcc 100644
--- a/php/7.4/Dockerfile
+++ b/php/7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-buster
+FROM php:7.4-bullseye
 
 LABEL maintainer="ethitter"
 LABEL version="1.0"
diff --git a/php/8.0/Dockerfile b/php/8.0/Dockerfile
index 74ea0de..0beaf66 100644
--- a/php/8.0/Dockerfile
+++ b/php/8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-buster
+FROM php:8.0-bullseye
 
 LABEL maintainer="ethitter"
 LABEL version="1.0"
diff --git a/php/8.1/Dockerfile b/php/8.1/Dockerfile
new file mode 100644
index 0000000..4b55961
--- /dev/null
+++ b/php/8.1/Dockerfile
@@ -0,0 +1,17 @@
+FROM php:8.1-bullseye
+
+LABEL maintainer="ethitter"
+LABEL version="1.0"
+
+RUN apt-get update \
+    && apt-get -yqqf install lsb-release zip unzip rsync subversion git libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev libonig-dev --fix-missing --no-install-recommends \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN chmod +x /usr/local/bin/composer
+
+ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
-- 
GitLab