From c68123d24bf25334dc90b8a0f5f0a1d882b0a934 Mon Sep 17 00:00:00 2001
From: dannc <dannc.sao@gmail.com>
Date: Tue, 12 Jan 2021 18:47:01 +0700
Subject: [PATCH] bump php 7.x versions. Add image for php 8.0. Update reamde,
 ci.

---
 .github/workflows/continious-integration.yml | 13 ++++++++
 Makefile                                     |  3 ++
 readme.md                                    | 32 ++++++++++---------
 v7.3/Dockerfile                              |  2 +-
 v7.4/Dockerfile                              |  2 +-
 v8.0/Dockerfile                              | 33 ++++++++++++++++++++
 6 files changed, 69 insertions(+), 16 deletions(-)
 create mode 100644 v8.0/Dockerfile

diff --git a/.github/workflows/continious-integration.yml b/.github/workflows/continious-integration.yml
index 390b412..620981a 100644
--- a/.github/workflows/continious-integration.yml
+++ b/.github/workflows/continious-integration.yml
@@ -42,6 +42,13 @@ jobs:
           docker tag local-composer:7.4 dannecron/php-for-dev:latest
           echo "Done"
 
+      - name: Build the Docker images 8.0
+        run: |
+          docker build --tag=local-composer:8.0 ./v8.0
+          docker run --rm local-composer:8.0 php -v
+          docker tag local-composer:8.0 dannecron/php-for-dev:8.0
+          echo "Done"
+
       - name: push 7.2 image to docker hub
         if: success()
         uses: actions-hub/docker@master
@@ -60,6 +67,12 @@ jobs:
         with:
           args: push dannecron/php-for-dev:7.4
 
+      - name: push 8.0 image to docker hub
+        if: success()
+        uses: actions-hub/docker@master
+        with:
+          args: push dannecron/php-for-dev:8.0
+
       - name: push latest image to docker hub
         if: success()
         uses: actions-hub/docker@master
diff --git a/Makefile b/Makefile
index ff5ae22..f9a2495 100644
--- a/Makefile
+++ b/Makefile
@@ -6,3 +6,6 @@ build-73:
 
 build-74:
 	cd ./v7.4 && docker build --tag=php-for-dev:7.4 `pwd`
+
+build-80:
+	cd ./v8.0 && docker build --tag=php-for-dev:8.0 `pwd`
diff --git a/readme.md b/readme.md
index 9921d29..e3433ee 100644
--- a/readme.md
+++ b/readme.md
@@ -6,21 +6,24 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan
 
 #### Supported versions
 
-* php 7.4.13
-    * composer 1.10.17
-    * xdebug 2.9.8
-    * rdkafka 3.1.2
-    * timecop 1.2.10
-* php 7.3.25
-    * composer 1.10.17
-    * xdebug 2.9.8
-    * rdkafka 3.1.2
-    * timecop 1.2.10
+* php 8.0.1
+  * composer 2.0.8
+  * xdebug 3.0.1
+* php 7.4.14 (latest)
+  * composer 1.10.17
+  * xdebug 2.9.8
+  * rdkafka 3.1.2
+  * timecop 1.2.10
+* php 7.3.26
+  * composer 1.10.17
+  * xdebug 2.9.8
+  * rdkafka 3.1.2
+  * timecop 1.2.10
 * php 7.2.34
-    * composer 1.10.17
-    * xdebug 2.7.2
-    * rdkafka 3.1.2
-    * timecop 1.2.10
+  * composer 1.10.17
+  * xdebug 2.7.2
+  * rdkafka 3.1.2
+  * timecop 1.2.10
 
 All images now include [zsh](https://www.zsh.org/), that allowed using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh) and its plugins for improving user experience.
 
@@ -31,6 +34,7 @@ To build container just use one of this commands:
 make build-72
 make build-73
 make build-74
+make build-80
 ```
 
 #### Run
diff --git a/v7.3/Dockerfile b/v7.3/Dockerfile
index 891b871..ba2d124 100644
--- a/v7.3/Dockerfile
+++ b/v7.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3.25-alpine
+FROM php:7.3.26-alpine
 
 RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \
diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile
index 81d6c70..0f255f8 100644
--- a/v7.4/Dockerfile
+++ b/v7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4.13-alpine
+FROM php:7.4.14-alpine
 
 RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \
diff --git a/v8.0/Dockerfile b/v8.0/Dockerfile
new file mode 100644
index 0000000..27ddea3
--- /dev/null
+++ b/v8.0/Dockerfile
@@ -0,0 +1,33 @@
+FROM php:8.0.1-alpine
+
+RUN apk update && apk add --no-cache $PHPIZE_DEPS \
+    && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \
+        curl zip libzip-dev gmp-dev \
+        #librdkafka-dev \
+        imap-dev openssl-dev git zsh
+
+RUN docker-php-ext-configure gd --enable-gd \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
+    && docker-php-ext-install gd \
+    && docker-php-ext-configure bcmath && docker-php-ext-install bcmath \
+    && docker-php-ext-configure zip --with-zip && docker-php-ext-install zip \
+    && docker-php-ext-install gmp \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-imap-ssl \
+    && docker-php-ext-install imap
+
+ARG PHP_XDEBUG_VERSION=3.0.1
+RUN pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug
+
+#ARG PHP_RDKAFKA_VERSION=4.1.2
+#RUN pecl install rdkafka-${PHP_RDKAFKA_VERSION} && docker-php-ext-enable rdkafka
+
+# Install composer
+ARG COMPOSER_VERSION=2.0.8
+RUN curl -sS https://getcomposer.org/installer | php -- \
+        --filename=composer \
+        --version=${COMPOSER_VERSION} \
+        --install-dir=/usr/local/bin
+RUN mkdir -m 777 -p /var/composer/
+ENV COMPOSER_HOME /var/composer/