From 889dd686b3c629373cf9a3285af1215b193e7a4d Mon Sep 17 00:00:00 2001
From: Chingis Sandanov <chingis@wodby.com>
Date: Tue, 18 Dec 2018 10:17:44 +0700
Subject: [PATCH] Update WordPress to version 5.0

---
 .env                             | 2 +-
 Makefile                         | 3 +--
 README.md                        | 4 ++--
 tests/{4 => }/.env               | 0
 tests/{4 => }/docker-compose.yml | 2 +-
 tests/{4 => }/run.sh             | 0
 tests/{4 => }/tests.sh           | 0
 7 files changed, 5 insertions(+), 6 deletions(-)
 rename tests/{4 => }/.env (100%)
 rename tests/{4 => }/docker-compose.yml (94%)
 rename tests/{4 => }/run.sh (100%)
 rename tests/{4 => }/tests.sh (100%)

diff --git a/.env b/.env
index de6ad24c5..20766d996 100644
--- a/.env
+++ b/.env
@@ -21,7 +21,7 @@ MARIADB_TAG=10.1-3.3.11
 
 ### --- VANILLA WORDPRESS ----
 
-WORDPRESS_TAG=4-4.10.1
+WORDPRESS_TAG=5-4.10.1
 
 ### --- PHP ----
 
diff --git a/Makefile b/Makefile
index f813aa98f..e77c153aa 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,7 @@ include docker.mk
 
 .PHONY: test
 
-WORDPRESS_VER ?= 4
 PHP_VER ?= 7.2
 
 test:
-	cd ./tests/$(WORDPRESS_VER) && PHP_VER=$(PHP_VER) ./run.sh
+	cd ./tests && PHP_VER=$(PHP_VER) ./run.sh
diff --git a/README.md b/README.md
index 9c0f68f28..37ecc649d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ The WordPress stack consist of the following containers:
 | -------------   | ------------------ | ------------    | ---------------------------------- | ------- |
 | [Nginx]         | 1.15, 1.14         | `nginx`         | [wodby/nginx]                      | ✓       |
 | [Apache]        | 2.4                | `apache`        | [wodby/apache]                     |         |
-| [WordPress]     | 4                  | `php`           | [wodby/wordpress]                  | ✓       |
+| [WordPress]     | 5                  | `php`           | [wodby/wordpress]                  | ✓       |
 | [PHP]           | 7.2, 7.1, 5.6      | `php`           | [wodby/wordpress-php]              |         |
 | [MariaDB]       | 10.3, 10.2, 10.1   | `mariadb`       | [wodby/mariadb]                    | ✓       |
 | [PostgreSQL]    | 11, 10, 9.x        | `postgres`      | [wodby/postgres]                   |         |
@@ -41,7 +41,7 @@ The WordPress stack consist of the following containers:
 | Portainer       | latest             | `portainer`     | [portainer/portainer]              | ✓       |
 | Traefik         | latest             | `traefik`       | [_/traefik]                        | ✓       |
 
-Supported WordPress versions: 4
+Supported WordPress versions: 5
 
 ## Documentation
 
diff --git a/tests/4/.env b/tests/.env
similarity index 100%
rename from tests/4/.env
rename to tests/.env
diff --git a/tests/4/docker-compose.yml b/tests/docker-compose.yml
similarity index 94%
rename from tests/4/docker-compose.yml
rename to tests/docker-compose.yml
index 200d41734..dc47b7644 100644
--- a/tests/4/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       MYSQL_PASSWORD: $DB_PASSWORD
 
   php:
-    image: wodby/wordpress:4-$PHP_VER-$WORDPRESS_STABILITY_TAG
+    image: wodby/wordpress:5-$PHP_VER-$WORDPRESS_STABILITY_TAG
     environment:
       DB_HOST: $DB_HOST
       DB_NAME: $DB_NAME
diff --git a/tests/4/run.sh b/tests/run.sh
similarity index 100%
rename from tests/4/run.sh
rename to tests/run.sh
diff --git a/tests/4/tests.sh b/tests/tests.sh
similarity index 100%
rename from tests/4/tests.sh
rename to tests/tests.sh