From d824dc3d4202d112fa14e38aab62a1c5236c3400 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 27 Mar 2021 15:09:28 -0700
Subject: [PATCH] Add images for PHP 7.4 and 8.0

---
 .gitlab-ci.yml     | 36 ++++++++++++++++++++++++++++++++++++
 php/7.4/Dockerfile | 17 +++++++++++++++++
 php/8.0/Dockerfile | 17 +++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 php/7.4/Dockerfile
 create mode 100644 php/8.0/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04065c3..ed76b25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,6 +125,42 @@ build-debian-wp-org-deploy-build-dev:
   except:
     - master
 
+# PHP 8.0
+build-php-8.0-master:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/php:8.0" ./php/8.0
+    - docker push "$CI_REGISTRY_IMAGE/php:8.0"
+  only:
+    - master
+  when: manual
+
+build-php-8.0-dev:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/php:8.0-dev" ./php/8.0
+    - docker push "$CI_REGISTRY_IMAGE/php:8.0-dev"
+  except:
+    - master
+
+# PHP 7.4
+build-php-7.4-master:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/php:7.4" ./php/7.4
+    - docker push "$CI_REGISTRY_IMAGE/php:7.4"
+  only:
+    - master
+  when: manual
+
+build-php-7.4-dev:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/php:7.4-dev" ./php/7.4
+    - docker push "$CI_REGISTRY_IMAGE/php:7.4-dev"
+  except:
+    - master
+
 # PHP 7.3
 build-php-7.3-master:
   stage: deploy
diff --git a/php/7.4/Dockerfile b/php/7.4/Dockerfile
new file mode 100644
index 0000000..015a878
--- /dev/null
+++ b/php/7.4/Dockerfile
@@ -0,0 +1,17 @@
+FROM php:7.4-buster
+
+LABEL maintainer="ethitter"
+LABEL version="1.0"
+
+RUN apt-get update \
+    && apt-get -yqqf install lsb-release zip unzip rsync subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-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
diff --git a/php/8.0/Dockerfile b/php/8.0/Dockerfile
new file mode 100644
index 0000000..31966b7
--- /dev/null
+++ b/php/8.0/Dockerfile
@@ -0,0 +1,17 @@
+FROM php:8.0-buster
+
+LABEL maintainer="ethitter"
+LABEL version="1.0"
+
+RUN apt-get update \
+    && apt-get -yqqf install lsb-release zip unzip rsync subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-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