Merge pull request #81 from mattrayner/mattrayner/rebase-refactor

[WIP] Add MySQL test

Author: mattrayner

.circleci/config.yml

@@ -4,7 +4,10 @@ jobs:
     machine: true
     steps:
       - checkout
-      - run: make test
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -y mysql-client
+          make test
 
   deploy:
     machine: true

Makefile

@@ -15,4 +15,4 @@ run-tests:
 	cd tests && ./test.sh
 
 clean:
-	docker-compose -f docker-compose.test.yml down
+	docker-compose -f docker-compose.test.yml down

README.md

@@ -53,14 +53,14 @@ Designed to be a single interface that just 'gets out of your way', and works on
 
 > **NOTE**: The 14.04 variant of this image is no longer being actively supported for updated
 
-There are 4 main 'versions' of the docker image. The table below shows the different tags you can use, along with the PHP, MySQL and Apache versions that come with it.
+There are 3 main 'versions' of the docker image. The table below shows the different tags you can use, along with the PHP, MySQL and Apache versions that come with it.
 
 Component | `latest-1404` | `latest-1604` | `latest-1804`
 ---|---|---|---
 [Apache][apache] | `2.4.7` | `2.4.18` | `2.4.29`
-[MySQL][mysql] | `5.5.62` | `5.7.26` | `5.7.26`
-[PHP][php] | `7.3.3` | `7.3.6` | `7.3.6`
-[phpMyAdmin][phpmyadmin] | `4.8.5` | `4.9.0.1` | `4.9.0.1`
+[MySQL][mysql] | `5.5.62` | `5.7.29` | `5.7.29`
+[PHP][php] | `7.3.3` | `7.4.3` | `7.4.3`
+[phpMyAdmin][phpmyadmin] | `4.8.5` | `5.0.1` | `5.0.1`
 
 
 ## Using the image

docker-compose.test.yml

@@ -1,11 +1,17 @@
 web1804-php7:
   build: .
   dockerfile: ./1804/Dockerfile
+  environment:
+    - MYSQL_ADMIN_PASS=password
   ports:
     - "3000:80"
+    - "3001:3306"
 
 web1604-php7:
   build: .
   dockerfile: ./1604/Dockerfile
+  environment:
+    - MYSQL_ADMIN_PASS=password
   ports:
-    - "3001:80"
+    - "3010:80"
+    - "3011:3306"

tests/1604.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 source _helpers.sh
 
-testimage 1604-php7 3001
+testimage 1604-php7 3010
+testmysql web1604-php7 3011

tests/1804.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 source _helpers.sh
 
-testimage 1804-php7 3000
+testimage 1804-php7 3000
+testmysql web1804-php7 3001

tests/_helpers.sh

@@ -19,4 +19,10 @@ function testimage {
     diff -b actual/$1.html expected/$1.html
     checkstatus $?
     echo
+}
+
+function testmysql {
+    echo "=> Connecting to MySQL: ($1:$2)"
+    mysql -h 127.0.0.1 -P $2 -u admin -ppassword -e"quit"
+    checkstatus $?
 }