Merge branch 'hotfix/1.4.1'

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)
 
+# v1.4.1
+
+### 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
+- Bump Digital Ocean CLI version to v1.52.0
+
 ## v1.4.0
 
 ### New

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 && \
@@ -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

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
 

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
 

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 `<project-name>.<php-version>.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).