From 17b1560bef3e0368636961f3eec0b2bdc3078cff Mon Sep 17 00:00:00 2001 From: Chris Harvey Date: Sat, 21 Nov 2020 20:26:01 +0000 Subject: [PATCH 1/6] Enable imagick extension in PHP 8 container --- containers/php80/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/containers/php80/Dockerfile b/containers/php80/Dockerfile index 09afa29..8f4d8ba 100644 --- a/containers/php80/Dockerfile +++ b/containers/php80/Dockerfile @@ -24,7 +24,8 @@ RUN docker-php-source extract && \ phpize && \ ./configure && \ make install && \ - docker-php-source delete + docker-php-source delete && \ + docker-php-ext-enable imagick 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 \ No newline at end of file From b95a844d3704fb6c0e6856dbc807c3b27614c1e7 Mon Sep 17 00:00:00 2001 From: Chris Harvey Date: Sat, 21 Nov 2020 20:26:14 +0000 Subject: [PATCH 2/6] Fix broken links in documentation --- docs/automatic-dns/index.md | 4 +++- docs/getting-started/installing-magiclamp.md | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/automatic-dns/index.md b/docs/automatic-dns/index.md index 89a2390..8f556f9 100644 --- a/docs/automatic-dns/index.md +++ b/docs/automatic-dns/index.md @@ -7,7 +7,9 @@ magicLAMP has a built-in DNS resolver which will automatically resolve a number Simply change the DNS resolver on your host machine to `127.0.0.1`. -!!! note "Windows Users" For Windows users, go to your Network Settings and update `DNS` field with `127.0.0.1` for `IPv4 protocol` on the `vEthernet (WSL)` adapter. +!!! note "Windows Users" + For Windows users, go to your Network Settings and update `DNS` field with + `127.0.0.1` for `IPv4 protocol` on the `vEthernet (WSL)` adapter. ## Automatic PHP version resolution diff --git a/docs/getting-started/installing-magiclamp.md b/docs/getting-started/installing-magiclamp.md index e0584e9..c95b6bc 100644 --- a/docs/getting-started/installing-magiclamp.md +++ b/docs/getting-started/installing-magiclamp.md @@ -28,7 +28,7 @@ your needs. !!! note "Windows Users" For Windows users, we recommend storing your projects directory inside WSL2. - [See here](https://magiclamp.app/en/stable/troubleshooting/performance-on-windows) for more information. + [See here](../../troubleshooting/performance-on-windows) for more information. ### Step 3 @@ -41,16 +41,16 @@ docker-compose up -d ### Step 4 (optional) -To take full advantage of magicLAMP, you may want to use [Automatic DNS](/automatic-dns) -and [Automatic SSL](https://magiclamp.app/en/stable/automatic-ssl). +To take full advantage of magicLAMP, you may want to use [Automatic DNS](../../automatic-dns) +and [Automatic SSL](../../automatic-ssl). See their respective documentation for information on how to set them up. ### You're done -If you have [Automatic DNS](https://magiclamp.app/en/stable/automatic-dns) setup, you can now visit any of your projects +If you have [Automatic DNS](../../automatic-dns) setup, you can now visit any of your projects using any PHP version by visiting `..localhost` in your browser (e.g. `my-awesome-project.74.localhost`) -You can also access the [magicLAMP shell](https://magiclamp.app/en/stable/workspace) which by typing `./shell.sh` +You can also access the [magicLAMP shell](../../workspace) which by typing `./shell.sh` (or `.\shell.cmd` on Windows). \ No newline at end of file From 1a2c0c1197c66e1a9cf4e5aca45317bf0aefb421 Mon Sep 17 00:00:00 2001 From: Chris Harvey Date: Sat, 21 Nov 2020 20:26:21 +0000 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a6823b..5427e20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop) +# v1.4.1 + +### Fixed + +- Enable imagick extension in PHP 8 container +- Fix broken links in documentation + ## v1.4.0 ### New From 525e9231872ab946cd1e8906ebb7e59433c1d45f Mon Sep 17 00:00:00 2001 From: Chris Harvey Date: Sat, 21 Nov 2020 20:29:24 +0000 Subject: [PATCH 4/6] Update Stripe CLI and Digital Ocean CLI --- containers/workspace/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/workspace/Dockerfile b/containers/workspace/Dockerfile index 569f530..fe2ab08 100644 --- a/containers/workspace/Dockerfile +++ b/containers/workspace/Dockerfile @@ -78,11 +78,11 @@ RUN curl --location "https://github.com/weaveworks/eksctl/releases/download/late mv /tmp/eksctl /usr/local/bin # Install doctl -RUN curl --location https://github.com/digitalocean/doctl/releases/download/v1.41.0/doctl-1.41.0-linux-amd64.tar.gz | tar xz -C /tmp && \ +RUN curl --location https://github.com/digitalocean/doctl/releases/download/v1.52.0/doctl-1.52.0-linux-amd64.tar.gz | tar xz -C /tmp && \ mv /tmp/doctl /usr/local/bin # Install Stripe CLI -RUN curl --location "https://github.com/stripe/stripe-cli/releases/download/v1.4.0/stripe_1.4.0_linux_x86_64.tar.gz" | tar xz -C /tmp && \ +RUN curl --location "https://github.com/stripe/stripe-cli/releases/download/v1.5.5/stripe_1.5.5_linux_x86_64.tar.gz" | tar xz -C /tmp && \ mv /tmp/stripe /usr/local/bin/stripe && \ chmod +x /usr/local/bin/stripe From a62e1861d407d6bf73acbfa3a8de42f2c61c88ea Mon Sep 17 00:00:00 2001 From: Chris Harvey Date: Sat, 21 Nov 2020 20:29:29 +0000 Subject: [PATCH 5/6] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5427e20..cd7ee8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ - Enable imagick extension in PHP 8 container - Fix broken links in documentation +- Bump Stripe CLI version to v1.5.5 +- Bump Digital Ocean CLI version to v1.52.0 ## v1.4.0 From 8acb56fb3dd954e1ba2107ee6867fe820af2cf51 Mon Sep 17 00:00:00 2001 From: Chris Harvey Date: Sun, 6 Dec 2020 13:42:02 +0000 Subject: [PATCH 6/6] Use stable release of PHP 8.0 --- CHANGELOG.md | 1 + containers/php80/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd7ee8b..7a9a7fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Fixed +- Stable release of PHP 8.0 now included - Enable imagick extension in PHP 8 container - Fix broken links in documentation - Bump Stripe CLI version to v1.5.5 diff --git a/containers/php80/Dockerfile b/containers/php80/Dockerfile index 8f4d8ba..4ac522b 100644 --- a/containers/php80/Dockerfile +++ b/containers/php80/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0-rc-fpm +FROM php:8.0-fpm RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -qq wget libgd3 libgd-dev libwebp-dev libpq-dev libmagickwand-dev libfreetype6-dev libjpeg62-turbo-dev libpng-dev libzip-dev nghttp2 libhiredis-dev libmemcached-dev pkg-config zlib1g-dev && \