Compare commits

...

29 Commits

Author SHA1 Message Date
26cbb63f00 Merge pull request #891 from cytopia/release/v2.2.0
Devilbox Release v2.2.0
2022-04-14 18:02:52 +02:00
daefd0f927 Add announcement in docs 2022-04-14 12:05:39 +02:00
44d1f0162f Add PHP-FPM community image to intranet credits 2022-04-14 11:42:07 +02:00
59619ca9c1 Update project files 2022-04-14 11:29:13 +02:00
a6c45353bd Adding PHP-FPM community images 2022-04-14 11:28:54 +02:00
575782af55 Merge pull request #890 from cytopia/release/v2.1.1
Release v2.1.1
2022-04-08 10:48:44 +02:00
56d2ab39b4 Used tagged PHP images (auto-updating)instead early release branch one 2022-04-07 22:05:20 +02:00
c29741d119 Merge pull request #889 from cytopia/release/v2.1.0
Release v2.1.0
2022-04-06 09:29:14 +02:00
6e2f6ca181 Use intermediate images 2022-04-05 23:15:12 +02:00
7e85b8e609 Update project files 2022-04-05 23:15:01 +02:00
02f6876a21 Make Devilbox arm64 compatible 2022-04-03 13:39:56 +02:00
a5396c2213 Merge pull request #888 from cytopia/issue-bug-report
fine-tune bug report
2022-04-01 06:22:08 +02:00
eb9cb0254f fine-tune bug report 2022-04-01 06:21:44 +02:00
f054b22957 Merge pull request #887 from cytopia/bug-report
Refine bug report
2022-04-01 06:16:50 +02:00
aed9a96dfc Refine bug report 2022-04-01 06:16:34 +02:00
7a13143b4f Merge pull request #886 from cytopia/issue-template-bug
Adjust templates
2022-04-01 06:04:11 +02:00
887202db65 Adjust templates 2022-04-01 06:03:53 +02:00
4fb67be0bd Merge pull request #885 from cytopia/fix-templates
Enhance issue templates
2022-04-01 05:48:27 +02:00
14bba0a140 Enhance issue templates 2022-04-01 05:47:58 +02:00
6c2b42cbc7 Merge pull request #884 from cytopia/github-issues
Adjust issue templates
2022-04-01 05:20:25 +02:00
19619394e3 Adjust issue templates 2022-04-01 05:19:42 +02:00
66fe7e355d Merge pull request #883 from cytopia/repository-organization
Repository organization
2022-04-01 05:04:03 +02:00
ec1e5861ce Add new GitHub issue templates 2022-04-01 05:02:23 +02:00
fb48e5e85a Ensure to run CI tests only for specific purposes 2022-04-01 05:01:29 +02:00
49190e4c36 Merge pull request #881 from MrCrayon/master
Add note about MDEV-27937 MariaDB bug
2022-04-01 02:07:44 +02:00
c3da7facb4 Update docs/support/troubleshooting.rst 2022-03-31 12:39:38 +02:00
d375244920 Add note about MDEV-27937 MariaDB bug
I prefer to write code than documentation and I am not native speaker so feel free to suggest or make changes.

https://jira.mariadb.org/browse/MDEV-27937

Closes #870
2022-03-31 05:34:52 +02:00
1b5522b6fa Merge branch 'master' of https://github.com/MrCrayon/devilbox 2022-03-31 05:32:52 +02:00
c3f213b779 Merge tag 'v1.10.5' of https://github.com/cytopia/devilbox
Release v1.10.5
2022-03-17 04:25:24 +01:00
32 changed files with 744 additions and 215 deletions

View File

@ -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.2.0';
$DEVILBOX_DATE = '2022-04-14';
$DEVILBOX_API_PAGE = 'devilbox-api/status.json';
//

View File

