Skip to content

Commit b3f949a

Browse files
chrisnharveychrisnharvey
committed
Merge branch 'release/1.6.0'
2 parents 442fe47 + 7475c3a commit b3f949a

File tree

5 files changed

+45
-27
lines changed

5 files changed

+45
-27
lines changed

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)
44

5+
# v1.6.0
6+
7+
### New
8+
9+
- Added Kafka broker with Zookeeper and Web UI (AKHQ)
10+
- rdkafka extension is now installed on PHP versions >= 7.1
11+
12+
### Improved
13+
14+
- imagick is now installed from pecl in PHP 8.0
15+
- Bumped PHP minor versions
16+
17+
### Fixed
18+
19+
- Fixed issue with SSL certificates showing as invalid (#40)
20+
521
# v1.5.3
622

723
### Improved

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ magicLAMP is a full PHP development environment that works like magic! ✨
2424
- 🙏 Switchable versions of **NodeJS and npm** with **nvm**
2525
- 🔍 Built-in **ElasticSearch**
2626
- 🐇 Built-in **RabbitMQ** with management GUI
27+
- 🪶 Built-in **Apache Kafka** broker with web GUI
2728
- ✅ **So much more**
2829

2930
## Getting Started

‎containers/workspace/home/.magiclamprc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MAGICLAMP_VERSION="1.5"
1+
MAGICLAMP_VERSION="1.6"

‎docker-compose.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
nginx:
5-
image: chrisnharvey/magiclamp-nginx:${MAGICLAMP_VERSION:-1.5}
5+
image: chrisnharvey/magiclamp-nginx:${MAGICLAMP_VERSION:-1.6}
66

77
volumes:
88
- ${PROJECTS_DIR:-./data/projects}:/projects
@@ -17,7 +17,7 @@ services:
1717
ipv4_address: 10.0.10.10
1818

1919
postgres:
20-
image: chrisnharvey/magiclamp-postgres:${MAGICLAMP_VERSION:-1.5}
20+
image: chrisnharvey/magiclamp-postgres:${MAGICLAMP_VERSION:-1.6}
2121

2222
ports:
2323
- 5432:5432
@@ -30,7 +30,7 @@ services:
3030
ipv4_address: 10.0.10.15
3131

3232
pgadmin:
33-
image: chrisnharvey/magiclamp-pgadmin:${MAGICLAMP_VERSION:-1.5}
33+
image: chrisnharvey/magiclamp-pgadmin:${MAGICLAMP_VERSION:-1.6}
3434

3535
networks:
3636
app_net:
@@ -49,7 +49,7 @@ services:
4949
- dns_internal
5050

5151
mysql:
52-
image: chrisnharvey/magiclamp-mysql:${MAGICLAMP_VERSION:-1.5}
52+
image: chrisnharvey/magiclamp-mysql:${MAGICLAMP_VERSION:-1.6}
5353

5454
volumes:
5555
- mysql_data:/var/lib/mysql
@@ -67,7 +67,7 @@ services:
6767
ipv4_address: 10.0.10.20
6868

6969
phpmyadmin:
70-
image: chrisnharvey/magiclamp-phpmyadmin:${MAGICLAMP_VERSION:-1.5}
70+
image: chrisnharvey/magiclamp-phpmyadmin:${MAGICLAMP_VERSION:-1.6}
7171

7272
networks:
7373
app_net:
@@ -80,7 +80,7 @@ services:
8080
- MYSQL_ROOT_PASSWORD=gg
8181

8282
mailcatcher:
83-
image: chrisnharvey/magiclamp-mailcatcher:${MAGICLAMP_VERSION:-1.5}
83+
image: chrisnharvey/magiclamp-mailcatcher:${MAGICLAMP_VERSION:-1.6}
8484

8585
ports:
8686
- 1025:1025
@@ -90,7 +90,7 @@ services:
9090
ipv4_address: 10.0.10.25
9191

9292
workspace:
93-
image: chrisnharvey/magiclamp-workspace:${MAGICLAMP_VERSION:-1.5}
93+
image: chrisnharvey/magiclamp-workspace:${MAGICLAMP_VERSION:-1.6}
9494

9595
volumes:
9696
- ${PROJECTS_DIR:-./data/projects}:/projects
@@ -113,7 +113,7 @@ services:
113113
ipv4_address: 10.0.10.5
114114

115115
dns_internal:
116-
image: chrisnharvey/magiclamp-dns-internal:${MAGICLAMP_VERSION:-1.5}
116+
image: chrisnharvey/magiclamp-dns-internal:${MAGICLAMP_VERSION:-1.6}
117117

118118
dns: ${DNS_RESOLVER:-1.1.1.1}
119119

@@ -122,7 +122,7 @@ services:
122122
ipv4_address: 10.0.10.2
123123

124124
dns:
125-
image: chrisnharvey/magiclamp-dns:${MAGICLAMP_VERSION:-1.5}
125+
image: chrisnharvey/magiclamp-dns:${MAGICLAMP_VERSION:-1.6}
126126

127127
ports:
128128
- 127.0.0.1:53:53/udp
@@ -133,7 +133,7 @@ services:
133133

134134

135135
redis:
136-
image: chrisnharvey/magiclamp-redis:${MAGICLAMP_VERSION:-1.5}
136+
image: chrisnharvey/magiclamp-redis:${MAGICLAMP_VERSION:-1.6}
137137

138138
ports:
139139
- 6379:6379
@@ -143,7 +143,7 @@ services:
143143
ipv4_address: 10.0.10.21
144144

145145
memcached:
146-
image: chrisnharvey/magiclamp-memcached:${MAGICLAMP_VERSION:-1.5}
146+
image: chrisnharvey/magiclamp-memcached:${MAGICLAMP_VERSION:-1.6}
147147

148148
ports:
149149
- 11211:11211
@@ -153,7 +153,7 @@ services:
153153
ipv4_address: 10.0.10.11
154154

155155
elasticsearch:
156-
image: chrisnharvey/magiclamp-elasticsearch:${MAGICLAMP_VERSION:-1.5}
156+
image: chrisnharvey/magiclamp-elasticsearch:${MAGICLAMP_VERSION:-1.6}
157157

158158
ports:
159159
- 9200:9200
@@ -167,7 +167,7 @@ services:
167167
ipv4_address: 10.0.10.92
168168

169169
rabbitmq:
170-
image: chrisnharvey/magiclamp-rabbitmq:${MAGICLAMP_VERSION:-1.5}
170+
image: chrisnharvey/magiclamp-rabbitmq:${MAGICLAMP_VERSION:-1.6}
171171

172172
hostname: magiclamp-rabbitmq
173173

@@ -187,7 +187,7 @@ services:
187187
ipv4_address: 10.0.10.67
188188

189189
s3:
190-
image: chrisnharvey/magiclamp-s3:${MAGICLAMP_VERSION:-1.5}
190+
image: chrisnharvey/magiclamp-s3:${MAGICLAMP_VERSION:-1.6}
191191

192192
ports:
193193
- 9000:9000
@@ -204,7 +204,7 @@ services:
204204
ipv4_address: 10.0.10.68
205205

206206
selenium_chrome:
207-
image: chrisnharvey/magiclamp-selenium-chrome:${MAGICLAMP_VERSION:-1.5}
207+
image: chrisnharvey/magiclamp-selenium-chrome:${MAGICLAMP_VERSION:-1.6}
208208

209209
ports:
210210
- 4444:4444
@@ -223,7 +223,7 @@ services:
223223
- dns_internal
224224

225225
selenium_firefox:
226-
image: chrisnharvey/magiclamp-selenium-firefox:${MAGICLAMP_VERSION:-1.5}
226+
image: chrisnharvey/magiclamp-selenium-firefox:${MAGICLAMP_VERSION:-1.6}
227227

228228
ports:
229229
- 5555:4444
@@ -242,7 +242,7 @@ services:
242242
- dns_internal
243243

244244
zookeeper:
245-
image: chrisnharvey/magiclamp-zookeeper:${MAGICLAMP_VERSION:-1.5}
245+
image: chrisnharvey/magiclamp-zookeeper:${MAGICLAMP_VERSION:-1.6}
246246

247247
ports:
248248
- 2181:2181
@@ -260,7 +260,7 @@ services:
260260
ALLOW_ANONYMOUS_LOGIN: "yes"
261261

262262
kafka:
263-
image: chrisnharvey/magiclamp-kafka:${MAGICLAMP_VERSION:-1.5}
263+
image: chrisnharvey/magiclamp-kafka:${MAGICLAMP_VERSION:-1.6}
264264

265265
ports:
266266
- 9092:9092
@@ -280,7 +280,7 @@ services:
280280
ALLOW_PLAINTEXT_LISTENER: "yes"
281281

282282
akhq:
283-
image: chrisnharvey/magiclamp-akhq:${MAGICLAMP_VERSION:-1.5}
283+
image: chrisnharvey/magiclamp-akhq:${MAGICLAMP_VERSION:-1.6}
284284

285285
networks:
286286
app_net:
@@ -293,7 +293,7 @@ services:
293293
- kafka
294294

295295
php56:
296-
image: chrisnharvey/magiclamp-php56:${MAGICLAMP_VERSION:-1.5}
296+
image: chrisnharvey/magiclamp-php56:${MAGICLAMP_VERSION:-1.6}
297297

298298
volumes:
299299
- ${PROJECTS_DIR:-./data/projects}:/projects
@@ -312,7 +312,7 @@ services:
312312
- dns_internal
313313

314314
php70:
315-
image: chrisnharvey/magiclamp-php70:${MAGICLAMP_VERSION:-1.5}
315+
image: chrisnharvey/magiclamp-php70:${MAGICLAMP_VERSION:-1.6}
316316

317317
volumes:
318318
- ${PROJECTS_DIR:-./data/projects}:/projects
@@ -331,7 +331,7 @@ services:
331331
- dns_internal
332332

333333
php71:
334-
image: chrisnharvey/magiclamp-php71:${MAGICLAMP_VERSION:-1.5}
334+
image: chrisnharvey/magiclamp-php71:${MAGICLAMP_VERSION:-1.6}
335335

336336
volumes:
337337
- ${PROJECTS_DIR:-./data/projects}:/projects
@@ -350,7 +350,7 @@ services:
350350
- dns_internal
351351

352352
php72:
353-
image: chrisnharvey/magiclamp-php72:${MAGICLAMP_VERSION:-1.5}
353+
image: chrisnharvey/magiclamp-php72:${MAGICLAMP_VERSION:-1.6}
354354

355355
volumes:
356356
- ${PROJECTS_DIR:-./data/projects}:/projects
@@ -369,7 +369,7 @@ services:
369369
- dns_internal
370370

371371
php73:
372-
image: chrisnharvey/magiclamp-php73:${MAGICLAMP_VERSION:-1.5}
372+
image: chrisnharvey/magiclamp-php73:${MAGICLAMP_VERSION:-1.6}
373373

374374
volumes:
375375
- ${PROJECTS_DIR:-./data/projects}:/projects
@@ -388,7 +388,7 @@ services:
388388
- dns_internal
389389

390390
php74:
391-
image: chrisnharvey/magiclamp-php74:${MAGICLAMP_VERSION:-1.5}
391+
image: chrisnharvey/magiclamp-php74:${MAGICLAMP_VERSION:-1.6}
392392

393393
volumes:
394394
- ${PROJECTS_DIR:-./data/projects}:/projects
@@ -407,7 +407,7 @@ services:
407407
- dns_internal
408408

409409
php80:
410-
image: chrisnharvey/magiclamp-php80:${MAGICLAMP_VERSION:-1.5}
410+
image: chrisnharvey/magiclamp-php80:${MAGICLAMP_VERSION:-1.6}
411411

412412
volumes:
413413
- ${PROJECTS_DIR:-./data/projects}:/projects

‎docs/index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@
2525
- 🙏 Switchable versions of **NodeJS and npm** with **nvm**
2626
- 🔍 Built-in **ElasticSearch**
2727
- 🐇 Built-in **RabbitMQ** with management GUI
28+
- 🪶 Built-in **Apache Kafka** broker with web GUI
2829
- ✅ **So much more**

0 commit comments

Comments
 (0)