Merge branch 'release/1.3.0'

.github/workflows/build.yml

@@ -5,9 +5,6 @@ on:
 
   pull_request:
 
-  schedule:
-    - cron:  '0 18 * * *'
-
 jobs:
 
   build:
@@ -37,4 +34,4 @@ jobs:
         email: ${{ secrets.DOCKER_EMAIL }}
 
     - name: Push Docker Images
-      run: scripts/push.sh
+      run: scripts/push.sh

CHANGELOG.md

@@ -2,14 +2,25 @@
 
 ## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)
 
+## v1.3.0
+
+### New
+
+- Added ngrok to workspace container ([#33](https://github.com/chrisnharvey/magicLAMP/issues/33), [437e5ce](https://github.com/chrisnharvey/magicLAMP/commit/437e5cea445ecb0bf128f45cdf69ee92ba745ac3))
+
+### Improved
+
+- PHP and Node versions are now shown in shell ([#9](https://github.com/chrisnharvey/magicLAMP/issues/9), [4dfa7b6](https://github.com/chrisnharvey/magicLAMP/commit/4dfa7b6db036be15c25db70079ec76cb18bcfecf))
+- Added temporary upgrade script to prevent upgrade issues ([fdd6c98](https://github.com/chrisnharvey/magicLAMP/commit/fdd6c987d353739a54d1852fecd25e28fdcb6d06))
+
 ## v1.2.0
 
 ### New
 
 - Memcached container is now included ([#24](https://github.com/chrisnharvey/magicLAMP/issues/24), [28aabe0](https://github.com/chrisnharvey/magicLAMP/commit/28aabe0b2a7fd9464406e8101c0fa4a34b6cb45e))
 - RabbitMQ container is now included ([#25](https://github.com/chrisnharvey/magicLAMP/issues/25), [37845da](https://github.com/chrisnharvey/magicLAMP/commit/37845da9ba4413a4d87ac8daff9569a9b0fb2f00))
 - Memcached extension is now installed for all PHP versions ([2991644](https://github.com/chrisnharvey/magicLAMP/commit/2991644e17e94f4c72520ed918ae3b564ab7e64d))
-- DNS resolver is now included ([#26#](https://github.com/chrisnharvey/magicLAMP/issues/26), [9efcbfa](https://github.com/chrisnharvey/magicLAMP/commit/9efcbfa2ef24a83f8a3cfcedf105c91cbd546a63))
+- DNS resolver is now included ([#26](https://github.com/chrisnharvey/magicLAMP/issues/26), [9efcbfa](https://github.com/chrisnharvey/magicLAMP/commit/9efcbfa2ef24a83f8a3cfcedf105c91cbd546a63))
 
 ### Improved
 
@@ -44,4 +55,4 @@
 
 ## v1.0.0
 
-Initial release
+Initial release

README.md

@@ -4,7 +4,7 @@
 <a href="https://github.com/chrisnharvey/magicLAMP/actions"><img src="https://img.shields.io/github/workflow/status/chrisnharvey/magicLAMP/Build/master" alt="Build status"></a>
 <a href="http://magiclamp.app/en/stable/?badge=stable"><img src="https://readthedocs.org/projects/magiclamp/badge/?version=stable" alt="Documentation Status"></a>
 <a href="https://twitter.com/chrisnharvey"><img src="http://img.shields.io/badge/[email protected]?style=square" alt="Author"></a>
-<a href="https://twitter.com/chrisnharvey"><img src="https://img.shields.io/github/v/release/chrisnharvey/magicLAMP" alt="Latest version"></a>
+<a href="https://github.com/chrisnharvey/magicLAMP/releases"><img src="https://img.shields.io/github/v/release/chrisnharvey/magicLAMP" alt="Latest version"></a>
 <a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=square" alt="License"></a>
 </p>
 

SECURITY.md

@@ -0,0 +1,95 @@
+# Security Policy
+
+If you discover a security vulnerability in magicLAMP, please **do not** report it publicly. Instead,
+please see the guide below.
+
+## Supported Versions
+
+Only the latest version of magicLAMP is supported. It is therefore recommended that you keep magicLAMP up-to-date.
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability in magicLAMP, please report it to Chris Harvey at [email protected].
+
+**All security issues will be promptly addressed.**
+
+### Public PGP Key
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: Keybase OpenPGP v2.0.58
+Comment: https://keybase.io/crypto
+
+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
+=j6G9
+-----END PGP PUBLIC KEY BLOCK-----
+```

containers/default/nginx/Dockerfile → containers/nginx/Dockerfile

@@ -3,10 +3,9 @@ FROM nginx:latest
 ADD ./config/nginx.conf /etc/nginx/conf.d/vhosts.conf
 ADD ./config/ssl.ext /etc/nginx/ssl.ext
 
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -qq openssl
-
-RUN mkdir /ca
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -qq openssl && \
+    mkdir /ca
 
 ADD start.sh /start.sh
 

containers/php56/Dockerfile

@@ -0,0 +1,14 @@
+FROM php:5.6-fpm
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -qq libpq-dev libmagickwand-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev libzip-dev nghttp2 libhiredis-dev libmemcached-dev pkg-config zlib1g-dev && \
+    docker-php-ext-install -j$(nproc) iconv && \
+    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
+    docker-php-ext-install -j$(nproc) gd && \
+    docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql zip bcmath && \
+    pecl install swoole-2.0.10 --enable-sockets --enable-openssl --enable-http2 --enable-async-redis --enable-timewheel --enable-mysqlnd --enable-ringbuffer && \
+    pecl install memcached-2.2.0 && \
+    docker-php-ext-enable opcache swoole memcached
+
+ADD ./config/php.ini /usr/local/etc/php/conf.d/php.ini
+ADD ./config/php-fpm.conf /usr/local/etc/php-fpm.d/zzz-magicLAMP.conf

containers/php70/Dockerfile

@@ -0,0 +1,15 @@
+FROM php:7.0-fpm
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -qq libpq-dev libmagickwand-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev libzip-dev nghttp2 libhiredis-dev libmemcached-dev pkg-config zlib1g-dev && \
+    docker-php-ext-install -j$(nproc) iconv && \
+    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
+    docker-php-ext-install -j$(nproc) gd && \
+    docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql zip bcmath && \
+    pecl install imagick && \
+    pecl install swoole-4.3.6 --enable-sockets --enable-openssl --enable-http2 --enable-async-redis --enable-timewheel --enable-mysqlnd --enable-ringbuffer && \
+    pecl install memcached && \
+    docker-php-ext-enable imagick opcache swoole memcached
+
+ADD ./config/php.ini /usr/local/etc/php/conf.d/php.ini
+ADD ./config/php-fpm.conf /usr/local/etc/php-fpm.d/zzz-magicLAMP.conf

containers/php71/Dockerfile

@@ -0,0 +1,15 @@
+FROM php:7.1-fpm
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -qq libpq-dev libmagickwand-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev libzip-dev nghttp2 libhiredis-dev libmemcached-dev pkg-config zlib1g-dev && \
+    docker-php-ext-install -j$(nproc) iconv && \
+    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
+    docker-php-ext-install -j$(nproc) gd && \
+    docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql zip bcmath && \
+    pecl install imagick && \
+    pecl install swoole --enable-sockets --enable-openssl --enable-http2 --enable-async-redis --enable-timewheel --enable-mysqlnd --enable-ringbuffer && \
+    pecl install memcached && \
+    docker-php-ext-enable imagick opcache swoole memcached
+
+ADD ./config/php.ini /usr/local/etc/php/conf.d/php.ini
+ADD ./config/php-fpm.conf /usr/local/etc/php-fpm.d/zzz-magicLAMP.conf

containers/php72/Dockerfile

@@ -0,0 +1,15 @@
+FROM php:7.2-fpm
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -qq libpq-dev libmagickwand-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev libzip-dev nghttp2 libhiredis-dev libmemcached-dev pkg-config zlib1g-dev && \
+    docker-php-ext-install -j$(nproc) iconv && \
+    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
+    docker-php-ext-install -j$(nproc) gd && \
+    docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql zip bcmath && \
+    pecl install imagick && \
+    pecl install swoole --enable-sockets --enable-openssl --enable-http2 --enable-async-redis --enable-timewheel --enable-mysqlnd --enable-ringbuffer && \
+    pecl install memcached && \
+    docker-php-ext-enable imagick opcache sodium swoole memcached
+
+ADD ./config/php.ini /usr/local/etc/php/conf.d/php.ini
+ADD ./config/php-fpm.conf /usr/local/etc/php-fpm.d/zzz-magicLAMP.conf

containers/php73/Dockerfile

@@ -0,0 +1,15 @@
+FROM php:7.3-fpm
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -qq libpq-dev libmagickwand-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev libzip-dev nghttp2 libhiredis-dev libmemcached-dev pkg-config zlib1g-dev && \
+    docker-php-ext-install -j$(nproc) iconv && \
+    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
+    docker-php-ext-install -j$(nproc) gd && \
+    docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql zip bcmath && \
+    pecl install imagick && \
+    pecl install swoole --enable-sockets --enable-openssl --enable-http2 --enable-async-redis --enable-timewheel --enable-mysqlnd --enable-ringbuffer && \
+    pecl install memcached && \
+    docker-php-ext-enable imagick opcache sodium swoole memcached
+
+ADD ./config/php.ini /usr/local/etc/php/conf.d/php.ini
+ADD ./config/php-fpm.conf /usr/local/etc/php-fpm.d/zzz-magicLAMP.conf