Merge branch 'release/1.6.0'

chrisnharvey · Aug 26, 2021 · b3f949a · b3f949a
2 parents 442fe47 + 7475c3a
commit b3f949a
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 ## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)
 
+# v1.6.0
+
+### New
+
+- Added Kafka broker with Zookeeper and Web UI (AKHQ)
+- rdkafka extension is now installed on PHP versions >= 7.1
+
+### Improved
+
+- imagick is now installed from pecl in PHP 8.0
+- Bumped PHP minor versions
+
+### Fixed
+
+- Fixed issue with SSL certificates showing as invalid (#40)
+
 # v1.5.3
 
 ### Improved

diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ magicLAMP is a full PHP development environment that works like magic! ✨
 - 🙏 Switchable versions of **NodeJS and npm** with **nvm**
 - 🔍 Built-in **ElasticSearch**
 - 🐇 Built-in **RabbitMQ** with management GUI
+- 🪶 Built-in **Apache Kafka** broker with web GUI
 - ✅ **So much more**
 
 ## Getting Started

diff --git a/containers/workspace/home/.magiclamprc b/containers/workspace/home/.magiclamprc
@@ -1 +1 @@
-MAGICLAMP_VERSION="1.5"
+MAGICLAMP_VERSION="1.6"
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.5}
+    image: chrisnharvey/magiclamp-nginx:${MAGICLAMP_VERSION:-1.6}
 
     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.5}
+    image: chrisnharvey/magiclamp-postgres:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 5432:5432
@@ -30,7 +30,7 @@ services:
         ipv4_address: 10.0.10.15
 
   pgadmin:
-    image: chrisnharvey/magiclamp-pgadmin:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-pgadmin:${MAGICLAMP_VERSION:-1.6}
 
     networks:
       app_net:
@@ -49,7 +49,7 @@ services:
       - dns_internal
 
   mysql:
-    image: chrisnharvey/magiclamp-mysql:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-mysql:${MAGICLAMP_VERSION:-1.6}
 
     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.5}
+    image: chrisnharvey/magiclamp-phpmyadmin:${MAGICLAMP_VERSION:-1.6}
 
     networks:
       app_net:
@@ -80,7 +80,7 @@ services:
       - MYSQL_ROOT_PASSWORD=gg
 
   mailcatcher:
-    image: chrisnharvey/magiclamp-mailcatcher:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-mailcatcher:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 1025:1025
@@ -90,7 +90,7 @@ services:
         ipv4_address: 10.0.10.25
 
   workspace:
-    image: chrisnharvey/magiclamp-workspace:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-workspace:${MAGICLAMP_VERSION:-1.6}
 
     volumes:
       - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -113,7 +113,7 @@ services:
         ipv4_address: 10.0.10.5
 
   dns_internal:
-    image: chrisnharvey/magiclamp-dns-internal:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-dns-internal:${MAGICLAMP_VERSION:-1.6}
 
     dns: ${DNS_RESOLVER:-1.1.1.1}
 
@@ -122,7 +122,7 @@ services:
         ipv4_address: 10.0.10.2
 
   dns:
-    image: chrisnharvey/magiclamp-dns:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-dns:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 127.0.0.1:53:53/udp
@@ -133,7 +133,7 @@ services:
 
 
   redis:
-    image: chrisnharvey/magiclamp-redis:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-redis:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 6379:6379
@@ -143,7 +143,7 @@ services:
         ipv4_address: 10.0.10.21
 
   memcached:
-    image: chrisnharvey/magiclamp-memcached:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-memcached:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 11211:11211
@@ -153,7 +153,7 @@ services:
         ipv4_address: 10.0.10.11
 
   elasticsearch:
-    image: chrisnharvey/magiclamp-elasticsearch:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-elasticsearch:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 9200:9200
@@ -167,7 +167,7 @@ services:
         ipv4_address: 10.0.10.92
 
   rabbitmq:
-    image: chrisnharvey/magiclamp-rabbitmq:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-rabbitmq:${MAGICLAMP_VERSION:-1.6}
 
     hostname: magiclamp-rabbitmq
 
