Add php 8, drop 7.2

wodby · Dec 10, 2020 · 605d27d · 605d27d
1 parent 6fb3e1f
commit 605d27d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.env b/.env
@@ -33,14 +33,14 @@ DRUPAL_TAG=9-4.25.0
 # Linux (uid 1000 gid 1000)
 
 PHP_TAG=7.4-dev-4.21.0
+#PHP_TAG=8.0-dev-4.21.0
 #PHP_TAG=7.3-dev-4.21.0
-#PHP_TAG=7.2-dev-4.21.0
 
 # macOS (uid 501 gid 20)
 
+#PHP_TAG=8.0-dev-macos-4.21.0
 #PHP_TAG=7.4-dev-macos-4.21.0
 #PHP_TAG=7.3-dev-macos-4.21.0
-#PHP_TAG=7.2-dev-macos-4.21.0
 
 ### --- NGINX ----
 
@@ -50,7 +50,6 @@ NGINX_TAG=1.19-5.10.9
 NGINX_VHOST_PRESET=drupal9
 #NGINX_VHOST_PRESET=drupal8
 #NGINX_VHOST_PRESET=drupal7
-#NGINX_VHOST_PRESET=drupal6
 
 ### --- SOLR ---
 

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -15,10 +15,12 @@ jobs:
     strategy:
       matrix:
         drupal_ver: [ 9,8,7 ]
-        php_ver: [ 7.4,7.3,7.2 ]
+        php_ver: [ 8.0,7.4,7.3 ]
         exclude:
-        - drupal_ver: 9
-          php_ver: 7.2
+        - drupal_ver: 8
+          php_ver: 8.0
+        - drupal_ver: 7
+          php_ver: 8.0
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ include docker.mk
 .PHONY: test
 
 DRUPAL_VER ?= 9
-PHP_VER ?= 7.4
+PHP_VER ?= 8.0
 
 test:
 	cd ./tests/$(DRUPAL_VER) && PHP_VER=$(PHP_VER) ./run.sh
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ The Drupal stack consist of the following containers:
 | [Nginx]         | 1.19, 1.18             | `nginx`         | [wodby/nginx]                      | ✓       |
 | [Apache]        | 2.4                    | `apache`        | [wodby/apache]                     |         |
 | [Drupal]        | 9, 8, 7                | `php`           | [wodby/drupal]                     | ✓       |
-| [PHP]           | 7.4, 7.3, 7.2          | `php`           | [wodby/drupal-php]                 |         |
+| [PHP]           | 8.0, 7.4, 7.3          | `php`           | [wodby/drupal-php]                 |         |
 | Crond           |                        | `crond`         | [wodby/drupal-php]                 | ✓       |
 | [MariaDB]       | 10.5, 10.4, 10.3, 10.2 | `mariadb`       | [wodby/mariadb]                    | ✓       |
 | [PostgreSQL]    | 12, 11, 10, 9.x        | `postgres`      | [wodby/postgres]                   |         |