mirror of
https://github.com/cytopia/devilbox.git
synced 2025-01-18 10:46:23 +00:00
Merge branch 'master' into patch-1
This commit is contained in:
cytopia
GitHub
commit
201925e0b2
@ -13,8 +13,8 @@ error_reporting(-1);
|
||||
putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
|
||||
|
||||
|
||||
$DEVILBOX_VERSION = 'v1.8.3';
|
||||
$DEVILBOX_DATE = '2020-11-22';
|
||||
$DEVILBOX_VERSION = 'v1.9.0';
|
||||
$DEVILBOX_DATE = '2020-12-12';
|
||||
$DEVILBOX_API_PAGE = 'devilbox-api/status.json';
|
||||
|
||||
//
|
||||
|
||||
17
.github/workflows/documentation.yml
vendored
17
.github/workflows/documentation.yml
vendored
@ -48,7 +48,22 @@ jobs:
|
||||
- name: Check documentation
|
||||
shell: bash
|
||||
run: |
|
||||
retry() {
|
||||
for n in $(seq ${RETRIES}); do
|
||||
echo "[${n}/${RETRIES}] ${*}";
|
||||
if eval "${*}"; then
|
||||
echo "[SUCC] ${n}/${RETRIES}";
|
||||
return 0;
|
||||
fi;
|
||||
sleep ${PAUSE};
|
||||
echo "[FAIL] ${n}/${RETRIES}";
|
||||
done;
|
||||
return 1;
|
||||
}
|
||||
|
||||
cd docs
|
||||
make ${TARGET}
|
||||
retry make ${TARGET}
|
||||
env:
|
||||
TARGET: ${{ matrix.target }}
|
||||
RETRIES: 20
|
||||
PAUSE: 10
|
||||
|
||||
69
.github/workflows/lint.yml
vendored
69
.github/workflows/lint.yml
vendored
@ -25,16 +25,8 @@ on:
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
jobs:
|
||||
lint:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
jobs:
|
||||
- tests
|
||||
|
||||
name: "[Lint ${{ matrix.jobs }}]"
|
||||
name: "[Lint]"
|
||||
steps:
|
||||
|
||||
# ------------------------------------------------------------
|
||||
@ -46,13 +38,68 @@ jobs:
|
||||
- name: Lint
|
||||
shell: bash
|
||||
run: |
|
||||
retry() {
|
||||
for n in $(seq ${RETRIES}); do
|
||||
echo "[${n}/${RETRIES}] ${*}";
|
||||
if eval "${*}"; then
|
||||
echo "[SUCC] ${n}/${RETRIES}";
|
||||
return 0;
|
||||
fi;
|
||||
sleep ${PAUSE};
|
||||
echo "[FAIL] ${n}/${RETRIES}";
|
||||
done;
|
||||
return 1;
|
||||
}
|
||||
|
||||
cd .tests/
|
||||
make lint-tests
|
||||
retry make lint-tests
|
||||
env:
|
||||
RETRIES: 20
|
||||
PAUSE: 10
|
||||
|
||||
- name: Update Readme
|
||||
shell: bash
|
||||
run: |
|
||||
retry() {
|
||||
for n in $(seq ${RETRIES}); do
|
||||
echo "[${n}/${RETRIES}] ${*}";
|
||||
if eval "${*}"; then
|
||||
echo "[SUCC] ${n}/${RETRIES}";
|
||||
return 0;
|
||||
fi;
|
||||
sleep ${PAUSE};
|
||||
echo "[FAIL] ${n}/${RETRIES}";
|
||||
done;
|
||||
return 1;
|
||||
}
|
||||
|
||||
cd .tests/
|
||||
retry make update-readme
|
||||
git diff --quiet || { echo "Build Changes"; git diff; git status; false; };
|
||||
env:
|
||||
RETRIES: 20
|
||||
PAUSE: 10
|
||||
|
||||
- name: Check configuration
|
||||
shell: bash
|
||||
run: |
|
||||
retry() {
|
||||
for n in $(seq ${RETRIES}); do
|
||||
echo "[${n}/${RETRIES}] ${*}";
|
||||
if eval "${*}"; then
|
||||
echo "[SUCC] ${n}/${RETRIES}";
|
||||
return 0;
|
||||
fi;
|
||||
sleep ${PAUSE};
|
||||
echo "[FAIL] ${n}/${RETRIES}";
|
||||
done;
|
||||
return 1;
|
||||
}
|
||||
|
||||
cp env-example .env
|
||||
sed -i'' "s/^NEW_UID=.*/NEW_UID=$(id -u)/g" .env
|
||||
sed -i'' "s/^NEW_GID=.*/NEW_GID=$(id -g)/g" .env
|
||||
./check-config.sh
|
||||
retry ./check-config.sh
|
||||
env:
|
||||
RETRIES: 20
|
||||
PAUSE: 10
|
||||
|
||||
@ -320,7 +320,7 @@ fi
|
||||
###
|
||||
### Todo: add ioncube
|
||||
###
|
||||
MODS="$( echo "${PHP52_MODS}, ${PHP53_MODS}, ${PHP54_MODS}, ${PHP55_MODS}, ${PHP56_MODS}, ${PHP70_MODS}, ${PHP71_MODS}, ${PHP72_MODS}, ${PHP73_MODS}, ${PHP74_MODS}, ${PHP80_MODS}, ${PHP81_MODS}" | sed 's/,/\n/g' | sed -e 's/^\s*//g' -e 's/\s*$//g' | sort -u )"
|
||||
MODS="$( echo "${PHP52_MODS}, ${PHP53_MODS}, ${PHP54_MODS}, ${PHP55_MODS}, ${PHP56_MODS}, ${PHP70_MODS}, ${PHP71_MODS}, ${PHP72_MODS}, ${PHP73_MODS}, ${PHP74_MODS}, ${PHP80_MODS}, ${PHP81_MODS}" | sed 's/,/\n/g' | sed -e 's/^\s*//g' -e 's/\s*$//g' | sort -uf )"
|
||||
|
||||
|
||||
###
|
||||
|
||||
@ -60,18 +60,18 @@ fi
|
||||
### Xdebug default disabled
|
||||
###
|
||||
printf "[TEST] Xdebug default disabled"
|
||||
if [ "${PHP_VERSION}" = "8.0" ] || [ "${PHP_VERSION}" = "8.1" ]; then
|
||||
if ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.mode' | grep -E 'develop.+develop' >/dev/null" "${RETRIES}" "" "0"; then
|
||||
if [ "${PHP_VERSION}" = "5.2" ] || [ "${PHP_VERSION}" = "5.3" ] || [ "${PHP_VERSION}" = "5.4" ] || [ "${PHP_VERSION}" = "5.5" ] || [ "${PHP_VERSION}" = "5.6" ] || [ "${PHP_VERSION}" = "7.0" ] || [ "${PHP_VERSION}" = "7.1" ]; then
|
||||
if ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.remote_enable' | grep -E 'Off.+Off' >/dev/null" "${RETRIES}" "" "0"; then
|
||||
printf "\\r[FAIL] Xdebug default disabled\\n"
|
||||
run "curl -sS 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.mode' || true"
|
||||
run "curl -sS 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.remote_enable' || true"
|
||||
exit 1
|
||||
else
|
||||
printf "\\r[OK] Xdebug default disabled\\n"
|
||||
fi
|
||||
else
|
||||
if ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.remote_enable' | grep -E 'Off.+Off' >/dev/null" "${RETRIES}" "" "0"; then
|
||||
if ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.mode' | grep -E 'develop.+develop' >/dev/null" "${RETRIES}" "" "0"; then
|
||||
printf "\\r[FAIL] Xdebug default disabled\\n"
|
||||
run "curl -sS 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.remote_enable' || true"
|
||||
run "curl -sS 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.mode' || true"
|
||||
exit 1
|
||||
else
|
||||
printf "\\r[OK] Xdebug default disabled\\n"
|
||||
@ -82,15 +82,7 @@ fi
|
||||
### Xdebug autostart disabled
|
||||
###
|
||||
printf "[TEST] Xdebug autostart disabled"
|
||||
if [ "${PHP_VERSION}" = "8.0" ] || [ "${PHP_VERSION}" = "8.1" ]; then
|
||||
if ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.start_with_request' | grep -E 'default.+default' >/dev/null" "${RETRIES}" "" "0"; then
|
||||
printf "\\r[FAIL] Xdebug autostart disabled\\n"
|
||||
run "curl 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.start_with_request' || true"
|
||||
exit 1
|
||||
else
|
||||
printf "\\r[OK] Xdebug autostart disabled\\n"
|
||||
fi
|
||||
else
|
||||
if [ "${PHP_VERSION}" = "5.2" ] || [ "${PHP_VERSION}" = "5.3" ] || [ "${PHP_VERSION}" = "5.4" ] || [ "${PHP_VERSION}" = "5.5" ] || [ "${PHP_VERSION}" = "5.6" ] || [ "${PHP_VERSION}" = "7.0" ] || [ "${PHP_VERSION}" = "7.1" ]; then
|
||||
if ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.remote_autostart' | grep -E 'Off.+Off' >/dev/null" "${RETRIES}" "" "0"; then
|
||||
printf "\\r[FAIL] Xdebug autostart disabled\\n"
|
||||
run "curl 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.remote_autostart' || true"
|
||||
@ -98,4 +90,12 @@ else
|
||||
else
|
||||
printf "\\r[OK] Xdebug autostart disabled\\n"
|
||||
fi
|
||||
else
|
||||
if ! run "curl -sS --fail 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | tac | tac | grep 'xdebug.start_with_request' | grep -E 'default.+default' >/dev/null" "${RETRIES}" "" "0"; then
|
||||
printf "\\r[FAIL] Xdebug autostart disabled\\n"
|
||||
run "curl 'http://localhost:${HOST_PORT_HTTPD}/info_php.php' | grep 'xdebug.start_with_request' || true"
|
||||
exit 1
|
||||
else
|
||||
printf "\\r[OK] Xdebug autostart disabled\\n"
|
||||
fi
|
||||
fi
|
||||
|
||||
49
CHANGELOG.md
49
CHANGELOG.md
@ -1,12 +1,57 @@
|
||||
# Changelog
|
||||
|
||||
Make sure to have a look at [UPDATING](https://github.com/cytopia/devilbox/blob/master/UPDATING.md) to see any required steps for updating
|
||||
major versions.
|
||||
Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/blob/master/UPDATING.md) to see any required steps for updating major or minor versions.
|
||||
|
||||
|
||||
## Unreleased
|
||||
|
||||
|
||||
## Release v1.9.0 (2020-12-12)
|
||||
|
||||
#### Fixed
|
||||
|
||||
- [#761](https://github.com/cytopia/devilbox/issues/761) Fixed missing Varnish config env var
|
||||
- [#10](https://github.com/devilbox/watcherd/issues/10) watcherd performance issues
|
||||
- Fixed `mdl` rubygen for PHP images
|
||||
- Fixed `drupal` (Drupal Console Launcher) for PHP images
|
||||
|
||||
#### Added
|
||||
|
||||
- Added `ioncube` extension to PHP 7.4
|
||||
- Added `sqlsrv` extension to PHP 7.4
|
||||
- Added `apcu` extension to PHP 8.0
|
||||
- Added `blackfire` extension to PHP 8.0
|
||||
- Added `igbinary` extension to PHP 8.0
|
||||
- Added `imap` extension to PHP 8.0
|
||||
- Added `mcrypt` extension to PHP 8.0
|
||||
- Added `memcache` extension to PHP 8.0
|
||||
- Added `msgpack` extension to PHP 8.0
|
||||
- Added `oauth` extension to PHP 8.0
|
||||
- Added `psr` extension to PHP 8.0
|
||||
- Added `solr` extension to PHP 8.0
|
||||
- Added `xlswriter` extension to PHP 8.0
|
||||
- Added `yaml` extension to PHP 8.0
|
||||
- Added `apcu` extension to PHP 8.1
|
||||
- Added `igbinary` extension to PHP 8.1
|
||||
- Added `imap` extension to PHP 8.1
|
||||
- Added `mcrypt` extension to PHP 8.1
|
||||
- Added `memcache` extension to PHP 8.1
|
||||
- Added `msgpack` extension to PHP 8.1
|
||||
- Added `oauth` extension to PHP 8.1
|
||||
- Added `psr` extension to PHP 8.1
|
||||
- Added `solr` extension to PHP 8.1
|
||||
- Added `xlswriter` extension to PHP 8.1
|
||||
- Added `yaml` extension to PHP 8.1
|
||||
- Added checks for TLD_SUFFIX in check-config.sh
|
||||
|
||||
#### Changed
|
||||
|
||||
- [#763](https://github.com/cytopia/devilbox/issues/764) `redis` extension compiles with `msgpack` and `igbinary` as available serializers
|
||||
- Updated xdebug to latest version
|
||||
- Updated `watcherd` to latest version
|
||||
- Updated `vhost-gen` to latest version
|
||||
|
||||
|
||||
## Release v1.8.3 (2020-11-22)
|
||||
|
||||
#### Fixed
|
||||
|
||||
28
README.md
28
README.md
@ -724,9 +724,9 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
|
||||
|-------------------------------|---------|---------|---------|---------|---------|---------|---------|---------|---------|---------|---------|---------|
|
||||
| <small>amqp</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>apc</small> | | 🗸 | 🗸 | 🗸 | 🗸 | | | | | | | |
|
||||
| <small>apcu</small> | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>apcu</small> | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>bcmath</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>blackfire</small> | | | | | d | d | d | d | d | d | | |
|
||||
| <small>blackfire</small> | | | | | d | d | d | d | d | d | d | |
|
||||
| <small>bz2</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>calendar</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>Core</small> | | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
@ -747,27 +747,27 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
|
||||
| <small>gmp</small> | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>hash</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>iconv</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>igbinary</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>igbinary</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>imagick</small> | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>imap</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>imap</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>interbase</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | |
|
||||
| <small>intl</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>ioncube</small> | d | d | d | d | d | d | d | d | d | | | |
|
||||
| <small>ioncube</small> | d | d | d | d | d | d | d | d | d | d | | |
|
||||
| <small>json</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>ldap</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>libxml</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>mbstring</small> | ✔ | 🗸 | 🗸 | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>mcrypt</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>memcache</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>mcrypt</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>memcache</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>memcached</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>mhash</small> | | | | | ✔ | | | | | | | |
|
||||
| <small>mongo</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | | | | | |
|
||||
| <small>mongodb</small> | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>msgpack</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>msgpack</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>mysql</small> | ✔ | ✔ | 🗸 | 🗸 | 🗸 | | | | | | | |
|
||||
| <small>mysqli</small> | ✔ | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>mysqlnd</small> | | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>OAuth</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>OAuth</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>oci8</small> | | d | d | d | d | d | d | d | d | d | d | d |
|
||||
| <small>openssl</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>pcntl</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
@ -785,7 +785,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
|
||||
| <small>Phar</small> | 🗸 | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>posix</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>pspell</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>psr</small> | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>psr</small> | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>rdkafka</small> | | d | d | d | d | d | d | d | d | d | | |
|
||||
| <small>readline</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>recode</small> | 🗸 | ✔ | ✔ | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | |
|
||||
@ -798,11 +798,11 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
|
||||
| <small>soap</small> | ✔ | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>sockets</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>sodium</small> | | | | | | | | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>solr</small> | | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>solr</small> | | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>SPL</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>SQLite</small> | ✔ | ✔ | | | | | | | | | | |
|
||||
| <small>sqlite3</small> | | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>sqlsrv</small> | | | | | | d | d | d | d | | | |
|
||||
| <small>sqlsrv</small> | | | | | | d | d | d | d | d | | |
|
||||
| <small>ssh2</small> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>standard</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>swoole</small> | | d | d | d | d | d | d | d | d | d | | |
|
||||
@ -815,13 +815,13 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
|
||||
| <small>vips</small> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>wddx</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | |
|
||||
| <small>xdebug</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>xlswriter</small> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>xlswriter</small> | | | | | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>xml</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>xmlreader</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>xmlrpc</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>xmlwriter</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
| <small>xsl</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>yaml</small> | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | |
|
||||
| <small>yaml</small> | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>Zend OPcache</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>zip</small> | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 |
|
||||
| <small>zlib</small> | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
|
||||
|
||||
@ -21,13 +21,12 @@
|
||||
[PHP]
|
||||
|
||||
; Xdebug
|
||||
; https://3.xdebug.org/docs/upgrade_guide
|
||||
; Use these settings to enable Xdebug for PHP
|
||||
; Make sure to read up on Xdebug some settings might significantly slow down requests.
|
||||
; The following is just an example configuration and should be adjusted
|
||||
xdebug.default_enable = On
|
||||
xdebug.profiler_enable = On
|
||||
xdebug.remote_enable = On
|
||||
xdebug.remote_autostart = On
|
||||
xdebug.mode = debug
|
||||
xdebug.start_with_request = yes
|
||||
xdebug.remote_handler = dbgp
|
||||
xdebug.remote_port = 9000
|
||||
xdebug.idekey = PHPSTORM
|
||||
|
||||
@ -21,13 +21,12 @@
|
||||
[PHP]
|
||||
|
||||
; Xdebug
|
||||
; https://3.xdebug.org/docs/upgrade_guide
|
||||
; Use these settings to enable Xdebug for PHP
|
||||
; Make sure to read up on Xdebug some settings might significantly slow down requests.
|
||||
; The following is just an example configuration and should be adjusted
|
||||
xdebug.default_enable = On
|
||||
xdebug.profiler_enable = On
|
||||
xdebug.remote_enable = On
|
||||
xdebug.remote_autostart = On
|
||||
xdebug.mode = debug
|
||||
xdebug.start_with_request = yes
|
||||
xdebug.remote_handler = dbgp
|
||||
xdebug.remote_port = 9000
|
||||
xdebug.idekey = PHPSTORM
|
||||
|
||||
@ -21,13 +21,12 @@
|
||||
[PHP]
|
||||
|
||||
; Xdebug
|
||||
; https://3.xdebug.org/docs/upgrade_guide
|
||||
; Use these settings to enable Xdebug for PHP
|
||||
; Make sure to read up on Xdebug some settings might significantly slow down requests.
|
||||
; The following is just an example configuration and should be adjusted
|
||||
xdebug.default_enable = On
|
||||
xdebug.profiler_enable = On
|
||||
xdebug.remote_enable = On
|
||||
xdebug.remote_autostart = On
|
||||
xdebug.mode = debug
|
||||
xdebug.start_with_request = yes
|
||||
xdebug.remote_handler = dbgp
|
||||
xdebug.remote_port = 9000
|
||||
xdebug.idekey = PHPSTORM
|
||||
|
||||
@ -218,6 +218,7 @@ fi
|
||||
print_head_1 "Checking .env file values"
|
||||
|
||||
WRONG_ENV_FILES_VALUES=0
|
||||
|
||||
DEBUG_COMPOSE_ENTRYPOINT="$( get_env_value "DEBUG_COMPOSE_ENTRYPOINT" )"
|
||||
if [ "${DEBUG_COMPOSE_ENTRYPOINT}" != "0" ] && [ "${DEBUG_COMPOSE_ENTRYPOINT}" != "1" ] && [ "${DEBUG_COMPOSE_ENTRYPOINT}" != "2" ]; then
|
||||
log_err "Variable 'DEBUG_COMPOSE_ENTRYPOINT' should be 0, 1 or 2. Has: ${DEBUG_COMPOSE_ENTRYPOINT}"
|
||||
@ -392,6 +393,7 @@ NEW_UID="$( get_env_value "NEW_UID" )"
|
||||
if [ "${NEW_UID}" != "${MY_UID}" ]; then
|
||||
log_err "Variable 'NEW_UID' has wrong value: '${NEW_UID}'. Should have: ${MY_UID}"
|
||||
RET_CODE=$(( RET_CODE + 1))
|
||||
WRONG_ENV_FILES_VALUES=1
|
||||
else
|
||||
log_debug "Variable 'NEW_UID' has correct value: '${NEW_UID}'"
|
||||
fi
|
||||
@ -400,10 +402,27 @@ NEW_GID="$( get_env_value "NEW_GID" )"
|
||||
if [ "${NEW_GID}" != "${MY_GID}" ]; then
|
||||
log_err "Variable 'NEW_GID' has wrong value: '${NEW_GID}'. Should have: ${MY_GID}"
|
||||
RET_CODE=$(( RET_CODE + 1))
|
||||
WRONG_ENV_FILES_VALUES=1
|
||||
else
|
||||
log_debug "Variable 'NEW_GID' has correct value: '${NEW_GID}'"
|
||||
fi
|
||||
|
||||
TLD_SUFFIX="$( get_env_value "TLD_SUFFIX" )"
|
||||
TLD_SUFFIX_BLACKLIST="dev|com|org|net|int|edu|de"
|
||||
if echo "${TLD_SUFFIX}" | grep -E "^(${TLD_SUFFIX_BLACKLIST})\$" >/dev/null; then
|
||||
log_err "Variable 'TLD_SUFFX' should not be set to '${TLD_SUFFIX}'. It is a real tld domain."
|
||||
log_err "All DNS requests will be intercepted to this tld domain and re-routed to the HTTP container."
|
||||
log_info "Consider using a subdomain value of e.g.: 'mydev.${TLD_SUFFIX}' instead."
|
||||
RET_CODE=$(( RET_CODE + 1))
|
||||
WRONG_ENV_FILES_VALUES=1
|
||||
elif [ "${TLD_SUFFIX}" = "localhost" ]; then
|
||||
log_err "Variable 'TLD_SUFFX' should not be set to '${TLD_SUFFIX}'. It is a loopback address."
|
||||
log_info "See: https://tools.ietf.org/html/draft-west-let-localhost-be-localhost-06"
|
||||
RET_CODE=$(( RET_CODE + 1))
|
||||
WRONG_ENV_FILES_VALUES=1
|
||||
else
|
||||
log_debug "Variable 'TLD_SUFFIX' has correct value: '${TLD_SUFFIX}'"
|
||||
fi
|
||||
|
||||
if [ "${WRONG_ENV_FILES_VALUES}" = "0" ]; then
|
||||
log_ok "All .env file variables have correct values"
|
||||
|
||||
@ -119,7 +119,7 @@ services:
|
||||
app_net:
|
||||
ipv4_address: 172.16.238.230
|
||||
environment:
|
||||
- VARNISH_CONFIG=/etc/varnish/default.vcl
|
||||
- VARNISH_CONFIG=${VARNISH_CONFIG:-/etc/varnish/default.vcl}
|
||||
- CACHE_SIZE=${VARNISH_CACHE_SIZE:-128m}
|
||||
- VARNISHD_PARAMS=${VARNISH_PARAMS:--p default_ttl=3600 -p default_grace=3600}
|
||||
- BACKEND_HOST=httpd
|
||||
|
||||
@ -16,7 +16,7 @@ services:
|
||||
app_net:
|
||||
ipv4_address: 172.16.238.230
|
||||
environment:
|
||||
- VARNISH_CONFIG=/etc/varnish/default.vcl
|
||||
- VARNISH_CONFIG=${VARNISH_CONFIG:-/etc/varnish/default.vcl}
|
||||
- CACHE_SIZE=${VARNISH_CACHE_SIZE:-128m}
|
||||
- VARNISHD_PARAMS=${VARNISH_PARAMS:--p default_ttl=3600 -p default_grace=3600}
|
||||
- BACKEND_HOST=httpd
|
||||
|
||||
@ -95,7 +95,7 @@ services:
|
||||
# PHP
|
||||
# ------------------------------------------------------------
|
||||
php:
|
||||
image: devilbox/php-fpm:${PHP_SERVER}-work-0.117
|
||||
image: devilbox/php-fpm:${PHP_SERVER}-work-0.122
|
||||
hostname: php
|
||||
|
||||
##
|
||||
@ -221,7 +221,7 @@ services:
|
||||
# Web Server
|
||||
# ------------------------------------------------------------
|
||||
httpd:
|
||||
image: devilbox/${HTTPD_SERVER}:0.35
|
||||
image: devilbox/${HTTPD_SERVER}:0.36
|
||||
hostname: httpd
|
||||
|
||||
environment:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user