@ -16,6 +16,7 @@
<p>I am currently the sole creator and maintainer of the Devilbox and all of its required projects.<br/>If you find this useful or if it makes your daily programming life easier, consider donating to keep this project alive.</p>
<ul>
<li><a target="_blank" href="https://github.com/sponsors/cytopia"><strong>GitHub sponsorship</strong></a></li>
<li><a target="_blank" href="https://opencollective.com/devilbox"><strong>Open Collective</strong></a></li>
<li><a target="_blank" href="https://www.patreon.com/devilbox"><strong>Patreon</strong></a></li>
</ul>
<br/>
@ -39,55 +40,59 @@
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm-5.2">docker-php-fpm-5.2</a></td>
<td>Legacy PHP 5.2 base images (amd64 and i386)</td>
<td>Legacy PHP 5.2 base images (<code>amd64</code> and <code>i386</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm-5.3">docker-php-fpm-5.3</a></td>
<td>Legacy PHP 5.3 base images (amd64 and arm64)</td>
<td>Legacy PHP 5.3 base images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm-5.4">docker-php-fpm-5.4</a></td>
<td>Legacy PHP 5.4 base images (amd64 and arm64)</td>
<td>Legacy PHP 5.4 base images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm-5.5">docker-php-fpm-5.5</a></td>
<td>Legacy PHP 5.5 base images (amd64 and arm64)</td>
<td>Legacy PHP 5.5 base images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm-8.0">docker-php-fpm-8.0</a></td>
<td>PHP 8.0 base images (amd64 and arm64)</td>
<td>PHP 8.0 base images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm-8.1">docker-php-fpm-8.1</a></td>
<td>PHP 8.1 base images (amd64 and arm64)</td>
<td>PHP 8.1 base images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm-8.2">docker-php-fpm-8.2</a></td>
<td>Upcoming PHP 8.2 base images (amd64 and arm64)</td>
<td>PHP 8.2 base images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm">docker-php-fpm</a></td>
<td>PHP-FPM Devilbox images</td>
<td>PHP-FPM Devilbox images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-php-fpm-community">docker-php-fpm-community</a></td>
<td>PHP-FPM Community images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-mysql">docker-mysql</a></td>
<td>MySQL, MariaDB and PerconaDB images (amd64 and arm64)</td>
<td>MySQL, MariaDB and PerconaDB images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-apache-2.2">docker-apache-2.2</a></td>
<td>Apache 2.2 images (amd64 and arm64)</td>
<td>Apache 2.2 images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-apache-2.4">docker-apache-2.4</a></td>
<td>Apache 2.4 images (amd64 and arm64)</td>
<td>Apache 2.4 images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-nginx-stable">docker-nginx-stable</a></td>
<td>Nginx stable images (amd64 and arm64)</td>
<td>Nginx stable images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-nginx-mainline">docker-nginx-mainline</a></td>
<td>Nginx mainline images (amd64 and arm64)</td>
<td>Nginx mainline images (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-haproxy">docker-haproxy</a></td>
@ -95,7 +100,7 @@
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-ngrok">docker-ngrok</a></td>
<td>Ngrok image</td>
<td>Ngrok image (<code>amd64</code> and <code>arm64</code>)</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/devilbox/docker-varnish">docker-varnish</a></td>
@ -142,15 +147,19 @@
<td>Re-usable GitHub Action Workflows</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/cytopia/shell-command-retry-action">shell-command-retry-action</a></td>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/cytopia/shell-command-retry-action">shell-command-retry</a></td>
<td>GitHub Action</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/cytopia/docker-tag-action">docker-tag-action</a></td>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/cytopia/docker-tag-action">docker-tag</a></td>
<td>GitHub Action</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/cytopia/git-ref-matrix-action">git-ref-matrix-action</a></td>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/cytopia/git-ref-matrix-action">git-ref-matrix</a></td>
<td>GitHub Action</td>
</tr>
<tr>
<td><i class="fa fa-github-alt" aria-hidden="true"></i> <a target="_blank" href="https://github.com/cytopia/upload-artifact-verify-action">upload-artifact-verify</a></td>
<td>GitHub Action</td>
</tr>
<tr>

View File

@ -1,85 +0,0 @@
---
name: "\U0001F41B Bug report"
about: Something is not working? Create a report to help us improve
title: ''
labels: bug
assignees: ''
---
<!---
1. Verify first that your issue/request is not already reported on GitHub.
2. Verify that your question is not covered in the docs: https://devilbox.readthedocs.io
3. PLEASE FILL OUT ALL REQUIRED INFORMATION BELOW! Otherwise it might take more time to properly handle this bug report.
-->
### ISSUE TYPE
<!-- DO NOT CHANGE THIS -->
- Bug Report
<!-- DO NOT CHANGE THIS -->
### Checklist
<!-- ENSURE YOU HAVE DONE THE FOLLOWING -->
* [ ] `.env` file is attached
* [ ] `./check-config.sh` output is added below
* [ ] `docker-compose logs` output is added below
* [ ] `docker-compose.override.yml` is attached (if exists)
* [ ] Custom configs from `cfg/` dir are attached (if exist)
* [ ] I've looked through the docs: https://devilbox.readthedocs.io/en/latest/
* [ ] I've looked through existing issues: https://github.com/cytopia/devilbox/issues
* [ ] I've read troubleshooting: https://devilbox.readthedocs.io/en/latest/support/troubleshooting.html
### OS / ENVIRONMENT
<!-- COMPLETE ALL 6 BULLET POINTS BELOW: -->
1. Host operating system and version:
2. (Windows only) Native Docker or Docker Toolbox:
3. Docker version:
4. Docker Compose version:
5. (Linux) Is SELinux enabled?:
6. What git commit hash are you on?:
### SUMMARY
<!-- Explain the problem briefly -->
### STEPS TO REPRODUCE
<!-- Show exactly how to reproduce the problem -->
<!-- Make this as detailed as possible and be sure that others can fully reproduce this issue -->
### EXPECTED BEHAVIOUR
<!-- What is the expected behaviour? -->
### ACTUAL BEHAVIOUR
<!-- What is the actual behaviour? -->
### OTHER INFORMATION
#### Start command
<!-- Add the command you have used to start the devilbox -->
```
$ docker-compose up...
```
#### Outputs
<!-- 1/2 Add the output from ./check-config.sh -->
```bash
$ ./check-config.sh
<<< REPLACE THIS LINE WITH OUTPUT FROM ABOVE COMMAND >>>
```
<!-- 2/2 Add the output from docker-compose logs -->
```bash
$ docker-compose logs
<<< REPLACE THIS LINE WITH OUTPUT FROM ABOVE COMMAND >>>
```

189
.github/ISSUE_TEMPLATE/bug_report.yml vendored Normal file
View File

@ -0,0 +1,189 @@
---
name: "\U0001F41B Bug report"
description: File a bug report
title: "[Bug]: "
labels: ["bug", "triage"]
assignees:
- cytopia
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: checkboxes
attributes:
label: Have you already looked into this bug?
description: Please invest some time and check if this bug is already mentioned or documented elsewhere (You may select more than one).
options:
- label: I have checked the [Troubleshooting Guide](https://devilbox.readthedocs.io/en/latest/support/troubleshooting.html)
- label: I have checked [Release notes](https://github.com/cytopia/devilbox/releases) for potential migration steps
- label: I have checked [existing issues](https://github.com/cytopia/devilbox/issues) for similar bugs
- label: I have googled this bug already with no luck
- label: I have not done any of the above
validations:
required: true
- type: input
attributes:
label: (Optional) Error message
description: If you encountered any error message, copy and paste it here. This will be used for googling the issue.
validations:
required: false
- type: textarea
id: what-happened
attributes:
label: What went wrong?
description: What exactly went wrong of what bug did you encounter?
validations:
required: true
- type: textarea
id: expected-behaviour
attributes:
label: Expected behaviour
description: What did you expect to happen instead?
validations:
required: true
- type: textarea
id: steps-to-reproduce
attributes:
label: How can we reproduce the bug?
description: How do you trigger this bug? Please walk us through it step by step in detail. This is crucial in order to triage the bug and support you in resolving it.
validations:
required: true
- type: dropdown
id: host-os
attributes:
label: Host Operating System
description: What operating system are you using?
multiple: false
options:
- Linux
- macOS
- Windows
validations:
required: true
- type: dropdown
id: host-platform
attributes:
label: Host Platform (amd64, arm64, other)
description: What host platform are you running on?
options:
- amd64
- arm64
- other
validations:
required: true
- type: dropdown
attributes:
label: (Linux only) Is SELinux enabled?
description: When using Linux as your host operating system, check if SELinux is enabled or not. [More info here](https://devilbox.readthedocs.io/en/latest/getting-started/install-the-devilbox.html?highlight=selinux#linux-selinux)
options:
- Yes, SELinux is enabled
- No, SELinux is disabled
- I don't know
- I am not on Linux
validations:
required: true
- type: input
id: docker-version
attributes:
label: Docker version
description: "What Docker version are you using? Please copy and paste the output of `docker --version` into this text area."
validations:
required: true
- type: input
id: docker-compose-version
attributes:
label: Docker Compose version
description: "What Docker Compose version are you using? Please copy and paste the output of `docker-compose --version` into this text area."
validations:
required: true
- type: input
id: devilbox-version
attributes:
label: Devilbox version
description: "What version of Devilbox are you running (latest master, specific tag, git hash, etc)?"
validations:
required: true
- type: dropdown
attributes:
label: Have you removed stopped containers before starting?
description: "Have you done a `docker-compose rm` before starting up the Devilbox? [More info here](https://docs.docker.com/compose/reference/rm/)"
multiple: false
options:
- "Yes"
- "No"
validations:
required: true
- type: dropdown
attributes:
label: Have you pulled latest Docker images before starting?
description: "Have you done a `docker-compose pull` before starting up the Devilbox?"
multiple: false
options:
- "Yes"
- "No"
validations:
required: true
- type: input
attributes:
label: Devilbox start command
description: "What is the [start command](https://devilbox.readthedocs.io/en/latest/getting-started/start-the-devilbox.html) you have used to start the Devilbox?"
validations:
required: true
- type: textarea
id: log-env-file
attributes:
label: "Config: .env file"
description: "Please copy and paste your `.env` file into this text area"
validations:
required: true
- type: textarea
attributes:
label: "Config: docker-compose.override.yml"
description: "If you are using `docker-compose.override.yml`, please copy and paste its contents into this text area."
render: shell
validations:
required: false
- type: textarea
id: log-check-config
attributes:
label: "Config: ./check-config.sh"
description: "Please copy and paste the output of `./check-config.sh` into this text area"
render: shell
validations:
required: true
- type: textarea
id: log-docker-compose
attributes:
label: "Log: docker-compose logs"
description: "Please copy and paste the output of `docker-compose logs` into this text area"
render: shell
validations:
required: true
- type: textarea
attributes:
label: (Optional) Additional information
description: Add any additional information that might help with this bug report. (E.g. customizations from the `autostart/`, `bash/`, `cfg/` or `supervisor/` directory or relevant logfiles from the `log/` directory)
validations:
required: false

12
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,12 @@
---
blank_issues_enabled: false
contact_links:
- name: Devilbox Community Support
url: https://devilbox.discourse.group/
about: Please ask and answer questions here.
- name: Devilbox Gitter Chat
url: https://gitter.im/devilbox/Lobby
about: Please ask and answer questions here.
- name: Devilbox documentation
url: https://devilbox.readthedocs.io/
about: Find the Devilbox documentation here.

View File

@ -1,30 +0,0 @@
---
name: "\U0001F4DD Documentation"
about: Anything related to the Devilbox documentation
title: ''
labels: documentation
assignees: ''
---
<!---
1. Verify first that your question is not already reported on GitHub.
2. Verify that your question is not covered in the docs: https://devilbox.readthedocs.io
3. PLEASE FILL OUT ALL REQUIRED INFORMATION BELOW! Otherwise it might take more time to properly handle this question.
-->
#### ISSUE TYPE
<!-- DO NOT CHANGE THIS -->
- Documentation
<!-- DO NOT CHANGE THIS -->
#### SUMMARY
<!-- Add your information here -->
#### Goal
<!-- Explain what you actually want to accomplish -->

View File

@ -0,0 +1,30 @@
---
name: "\U0001F4DD Documentation"
description: Something is missing or wrong in the documentation.
title: "[Docs]: "
labels: ["documentation"]
assignees:
- cytopia
body:
- type: textarea
attributes:
label: What is wrong in the documentation?
description: Tell us, what is wrong in the documentation?
validations:
required: false
- type: textarea
attributes:
label: What is missing in the documentation?
description: Tell us, what is missing in the documentation?
validations:
required: false
- type: dropdown
attributes:
label: Are you willing to provide a PR to address this?
options:
- "Yes"
- "No"

View File

@ -1,30 +0,0 @@
---
name: "✨ Feature request"
about: Suggest an idea for this project
title: ''
labels: feature
assignees: ''
---
<!---
1. Verify first that your feature request is not already reported on GitHub.
2. Verify that your feature is not already implemented: https://devilbox.readthedocs.io
3. PLEASE FILL OUT ALL REQUIRED INFORMATION BELOW! Otherwise it might take more time to properly handle this feature request
-->
#### ISSUE TYPE
<!-- DO NOT CHANGE THIS -->
- Feature request
<!-- DO NOT CHANGE THIS -->
#### SUMMARY
<!-- Explain your feature idea briefly -->
#### Goal
<!-- Explain what you actually want to accomplish with that feature -->

View File

@ -0,0 +1,36 @@
---
name: "✨ Feature request"
description: Suggest an idea or feature for this project
title: "[Feature]: "
labels: ["feature"]
assignees: []
body:
- type: textarea
attributes:
label: What is your idea or feature suggestion?
description: Tell us, what idea or feature you suggest to be added to the Devilbox.
validations:
required: true
- type: textarea
attributes:
label: Benefits
description: Tell us, how this this will be beneficial to the Devilbox.
validations:
required: false
- type: textarea
attributes:
label: Where can we find information about this?
description: If you are proposing a software or tool, please add relevant links and documentation.
validations:
required: false
- type: dropdown
attributes:
label: Are you willing to provide a PR to address this?
options:
- "Yes"
- "No"

50
.github/ISSUE_TEMPLATE/howto.yml vendored Normal file
View File

@ -0,0 +1,50 @@
---
name: "❔ How to do ...?"
description: How do I do X or Y with the Devilbox?
title: "[Howto]: "
labels: ["question", "Community help wanted"]
assignees: []
body:
- type: markdown
attributes:
value: |
If this is a generic question, please consider using the [Devilbox forum](https://devilbox.discourse.group/) instead.
- type: checkboxes
attributes:
label: Have you already checked elsewhere?
description: You may select more than one.
options:
- label: I have read the [Devilbox documentation](https://devilbox.readthedocs.io/en/latest/)
- label: I have checked the [Devilbox Troubleshooting Guide](https://devilbox.readthedocs.io/en/latest/)
- label: I have checked the [Devilbox FAQ](https://devilbox.readthedocs.io/en/latest/support/faq.html)
- label: I have checked the [Devilbox Howto](https://devilbox.readthedocs.io/en/latest/support/howto.html)
- label: I have checked the [Devilbox Forum](https://devilbox.discourse.group/)
- label: I have checked [existing issues](https://github.com/cytopia/devilbox/issues)
- label: I have googled already with no luck
- label: I have not done any of the above
validations:
required: true
- type: textarea
attributes:
label: What are you struggling with?
description: Tell the community, what you are struggling with. Be as specific as possible to make it easier for other people to answer your question.
validations:
required: true
- type: textarea
attributes:
label: What have you tried already?
description: Add some details on what you have tried already, so this can be ruled out.
validations:
required: true
- type: textarea
attributes:
label: What is your goal?
description: Tell the community, what you want to accomplish? This might be helpful to know in order to prevent [XY problems](https://en.wikipedia.org/wiki/XY_problem).
validations:
required: true

View File

@ -1,40 +0,0 @@
---
name: "❔ Question"
about: 'Consider using the Devilbox Forum instead: https://devilbox.discourse.group/'
title: ''
labels: ''
assignees: ''
---
<!-- ---------- GITHUB QUESTIONS ARE DEPRECATED ---------- -->
<!-- ---------- USE THE FORUM ---------- ->
<!-- ---------- https://devilbox.discourse.group/ ---------- ->
<!---
1. A better place for questions is: https://devilbox.discourse.group/
2. VERIFY first that your question is not already reported on GitHub.
3. VERIFY that your question is not covered in the docs: https://devilbox.readthedocs.io
4. VERIFY that your question is not covered in the forum: https://devilbox.discourse.group/
5. PLEASE FILL OUT ALL REQUIRED INFORMATION BELOW! Otherwise it might take more time to properly handle this question.
-->
#### ISSUE TYPE
<!-- DO NOT CHANGE THIS -->
- Question
<!-- DO NOT CHANGE THIS -->
#### SUMMARY
<!-- Ask your question here -->
#### Goal
<!-- Explain what you actually want to accomplish -->

View File

@ -12,9 +12,14 @@ name: Docs
on:
# Runs on Pull Requests
pull_request:
paths:
- 'docs/**'
- '!**.md'
# Runs on master Branch and Tags
push:
paths:
- 'docs/**'
- '!**.md'
branches:
- master

View File

@ -12,9 +12,32 @@ name: Httpd
on:
# Runs on Pull Requests
pull_request:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
# Runs on master Branch and Tags
push:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
branches:
- master
tags:

View File

@ -12,9 +12,32 @@ name: Memcd
on:
# Runs on Pull Requests
pull_request:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
# Runs on master Branch and Tags
push:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
branches:
- master
tags:

View File

@ -12,9 +12,32 @@ name: Mongo
on:
# Runs on Pull Requests
pull_request:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
# Runs on master Branch and Tags
push:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
branches:
- master
tags:

View File

@ -12,9 +12,32 @@ name: MySQL
on:
# Runs on Pull Requests
pull_request:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
# Runs on master Branch and Tags
push:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
branches:
- master
tags:

View File

@ -12,9 +12,32 @@ name: PgSQL
on:
# Runs on Pull Requests
pull_request:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
# Runs on master Branch and Tags
push:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
branches:
- master
tags:

View File

@ -12,9 +12,32 @@ name: PHP
on:
# Runs on Pull Requests
pull_request:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
# Runs on master Branch and Tags
push:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
branches:
- master
tags:

View File

@ -12,9 +12,32 @@ name: Redis
on:
# Runs on Pull Requests
pull_request:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
# Runs on master Branch and Tags
push:
paths:
- '.devilbox/**'
- '.github/workflows/params*.yml'
- '.github/workflows/test*.yml'
- '.github/workflows/zzz*.yml'
- '.tests/**'
- 'cfg/vhost-gen/**'
- 'compose/**'
- 'docker-compose.override.yml-example'
- 'docker-compose.yml'
- 'env-example'
- '!**.md'
branches:
- master
tags:

View File

@ -6,6 +6,40 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl
## Unreleased
## Release v2.2.0 (2022-04-14)
This release adds PHP-FPM community images via `docker-compose.override.yml`, which easily allows you
to build upon existing PHP images and customize them for your usecase/workflow.
#### Added
- Added PHP-FPM Community images: https://github.com/devilbox/docker-php-fpm-community/
## Release v2.1.1 (2022-04-07)
#### Changed
- Used tagged PHP images (auto-updating)instead early release branch one.
## Release v2.1.0 (2022-04-05)
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 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.

View File

@ -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`
<img width="200" style="width:200px;" src="docs/_includes/figures/https/https-ssl-address-bar.png" /><br/>
<small><sub>Support for <a href="https://devilbox.readthedocs.io/en/latest/intermediate/setup-valid-https.html">valid https</a> out of the box.</sub></small>
@ -821,7 +822,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
| <sup>sqlsrv</sup> | | | | | | d | d | d | d | d | d | d | d |
| <sup>ssh2</sup> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | |
| <sup>standard</sup> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
| <sup>swoole</sup> | | d | d | d | d | d | d | d | d | d | d | | |
| <sup>swoole</sup> | | d | d | d | d | d | d | d | d | d | d | d | |
| <sup>sysvmsg</sup> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <sup>sysvsem</sup> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <sup>sysvshm</sup> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
@ -829,7 +830,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
| <sup>tokenizer</sup> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
| <sup>uploadprogress</sup> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <sup>uuid</sup> | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <sup>vips</sup> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | |
| <sup>vips</sup> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | |
| <sup>wddx</sup> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | | |
| <sup>xdebug</sup> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
| <sup>xlswriter</sup> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |

View File

@ -7,6 +7,12 @@ version: '2.3'
###
services:
# -----------------------------------------------------------------------------------------------
# PHP Community image
# -----------------------------------------------------------------------------------------------
php:
image: devilbox/php-fpm-community:${PHP_SERVER}-${PHP_COMMUNITY_FLAVOUR:-devilbox}
# -----------------------------------------------------------------------------------------------
# Blackfire
# -----------------------------------------------------------------------------------------------

View File

@ -0,0 +1,11 @@
# vim: set ft=yaml:
---
version: '2.3'
services:
# -----------------------------------------------------------------------------------------------
# PHP Community image
# -----------------------------------------------------------------------------------------------
php:
image: devilbox/php-fpm-community:${PHP_SERVER}-${PHP_COMMUNITY_FLAVOUR:-devilbox}

View File

@ -94,7 +94,7 @@ services:
# PHP
# ------------------------------------------------------------
php:
image: devilbox/php-fpm:${PHP_SERVER}-work-0.136
image: devilbox/php-fpm:${PHP_SERVER}-work-0.139
hostname: php
##

View File

@ -34,6 +34,18 @@
Github: MailHog <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a>
.. |ext_lnk_php_community_dockerhub| raw:: html
<a target="_blank" href="https://hub.docker.com/r/devilbox/php-fpm-community">
Dockerhub: PHP-FPM Community <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a>
.. |ext_lnk_php_community_github| raw:: html
<a target="_blank" href="https://github.com/devilbox/docker-php-fpm-community/">
Github: PHP-FPM Community <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
</a>
.. |ext_lnk_mailhog_dockerhub| raw:: html
<a target="_blank" href="https://hub.docker.com/r/mailhog/mailhog/">

View File

@ -0,0 +1,11 @@
.. |ext_lnk_php_community_github_announce| raw:: html
<a target="_blank" href="https://github.com/devilbox/docker-php-fpm-community/">
<strong>PHP-FPM Community <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" /></strong>
</a>
.. attention::
You can now create your own **custom flavour** of PHP-FPM Community images and easily add them to the Devilbox: |ext_lnk_php_community_github_announce|

View File

@ -1,6 +1,8 @@
+-------------------------------------+-----------+-----------+----------------+
| Container | Name | Hostname | IP Address |
+=====================================+===========+===========+================+
| PHP Community | php | php | 172.16.238.10 |
+-------------------------------------+-----------+-----------+----------------+
| Blackfire | blackfire | blackfire | 172.16.238.200 |
+-------------------------------------+-----------+-----------+----------------+
| MailHog | mailhog | mailhog | 172.16.238.201 |

View File

@ -13,6 +13,7 @@ However, each example also exists in its standalone file as shown below:
├── docker-compose.override.yml-elk
├── docker-compose.override.yml-mailhog
├── docker-compose.override.yml-ngrok
├── docker-compose.override.yml-php-community
├── docker-compose.override.yml-python-flask
├── docker-compose.override.yml-rabbitmq
├── docker-compose.override.yml-solr

View File

@ -56,6 +56,7 @@ That includes, but is not limited to:
In order to fully customize each container, refer to their own documentation section:
.. seealso::
* :ref:`custom_container_enable_php_community`
* :ref:`custom_container_enable_blackfire`
* :ref:`custom_container_enable_elk_stack`
* :ref:`custom_container_enable_mailhog`

View File

@ -0,0 +1,135 @@
.. include:: /_includes/all.rst
.. include:: /_includes/snippets/__ANNOUNCEMENTS__.rst
.. _custom_container_enable_php_community:
**********************************
Enable and configure PHP Community
**********************************
This section will guide you through getting PHP community images integrated into the Devilbox.
.. seealso::
* |ext_lnk_php_community_github|
* |ext_lnk_php_community_dockerhub|
* :ref:`custom_container_enable_all_additional_container`
* :ref:`docker_compose_override_yml_how_does_it_work`
**Table of Contents**
.. contents:: :local:
Overview
========
Available overwrites
--------------------
.. include:: /_includes/snippets/docker-compose-override-tree-view.rst
PHP-FPM Community settings
--------------------------
In case of PHP-FPM Community, the file is ``compose/docker-compose.override.yml-php-community``. This file
must be copied into the root of the Devilbox git directory.
+-----------------------+-----------------------------------------------------------------------------------------------------------+
| What | How and where |
+=======================+===========================================================================================================+
| Example compose file | ``compose/docker-compose.override.yml-all`` or |br| ``compose/docker-compose.override.yml-php-community`` |
+-----------------------+-----------------------------------------------------------------------------------------------------------+
| Container IP address | ``172.16.238.10`` |
+-----------------------+-----------------------------------------------------------------------------------------------------------+
| Container host name | ``php`` |
+-----------------------+-----------------------------------------------------------------------------------------------------------+
| Container name | ``php`` |
+-----------------------+-----------------------------------------------------------------------------------------------------------+
| Mount points | Same as default php image |
+-----------------------+-----------------------------------------------------------------------------------------------------------+
| Exposed port | Same as default php image |
+-----------------------+-----------------------------------------------------------------------------------------------------------+
| Available at | n.a. |
+-----------------------+-----------------------------------------------------------------------------------------------------------+
| Further configuration | ``PHP_COMMUNITY_FLAVOUR`` must be set via ``.env`` |
+-----------------------+-----------------------------------------------------------------------------------------------------------+
PHP Community env variables
---------------------------
Additionally the following ``.env`` variables can be created for easy configuration:
+------------------------------+---------------+-------------------------------------------------------------------------+
| Variable | Default value | Description |
+==============================+===============+=========================================================================+
| ``PHP_COMMUNITY_FLAVOUR`` | ``devilbox`` | Controls the PHP Community flavour. |
+------------------------------+---------------+-------------------------------------------------------------------------+
Instructions
============
1. Copy docker-compose.override.yml
-----------------------------------
Copy the PHP-FPM Community Docker Compose overwrite file into the root of the Devilbox git directory.
(It must be at the same level as the default ``docker-compose.yml`` file).
.. code-block:: bash
host> cp compose/docker-compose.override.yml-php-community docker-compose.override.yml
.. seealso::
* :ref:`docker_compose_override_yml`
* :ref:`add_your_own_docker_image`
* :ref:`overwrite_existing_docker_image`
2. Adjust ``env`` settings
--------------------------
By default PHP-FPM Community is using the Devilbox reference flavour ``devilbox``.
You can change this flavour via the ``.env`` variable ``PHP_COMMUNITY_FLAVOUR``.
.. code-block:: bash
:caption: .env
PHP_COMMUNITY_FLAVOUR=devilbox
.. seealso:: :ref:`env_file`
3. Start the Devilbox
---------------------
The final step is to start the Devilbox with the newly added PHP-FPM Community images.
Let's assume you want to start ``php``, ``httpd``, and ``bind``.
.. code-block:: bash
host> docker-compose up -d php httpd bind
.. seealso:: :ref:`start_the_devilbox`
TL;DR
=====
For the lazy readers, here are all commands required to get you started.
Simply copy and paste the following block into your terminal from the root of your Devilbox git
directory:
.. code-block:: bash
# Copy compose-override.yml into place
cp compose/docker-compose.override.yml-php-community docker-compose.override.yml
# Set Community flavour
echo "PHP_COMMUNITY_FLAVOUR=devilbox" >> .env
# Start container
docker-compose up -d php httpd bind

View File

@ -118,6 +118,7 @@ host is ready to be served with your custom domain.
:maxdepth: 2
custom-container/enable-all-container
custom-container/enable-php-community
custom-container/enable-blackfire
custom-container/enable-elk-stack
custom-container/enable-mailhog

View File

@ -379,6 +379,13 @@ to read-only by applying the following ``chmod`` command.
* :ref:`my_cnf`
* https://github.com/cytopia/devilbox/issues/212
[MariaDB] Assertion failure when executing prepared statement with ? in IN list
-------------------------------------------------------------------------------
Some MariaDB versions are affected by MDEV-27937 bug, use a fixed version or set in_predicate_conversion_threshold variable to a higher value.
.. seealso:: https://jira.mariadb.org/browse/MDEV-27937
Docker Toolbox
==============