@@ -187,7 +187,7 @@ services:
         ipv4_address: 10.0.10.67
 
   s3:
-    image: chrisnharvey/magiclamp-s3:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-s3:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 9000:9000
@@ -204,7 +204,7 @@ services:
         ipv4_address: 10.0.10.68
 
   selenium_chrome:
-    image: chrisnharvey/magiclamp-selenium-chrome:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-selenium-chrome:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 4444:4444
@@ -223,7 +223,7 @@ services:
       - dns_internal
 
   selenium_firefox:
-    image: chrisnharvey/magiclamp-selenium-firefox:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-selenium-firefox:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 5555:4444
@@ -242,7 +242,7 @@ services:
       - dns_internal
 
   zookeeper:
-    image: chrisnharvey/magiclamp-zookeeper:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-zookeeper:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 2181:2181
@@ -260,7 +260,7 @@ services:
       ALLOW_ANONYMOUS_LOGIN: "yes"
 
   kafka:
-    image: chrisnharvey/magiclamp-kafka:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-kafka:${MAGICLAMP_VERSION:-1.6}
 
     ports:
       - 9092:9092
@@ -280,7 +280,7 @@ services:
       ALLOW_PLAINTEXT_LISTENER: "yes"
 
   akhq:
-    image: chrisnharvey/magiclamp-akhq:${MAGICLAMP_VERSION:-1.5}
+    image: chrisnharvey/magiclamp-akhq:${MAGICLAMP_VERSION:-1.6}
 
     networks:
       app_net:
@@ -293,7 +293,7 @@ services:
       - kafka
 
   php56:
-      image: chrisnharvey/magiclamp-php56:${MAGICLAMP_VERSION:-1.5}
+      image: chrisnharvey/magiclamp-php56:${MAGICLAMP_VERSION:-1.6}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -312,7 +312,7 @@ services:
         - dns_internal
 
   php70:
-      image: chrisnharvey/magiclamp-php70:${MAGICLAMP_VERSION:-1.5}
+      image: chrisnharvey/magiclamp-php70:${MAGICLAMP_VERSION:-1.6}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -331,7 +331,7 @@ services:
         - dns_internal
 
   php71:
-      image: chrisnharvey/magiclamp-php71:${MAGICLAMP_VERSION:-1.5}
+      image: chrisnharvey/magiclamp-php71:${MAGICLAMP_VERSION:-1.6}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -350,7 +350,7 @@ services:
         - dns_internal
 
   php72:
-      image: chrisnharvey/magiclamp-php72:${MAGICLAMP_VERSION:-1.5}
+      image: chrisnharvey/magiclamp-php72:${MAGICLAMP_VERSION:-1.6}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -369,7 +369,7 @@ services:
         - dns_internal
 
   php73:
-      image: chrisnharvey/magiclamp-php73:${MAGICLAMP_VERSION:-1.5}
+      image: chrisnharvey/magiclamp-php73:${MAGICLAMP_VERSION:-1.6}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -388,7 +388,7 @@ services:
         - dns_internal
 
   php74:
-      image: chrisnharvey/magiclamp-php74:${MAGICLAMP_VERSION:-1.5}
+      image: chrisnharvey/magiclamp-php74:${MAGICLAMP_VERSION:-1.6}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -407,7 +407,7 @@ services:
         - dns_internal
 
   php80:
-      image: chrisnharvey/magiclamp-php80:${MAGICLAMP_VERSION:-1.5}
+      image: chrisnharvey/magiclamp-php80:${MAGICLAMP_VERSION:-1.6}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects

diff --git a/docs/index.md b/docs/index.md
@@ -25,4 +25,5 @@
 - 🙏 Switchable versions of **NodeJS and npm** with **nvm**
 - 🔍 Built-in **ElasticSearch**
 - 🐇 Built-in **RabbitMQ** with management GUI
+- 🪶 Built-in **Apache Kafka** broker with web GUI
 - ✅ **So much more**