From e6e5a1f8c617ad32eeee4f7c4cab99172e5ffeeb Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 18 May 2019 15:49:41 +0200 Subject: [PATCH 1/7] Add Devilbox Flames to README --- README.md | 90 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 329fb4f7..8cd12ed0 100644 --- a/README.md +++ b/README.md @@ -48,31 +48,35 @@ Furthermore, the Devilbox provides an **identical** and **reproducible developme * [Docker Engine 1.12.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-21) * [Docker Compose 1.9.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-21) -**Important** - -Before updating the Devilbox ensure to always check for breaking changes until the stable release is out: - -1. [Forum: Announcements](https://devilbox.discourse.group/c/announcements) -2. [Changelog](CHANGELOG.md) -3. [Updating](UPDATING.md) ## Architecture +#### Available Stacks + The Devilbox aims to be a swiss army knife for local development by providing you all the services you would ever need. To get an idea about the architecture behind it and to also see what's available have a look at the following diagrams and tables. -#### Smallest Stack -This is the smallest possible and fully functional stack you can run: - - - -> [Devilbox artwork](https://github.com/devilbox/artwork) - -#### Full Stack -To better understand what is actually possible have a look at the full example: - - + + + + + + + + + +
+

Smallest stack

+

This is the smallest possible and fully functional stack you can run

+ 		+

Full stack

+

To better understand what is actually possible have a look at the full example

+
+ + + +
> [Devilbox artwork](https://github.com/devilbox/artwork) @@ -106,9 +110,10 @@ simplify your every-day life. If you ever run into any unforseen issues, feel fr - - - + + + + @@ -128,11 +133,17 @@ simplify your every-day life. If you ever run into any unforseen issues, feel fr + +

Documentation

Chat

Forum

Documentation

Chat

Forum

Flames
+ + + +
devilbox.readthedocs.io gitter.im/devilbox devilbox.discourse.groupgithub.com/devilbox/flames
@@ -151,15 +162,15 @@ simplify your every-day life. If you ever run into any unforseen issues, feel fr - 
# Get the Devilbox
-$ git clone https://github.com/cytopia/devilbox
-
# Create docker-compose environment file
-$ cd devilbox
-$ cp env-example .env
-
# Edit your configuration
-$ vim .env
-
# Start all container
-$ docker-compose up
+
# Get the Devilbox
+git clone https://github.com/cytopia/devilbox
+
# Create docker-compose environment file
+cd devilbox
+cp env-example .env
+
# Edit your configuration
+vim .env
+
# Start all container
+docker-compose up
1. Clone https://github.com/cytopia/devilbox to C:\devilbox with Git for Windows

@@ -183,7 +194,7 @@ C:\devilbox> docker-compose up The above will start all containers, you can however also just start the containers you actually need. This is achieved by simply specifying them in the docker-compose command. ```bash -$ docker-compose up httpd php mysql redis +docker-compose up httpd php mysql redis ``` > **Documentation:** > [Start only some container](https://devilbox.readthedocs.io/en/latest/getting-started/start-the-devilbox.html#start-some-container) @@ -345,10 +356,9 @@ Every single attachable container comes with many different versions. In order t -[1] PHP 5.2 is available to use, but it is not officially supported. The Devilbox intranet does not work with this version as PHP 5.2 does not support namespaces. -Furthermore PHP 5.2 does only work with Apache 2.4, Nginx stable and Nginx mainline. It does not work with Apache 2.2. Use at your own risk. +[1] PHP 5.2 is available to use, but it is not officially supported. The Devilbox intranet does not work with this version as PHP 5.2 does not support namespaces. Furthermore PHP 5.2 does only work with Apache 2.4, Nginx stable and Nginx mainline. It does not work with Apache 2.2. Use at your own risk. -[2] PHP 7.4 and PHP 8.0 are upcoming unreleased versions of PHP, which are directly built out of their [official git branches](https://github.com/php/php-src/) every night to assure you will leverage their latest features. +[2] PHP 7.4 and PHP 8.0 are upcoming unreleased versions of PHP, which are directly built out of their [official git branches](https://github.com/php/php-src/) every night to assure you will leverage their latest features. > **Documentation:** > [Change container versions](https://devilbox.readthedocs.io/en/latest/getting-started/change-container-versions.html) @@ -433,12 +443,12 @@ Navigate the the Devilbox directory and type the below listed command: - 
host> ./shell.sh
-devilbox@php-7.0.19 in /shared/httpd $
+
host> ./shell.sh
+devilbox@php-7.0.19 in /shared/httpd $
- 
C:\devilbox> shell.bat
-devilbox@php-7.0.19 in /shared/httpd $
+
C:\devilbox> shell.bat
+devilbox@php-7.0.19 in /shared/httpd $
@@ -526,6 +536,10 @@ The Devilbox has everything setup for you. The only thing you will have to insta :star: Xdebug Xdebug and a full blown PHP-FPM server is ready to serve. + + :star: Devilbox Flames + Devilbox community plugins a.k.a. Devilbox Flames. + :star: Many more See Documentation for all available features. From c04750aa153e06860f1ccbac19fb40be43206bd4 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 20 May 2019 23:53:53 +0200 Subject: [PATCH 2/7] User latest PHP-FPM version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ceb2d587..1d4917a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.87 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.88 hostname: php ## From 23ac8cde1a59318d4f97676817e735264882b287 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 21 May 2019 08:53:43 +0200 Subject: [PATCH 3/7] Bump version and update Changelog --- .devilbox/www/config.php | 2 +- CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index 0f5cf1bc..cd7b74c2 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 = 'v1.0.1'; -$DEVILBOX_DATE = '2019-04-27'; +$DEVILBOX_DATE = '2019-05-21'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/CHANGELOG.md b/CHANGELOG.md index bb6fe396..486a778c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,13 +11,20 @@ major versions. - Fixed various typos in documentation - Fix CI tests: They still expected a mounted mail directory instead of a Docker volume - Fix mods for PHP 8.0 +- Make npm binaries available in $PATH - Remove orphaned mentions of HOST_PATH_MYSQL_DATADIR +- Allow symlinks in autostart scripts #### Added - Documentation: Setup ProcessWire - Tool: Angular CLI - Tool: Laravel Lumen +- Tool: [prestissimo](https://github.com/hirak/prestissimo) +- Tool: [yq](https://github.com/mikefarah/yq) +- Module: OAuth +#### Removed +- Enchant module for PHP 7.4 and PHP 8.0 (build breaks) ## Bugfix Release v1.0.1 (2019-03-24) From 15dcf8b3505c7282cb870557abc86b925253365c Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 21 May 2019 09:09:05 +0200 Subject: [PATCH 4/7] Show OAuth modules in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8cd12ed0..bbc99e0d 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,6 @@ Furthermore, the Devilbox provides an **identical** and **reproducible developme * [Docker Engine 1.12.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-21) * [Docker Compose 1.9.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-21) - ## Architecture #### Available Stacks @@ -714,7 +713,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module | date | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | dba | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | dom | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | -| enchant | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | +| enchant | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | | ereg | | ✔ | ✔ | ✔ | ✔ | | | | | | | | exif | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | FFI | | | | | | | | | | 🗸 | 🗸 | @@ -746,6 +745,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module | mysql | ✔ | ✔ | 🗸 | 🗸 | 🗸 | | | | | | | | mysqli | ✔ | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | mysqlnd | | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | +| OAuth | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | | oci8 | | d | d | d | d | d | d | d | d | d | d | | openssl | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | pcntl | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | From 23a9b2b88983a312117e1e4a58c75b31f95d71ac Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 21 May 2019 09:21:59 +0200 Subject: [PATCH 5/7] Prepare Bugfix release --- .devilbox/www/config.php | 2 +- CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index cd7b74c2..dadaa6e3 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -13,7 +13,7 @@ error_reporting(-1); putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); -$DEVILBOX_VERSION = 'v1.0.1'; +$DEVILBOX_VERSION = 'v1.0.2'; $DEVILBOX_DATE = '2019-05-21'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; diff --git a/CHANGELOG.md b/CHANGELOG.md index 486a778c..d5c8accf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ major versions. -## [Unreleased] +## Bugfix Release v1.0.2 (2019-05-21) #### Fixed - Fixed various typos in documentation From 2294672403f8895bc194301cfb1e76ced7d4acf3 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 21 May 2019 09:24:57 +0200 Subject: [PATCH 6/7] Fix table valign --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bbc99e0d..371607b3 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,11 @@ have a look at the following diagrams and tables. - - From 19e5d03fe0047b14fabace078bb81a1053cb5e6e Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 21 May 2019 09:45:06 +0200 Subject: [PATCH 7/7] Add yq to available tools --- docs/_includes/links/tools.rst | 6 ++++++ docs/readings/available-tools.rst | 2 ++ 2 files changed, 8 insertions(+) diff --git a/docs/_includes/links/tools.rst b/docs/_includes/links/tools.rst index 20adea97..f526b131 100644 --- a/docs/_includes/links/tools.rst +++ b/docs/_includes/links/tools.rst @@ -273,6 +273,12 @@ Yarn +.. |ext_lnk_tool_yq| raw:: html + + + yq + + .. |ext_lnk_tool_github_issues| raw:: html diff --git a/docs/readings/available-tools.rst b/docs/readings/available-tools.rst index e50b4141..92b8ba37 100644 --- a/docs/readings/available-tools.rst +++ b/docs/readings/available-tools.rst @@ -105,6 +105,8 @@ The PHP container is your workhorse and these are your tools: +----------------------+---------------------------------------+ | ``yarn`` | |ext_lnk_tool_yarn| | +----------------------+---------------------------------------+ +| ``yq`` | |ext_lnk_tool_yq| | ++----------------------+---------------------------------------+ .. note:: If you are in need of other tools, open up an issue at |ext_lnk_tool_github_issues|
+

Smallest stack

This is the smallest possible and fully functional stack you can run

 +

Full stack

To better understand what is actually possible have a look at the full example