From 02f6876a21ba89fcf0e904e97c2053d7bf6c2e0c Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 3 Apr 2022 13:36:33 +0200 Subject: [PATCH 1/3] Make Devilbox arm64 compatible --- .devilbox/www/config.php | 4 ++-- CHANGELOG.md | 21 +++++++++++++++++++++ README.md | 5 +++-- docker-compose.yml | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index 0e2fd1af..7542e2fa 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -13,8 +13,8 @@ error_reporting(-1); putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); -$DEVILBOX_VERSION = 'v2.0.0'; -$DEVILBOX_DATE = '2022-03-28'; +$DEVILBOX_VERSION = 'v2.1.0'; +$DEVILBOX_DATE = '2022-04-03'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ea6f6ea..aa92baa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,27 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl ## Unreleased +## Release v2.1.0 (2022-04-03) + +This is now a 100% `arm64` compatible release. + +#### Fixed +- Fixed imklog: cannot open kernel log (/proc/kmsg): Operation not permitted. +- Fixed missing `arm64` support: [#855](https://github.com/cytopia/devilbox/issues/855) + +#### Added +- Added PHP images with `arm64` support for PHP: https://github.com/devilbox/docker-php-fpm/releases/tag/0.138 +- Added `vips` to PHP 8.0 +- Added `vips` to PHP 8.1 +- Added `swoole` to PHP 8.1 + +#### Removed +- Removed homebrew due to arm64 issues +- Removed postgres cmd client and apt repositories due to arm64 issues +- Removed mongodb cmd client and apt repositories due to arm64 issues +- Removed Ansible due to arm64 issues + + ## Release v2.0.0 (2022-03-28) The goal of this release is to reduce the overall size of Docker images and bring in latest versions. diff --git a/README.md b/README.md index 59589582..070cfcc4 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ [![PgSQL](https://github.com/cytopia/devilbox/actions/workflows/test-pgsql.yml/badge.svg)](https://github.com/cytopia/devilbox/actions/workflows/test-pgsql.yml) [![Redis](https://github.com/cytopia/devilbox/actions/workflows/test-redis.yml/badge.svg)](https://github.com/cytopia/devilbox/actions/workflows/test-redis.yml) +**Available Architectures:** `amd64`, `arm64`
Support for valid https out of the box. @@ -821,7 +822,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module | sqlsrv | | | | | | d | d | d | d | d | d | d | d | | ssh2 | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | | | standard | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | -| swoole | | d | d | d | d | d | d | d | d | d | d | | | +| swoole | | d | d | d | d | d | d | d | d | d | d | d | | | sysvmsg | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | sysvsem | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | sysvshm | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | @@ -829,7 +830,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module | tokenizer | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | uploadprogress | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | uuid | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | -| vips | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | | +| vips | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | wddx | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | | | | xdebug | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | xlswriter | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | diff --git a/docker-compose.yml b/docker-compose.yml index 511a544d..20795c66 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,7 +94,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.136 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.138 hostname: php ## From 7e85b8e609426314012809f3022772718c882925 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 5 Apr 2022 23:15:01 +0200 Subject: [PATCH 2/3] Update project files --- .devilbox/www/config.php | 2 +- CHANGELOG.md | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index 7542e2fa..7a39d270 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); $DEVILBOX_VERSION = 'v2.1.0'; -$DEVILBOX_DATE = '2022-04-03'; +$DEVILBOX_DATE = '2022-04-05'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/CHANGELOG.md b/CHANGELOG.md index aa92baa6..24b13780 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl ## Unreleased -## Release v2.1.0 (2022-04-03) +## Release v2.1.0 (2022-04-05) This is now a 100% `arm64` compatible release. @@ -22,8 +22,6 @@ This is now a 100% `arm64` compatible release. #### Removed - Removed homebrew due to arm64 issues -- Removed postgres cmd client and apt repositories due to arm64 issues -- Removed mongodb cmd client and apt repositories due to arm64 issues - Removed Ansible due to arm64 issues From 6e2f6ca181601fa67104882feaa36d9276fe0e49 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 5 Apr 2022 23:15:12 +0200 Subject: [PATCH 3/3] Use intermediate images --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 20795c66..755e6026 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,7 +94,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.138 + image: devilbox/php-fpm:${PHP_SERVER}-work-release-0.139 hostname: php ##