Merge pull request #49 from mattrayner/test

Fix Markdown issue
mattrayner · Mar 12, 2019 · daef707 · daef707
2 parents 243f5bf + 67fc90d
commit daef707
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/1404/Dockerfile-php7 → 1404/Dockerfile b/1404/Dockerfile-php7 → 1404/Dockerfile
diff --git a/1604/Dockerfile-php7 → 1604/Dockerfile b/1604/Dockerfile-php7 → 1604/Dockerfile
diff --git a/1804/Dockerfile-php7 → 1804/Dockerfile b/1804/Dockerfile-php7 → 1804/Dockerfile
diff --git a/README.md b/README.md
@@ -57,9 +57,9 @@ There are 4 main 'versions' of the docker image. The table below shows the diffe
 
 Component | `latest-1404` | `latest-1604` | `latest-1804`
 ---|---|---|---
-[Apache][apache] | `2.4.7` | `2.4.18` | `2.4.18`
-[MySQL][mysql] | `5.5.61` | `5.7.23` | `5.7.23`
-[PHP][php] | `7.2.9` | `7.2.9` | `7.2.9`
+[Apache][apache] | `2.4.7` | `2.4.29` | `2.4.18`
+[MySQL][mysql] | `5.5.62` | `5.7.25` | `5.7.25`
+[PHP][php] | `7.3.3` | `7.3.3` | `7.3.3`
 [phpMyAdmin][phpmyadmin] | `4.8.5` | `4.8.5` | `4.8.5`
 
 

diff --git a/app/index.php b/app/index.php
@@ -45,7 +45,7 @@
         </article>
         <section>
             <pre>
-OS: <?php echo php_uname(); ?><br/>
+OS: <?php echo php_uname('s'); ?><br/>
 Apache: <?php echo apache_get_version(); ?><br/>
 MySQL Version: <?php echo $db->getAttribute( PDO::ATTR_SERVER_VERSION ); ?><br/>
 PHP Version: <?php echo phpversion(); ?><br/>

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -8,18 +8,18 @@ sut:
 
 web1804-php7:
   build: .
-  dockerfile: ./1804/Dockerfile-php7
+  dockerfile: ./1804/Dockerfile
   ports:
     - "3000:80"
 
 web1604-php7:
   build: .
-  dockerfile: ./1604/Dockerfile-php7
+  dockerfile: ./1604/Dockerfile
   ports:
     - "3001:80"
 
 web1404-php7:
   build: .
-  dockerfile: ./1404/Dockerfile-php7
+  dockerfile: ./1404/Dockerfile
   ports:
     - "3002:80"