v1.4.0

chrisnharvey · Nov 15, 2020 · 0d205f7 · 0d205f7
1 parent 7a676d9
commit 0d205f7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)
 
+## v1.4.0
+
+### New
+
+- PHP 8.0 RC3
+- Composer 2
+
 ## v1.3.9
 
 ### Fixed

diff --git a/containers/workspace/home/.magiclamprc b/containers/workspace/home/.magiclamprc
@@ -1 +1 @@
-MAGICLAMP_VERSION="1.3"
+MAGICLAMP_VERSION="1.4"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   nginx:
-    image: chrisnharvey/magiclamp-nginx:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-nginx:${MAGICLAMP_VERSION:-1.4}
 
     volumes:
       - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -17,7 +17,7 @@ services:
         ipv4_address: 10.0.10.10
 
   postgres:
-    image: chrisnharvey/magiclamp-postgres:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-postgres:${MAGICLAMP_VERSION:-1.4}
 
     ports:
       - 5432:5432
@@ -30,7 +30,7 @@ services:
         ipv4_address: 10.0.10.15
 
   pgadmin:
-    image: chrisnharvey/magiclamp-pgadmin:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-pgadmin:${MAGICLAMP_VERSION:-1.4}
 
     networks:
       app_net:
@@ -49,7 +49,7 @@ services:
       - dns_internal
 
   mysql:
-    image: chrisnharvey/magiclamp-mysql:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-mysql:${MAGICLAMP_VERSION:-1.4}
 
     volumes:
       - mysql_data:/var/lib/mysql
@@ -67,7 +67,7 @@ services:
         ipv4_address: 10.0.10.20
 
   phpmyadmin:
-    image: chrisnharvey/magiclamp-phpmyadmin:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-phpmyadmin:${MAGICLAMP_VERSION:-1.4}
 
     networks:
       app_net:
@@ -80,7 +80,7 @@ services:
       - MYSQL_ROOT_PASSWORD=gg
 
   mailcatcher:
-    image: chrisnharvey/magiclamp-mailcatcher:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-mailcatcher:${MAGICLAMP_VERSION:-1.4}
 
     ports:
       - 1025:1025
@@ -90,7 +90,7 @@ services:
         ipv4_address: 10.0.10.25
 
   workspace:
-    image: chrisnharvey/magiclamp-workspace:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-workspace:${MAGICLAMP_VERSION:-1.4}
 
     volumes:
       - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -113,14 +113,14 @@ services:
         ipv4_address: 10.0.10.5
 
   dns_internal:
-    image: chrisnharvey/magiclamp-dns-internal:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-dns-internal:${MAGICLAMP_VERSION:-1.4}
 
     networks:
       app_net:
         ipv4_address: 10.0.10.2
 
   dns:
-    image: chrisnharvey/magiclamp-dns:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-dns:${MAGICLAMP_VERSION:-1.4}
 
     ports:
       - 127.0.0.1:53:53/udp
@@ -129,7 +129,7 @@ services:
 
 
   redis:
-    image: chrisnharvey/magiclamp-redis:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-redis:${MAGICLAMP_VERSION:-1.4}
 
     ports:
       - 6379:6379
@@ -139,7 +139,7 @@ services:
         ipv4_address: 10.0.10.21
 
   memcached:
-    image: chrisnharvey/magiclamp-memcached:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-memcached:${MAGICLAMP_VERSION:-1.4}
 
     ports:
       - 11211:11211
@@ -149,7 +149,7 @@ services:
         ipv4_address: 10.0.10.11
 
   elasticsearch:
-    image: chrisnharvey/magiclamp-elasticsearch:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-elasticsearch:${MAGICLAMP_VERSION:-1.4}
 
     ports:
       - 9200:9200
@@ -163,7 +163,7 @@ services:
         ipv4_address: 10.0.10.92
 
   rabbitmq:
-    image: chrisnharvey/magiclamp-rabbitmq:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-rabbitmq:${MAGICLAMP_VERSION:-1.4}
 
     hostname: magiclamp-rabbitmq
 
@@ -183,7 +183,7 @@ services:
         ipv4_address: 10.0.10.67
 
   selenium_chrome:
-    image: chrisnharvey/magiclamp-selenium-chrome:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-selenium-chrome:${MAGICLAMP_VERSION:-1.4}
 
     ports:
       - 4444:4444
@@ -202,7 +202,7 @@ services:
       - dns_internal
 
   selenium_firefox:
-    image: chrisnharvey/magiclamp-selenium-firefox:${MAGICLAMP_VERSION:-1.3}
+    image: chrisnharvey/magiclamp-selenium-firefox:${MAGICLAMP_VERSION:-1.4}
 
     ports:
       - 5555:4444
@@ -221,7 +221,7 @@ services:
       - dns_internal
 
   php56:
-      image: chrisnharvey/magiclamp-php56:${MAGICLAMP_VERSION:-1.3}
+      image: chrisnharvey/magiclamp-php56:${MAGICLAMP_VERSION:-1.4}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -240,7 +240,7 @@ services:
         - dns_internal
 
   php70:
-      image: chrisnharvey/magiclamp-php70:${MAGICLAMP_VERSION:-1.3}
+      image: chrisnharvey/magiclamp-php70:${MAGICLAMP_VERSION:-1.4}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -259,7 +259,7 @@ services:
         - dns_internal
 
   php71:
-      image: chrisnharvey/magiclamp-php71:${MAGICLAMP_VERSION:-1.3}
+      image: chrisnharvey/magiclamp-php71:${MAGICLAMP_VERSION:-1.4}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -278,7 +278,7 @@ services:
         - dns_internal
 
   php72:
-      image: chrisnharvey/magiclamp-php72:${MAGICLAMP_VERSION:-1.3}
+      image: chrisnharvey/magiclamp-php72:${MAGICLAMP_VERSION:-1.4}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -297,7 +297,7 @@ services:
         - dns_internal
 
   php73:
-      image: chrisnharvey/magiclamp-php73:${MAGICLAMP_VERSION:-1.3}
+      image: chrisnharvey/magiclamp-php73:${MAGICLAMP_VERSION:-1.4}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -316,7 +316,7 @@ services:
         - dns_internal
 
   php74:
-      image: chrisnharvey/magiclamp-php74:${MAGICLAMP_VERSION:-1.3}
+      image: chrisnharvey/magiclamp-php74:${MAGICLAMP_VERSION:-1.4}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -335,7 +335,7 @@ services:
         - dns_internal
 
   php80:
-      image: chrisnharvey/magiclamp-php80:${MAGICLAMP_VERSION:-1.3}
+      image: chrisnharvey/magiclamp-php80:${MAGICLAMP_VERSION:-1.4}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects