From 1d2bc53833f24011caa8d534fd0d07ff235ee812 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Fri, 27 Aug 2021 16:49:10 +0800 Subject: [PATCH 01/97] fix workspace sqlsrv extension install --- workspace/Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index c9c777c8..bccc72be 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1043,34 +1043,34 @@ RUN set -eux; \ if [ ${INSTALL_MSSQL} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ apt-get install -yqq php5.6-sybase freetds-bin freetds-common libsybdb5 \ - && php -m | grep -q 'mssql' \ - && php -m | grep -q 'pdo_dblib' \ + && php -m | grep -oiE '^mssql$' \ + && php -m | grep -oiE '^pdo_dblib$' \ ;else \ ########################################################################### # The following steps were taken from # https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration ########################################################################### curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ - curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list > /etc/apt/sources.list.d/mssql-release.list && \ + curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list && \ apt-get update -yqq && \ ACCEPT_EULA=Y apt-get install -yqq msodbcsql17 mssql-tools unixodbc unixodbc-dev libgss3 odbcinst locales && \ ln -sfn /opt/mssql-tools/bin/sqlcmd /usr/bin/sqlcmd && \ ln -sfn /opt/mssql-tools/bin/bcp /usr/bin/bcp && \ echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ - locale-gen && \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "2" ]; then \ - pecl install pdo_sqlsrv-5.8.1 sqlsrv-5.8.1 \ - ;elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ - pecl install pdo_sqlsrv-5.6.1 sqlsrv-5.6.1 \ - ;elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ + locale-gen \ + && if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ pecl install pdo_sqlsrv-5.3.0 sqlsrv-5.3.0 \ + ;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ + pecl install pdo_sqlsrv-5.6.1 sqlsrv-5.6.1 \ + ;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70200" ]; then \ + pecl install pdo_sqlsrv-5.8.1 sqlsrv-5.8.1 \ ;else \ pecl install pdo_sqlsrv sqlsrv \ ;fi && \ - echo "extension=sqlsrv.so" > /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sqlsrv.ini && \ echo "extension=pdo_sqlsrv.so" > /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-pdo_sqlsrv.ini && \ - php -m | grep -q 'sqlsrv' && \ - php -m | grep -q 'pdo_sqlsrv' \ + echo "extension=sqlsrv.so" > /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sqlsrv.ini && \ + php -m | grep -oiE '^pdo_sqlsrv$' && \ + php -m | grep -oiE '^sqlsrv$' \ ;fi \ ;fi From 044bbc734b20dfec5794290ac187af5d07b92a99 Mon Sep 17 00:00:00 2001 From: Amor <794000949@qq.com> Date: Fri, 27 Aug 2021 17:23:22 +0800 Subject: [PATCH 02/97] remove source.sh & update nvm git address --- docker-compose.yml | 1 - workspace/Dockerfile | 10 ++---- workspace/sources.sh | 83 -------------------------------------------- 3 files changed, 3 insertions(+), 91 deletions(-) delete mode 100755 workspace/sources.sh diff --git a/docker-compose.yml b/docker-compose.yml index 5846dddd..4bd260d9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,7 +66,6 @@ services: - SHELL_OH_MY_ZSH=${SHELL_OH_MY_ZSH} - SHELL_OH_MY_ZSH_AUTOSUGESTIONS=${SHELL_OH_MY_ZSH_AUTOSUGESTIONS} - SHELL_OH_MY_ZSH_ALIASES=${SHELL_OH_MY_ZSH_ALIASES} - - UBUNTU_SOURCE=${UBUNTU_SOURCE} - BASE_IMAGE_TAG_PREFIX=${WORKSPACE_BASE_IMAGE_TAG_PREFIX} - LARADOCK_PHP_VERSION=${PHP_VERSION} - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION} diff --git a/workspace/Dockerfile b/workspace/Dockerfile index c9c777c8..bfc6ac3d 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -31,17 +31,13 @@ USER root ########################################################################### ARG CHANGE_SOURCE=false -ARG UBUNTU_SOURCE=aliyun -COPY ./sources.sh /tmp/sources.sh RUN if [ ${CHANGE_SOURCE} = true ]; then \ # Change application source from deb.debian.org to aliyun source sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list; \ sed -i 's/security.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list; \ sed -i 's/security-cdn.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list; \ - chmod +x /tmp/sources.sh; \ - /bin/sh -c /tmp/sources.sh; \ - fi; \ - rm -rf /tmp/sources.sh + sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list; \ + fi; ########################################################################### # Laradock non-root user: @@ -715,7 +711,7 @@ ENV NVM_NODEJS_ORG_MIRROR ${NVM_NODEJS_ORG_MIRROR} RUN if [ ${INSTALL_NODE} = true ]; then \ # Install nvm (A Node Version Manager) mkdir -p $NVM_DIR && \ - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash \ + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash \ && . $NVM_DIR/nvm.sh \ && nvm install ${NODE_VERSION} \ && nvm use ${NODE_VERSION} \ diff --git a/workspace/sources.sh b/workspace/sources.sh deleted file mode 100755 index 6ad796b6..00000000 --- a/workspace/sources.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -set -xe; - -if type "tee" 2>/dev/null && [ -n "${UBUNTU_SOURCE}" ]; then - SOURCE_PATH="/etc/apt/sources.list" - cp ${SOURCE_PATH} ${SOURCE_PATH}.bak && rm -rf ${SOURCE_PATH} - case "${UBUNTU_SOURCE}" in - "aliyun") - tee ${SOURCE_PATH} <<-'EOF' -deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse -EOF -;; - "zju") - tee ${SOURCE_PATH} <<-'EOF' -deb http://mirrors.zju.edu.cn/ubuntu/ focal main multiverse restricted universe -deb http://mirrors.zju.edu.cn/ubuntu/ focal-backports main multiverse restricted universe -deb http://mirrors.zju.edu.cn/ubuntu/ focal-proposed main multiverse restricted universe -deb http://mirrors.zju.edu.cn/ubuntu/ focal-security main multiverse restricted universe -deb http://mirrors.zju.edu.cn/ubuntu/ focal-updates main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ focal main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ focal-backports main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ focal-proposed main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ focal-security main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ focal-updates main multiverse restricted universe -EOF -;; - "tsinghua") - tee ${SOURCE_PATH} <<-'EOF' -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal main restricted universe multiverse -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-updates main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-updates main restricted universe multiverse -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-backports main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-backports main restricted universe multiverse -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-security main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-security main restricted universe multiverse -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-proposed main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-proposed main restricted universe multiverse -EOF -;; - "163") - tee ${SOURCE_PATH} <<-'EOF' -deb http://mirrors.163.com/ubuntu/ focal main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ focal-security main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ focal-updates main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ focal-proposed main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ focal-backports main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ focal main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ focal-security main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ focal-updates main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ focal-proposed main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ focal-backports main restricted universe multiverse -EOF -;; - "ustc") - tee ${SOURCE_PATH} <<-'EOF' -deb https://mirrors.ustc.edu.cn/ubuntu/ focal main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal main restricted universe multiverse -deb https://mirrors.ustc.edu.cn/ubuntu/ focal-updates main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal-updates main restricted universe multiverse -deb https://mirrors.ustc.edu.cn/ubuntu/ focal-backports main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal-backports main restricted universe multiverse -deb https://mirrors.ustc.edu.cn/ubuntu/ focal-security main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal-security main restricted universe multiverse -deb https://mirrors.ustc.edu.cn/ubuntu/ focal-proposed main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal-proposed main restricted universe multiverse -EOF -;; - *) - echo "Please check whether there is aliyun|zju|tsinghua|163|ustc in the parameter" - exit 1;; - esac -fi From 4bc5942ad58eeb0ae03581db265d5090ec0a01ce Mon Sep 17 00:00:00 2001 From: Amor <794000949@qq.com> Date: Fri, 27 Aug 2021 17:25:27 +0800 Subject: [PATCH 03/97] update ubuntu source --- php-fpm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 9da002c8..c86213ff 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -31,6 +31,7 @@ RUN if [ ${CHANGE_SOURCE} = true ]; then \ sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ sed -i 's/security.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list \ + sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list; \ ;fi # always run apt update when start and after add new source list, then clean up at end. From e11e9053edb28c0736fbb0e4d0353125627c2ec4 Mon Sep 17 00:00:00 2001 From: Amor <794000949@qq.com> Date: Fri, 27 Aug 2021 17:26:47 +0800 Subject: [PATCH 04/97] update ubuntu source --- php-fpm/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index c86213ff..b483bba4 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -30,8 +30,8 @@ RUN if [ ${CHANGE_SOURCE} = true ]; then \ # Change application source from deb.debian.org to aliyun source sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ sed -i 's/security.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ - sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list \ - sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list; \ + sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ + sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list \ ;fi # always run apt update when start and after add new source list, then clean up at end. From fa407d2b2fa1ddcf544b5cf5a93929d7a96677b0 Mon Sep 17 00:00:00 2001 From: Amor <794000949@qq.com> Date: Fri, 27 Aug 2021 17:32:40 +0800 Subject: [PATCH 05/97] update .env and README --- .env.example | 2 -- README-zh.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/.env.example b/.env.example index 53db7ce1..8db7984c 100644 --- a/.env.example +++ b/.env.example @@ -74,8 +74,6 @@ COMPOSE_CONVERT_WINDOWS_PATHS=1 # If you need to change the sources (i.e. to China), set CHANGE_SOURCE to true CHANGE_SOURCE=false -# Set CHANGE_SOURCE and UBUNTU_SOURCE option if you want to change the Ubuntu system sources.list file. -UBUNTU_SOURCE=aliyun # Set ORACLE INSTANT_CLIENT_MIRROR option if you want to use Intranet improve download, you can download files first ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/ diff --git a/README-zh.md b/README-zh.md index e519ef13..d05a7dbf 100644 --- a/README-zh.md +++ b/README-zh.md @@ -78,8 +78,6 @@ cp .env.example .env ``` # 开启ubuntu国内源 CHANGE_SOURCE=true -# 默认是阿里云，可选项有aliyun|zju|tsinghua|163|ustc -UBUNTU_SOURCE=aliyun # composer镜像源 WORKSPACE_COMPOSER_REPO_PACKAGIST=https://mirrors.aliyun.com/composer/ # nvm镜像源 From 53b5166236f501ed2218a8b097081f39992e9cb6 Mon Sep 17 00:00:00 2001 From: Amor <794000949@qq.com> Date: Mon, 30 Aug 2021 10:55:31 +0800 Subject: [PATCH 06/97] reset php-fpm/Dockerfile --- php-fpm/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index b483bba4..9da002c8 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -30,8 +30,7 @@ RUN if [ ${CHANGE_SOURCE} = true ]; then \ # Change application source from deb.debian.org to aliyun source sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ sed -i 's/security.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ - sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ - sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list \ + sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list \ ;fi # always run apt update when start and after add new source list, then clean up at end. From d544a1a63c6962e17548a9301ced1666f44c7340 Mon Sep 17 00:00:00 2001 From: Amor <794000949@qq.com> Date: Mon, 30 Aug 2021 13:54:03 +0800 Subject: [PATCH 07/97] Remove workspace docker image redundant mirror links & Update php-fpm docker image link to Tsinghua University --- php-fpm/Dockerfile | 6 +++--- workspace/Dockerfile | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 9da002c8..d36b59c3 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -28,9 +28,9 @@ ENV DEBIAN_FRONTEND noninteractive ARG CHANGE_SOURCE=false RUN if [ ${CHANGE_SOURCE} = true ]; then \ # Change application source from deb.debian.org to aliyun source - sed -i 's/deb.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ - sed -i 's/security.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list && \ - sed -i 's/security-cdn.debian.org/mirrors.aliyun.com/' /etc/apt/sources.list \ + sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \ + sed -i 's/security.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list && \ + sed -i 's/security-cdn.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list \ ;fi # always run apt update when start and after add new source list, then clean up at end. diff --git a/workspace/Dockerfile b/workspace/Dockerfile index bfc6ac3d..e62296fc 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -33,9 +33,6 @@ USER root ARG CHANGE_SOURCE=false RUN if [ ${CHANGE_SOURCE} = true ]; then \ # Change application source from deb.debian.org to aliyun source - sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list; \ - sed -i 's/security.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list; \ - sed -i 's/security-cdn.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list; \ sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list; \ fi; From 7298c60d0fe280e6a23445f0b3ed78bd4f074375 Mon Sep 17 00:00:00 2001 From: Amor <794000949@qq.com> Date: Mon, 30 Aug 2021 18:29:47 +0800 Subject: [PATCH 08/97] change workspace dockerfile mirror link --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index e62296fc..1cf07f28 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -33,7 +33,7 @@ USER root ARG CHANGE_SOURCE=false RUN if [ ${CHANGE_SOURCE} = true ]; then \ # Change application source from deb.debian.org to aliyun source - sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list; \ + sed -i 's/ports.ubuntu.com/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list; \ fi; ########################################################################### From c784aad5a71c9e443cf2914a3fadab8a8724768c Mon Sep 17 00:00:00 2001 From: Gautier DELEGLISE Date: Mon, 30 Aug 2021 12:50:37 +0200 Subject: [PATCH 09/97] :bug: :recycle: smbclient wasn't working + refactored mssql Relates #3042 --- php-fpm/Dockerfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 9da002c8..c873cad9 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -706,33 +706,33 @@ RUN set -eux; \ apt-get -yqq install freetds-dev libsybdb5 \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.so /usr/lib/libsybdb.so \ && docker-php-ext-install mssql pdo_dblib \ - && php -m | grep -q 'mssql' \ - && php -m | grep -q 'pdo_dblib' \ + && php -m | grep -oiE '^mssql$' \ + && php -m | grep -oiE '^pdo_dblib$' \ ;else \ ########################################################################### # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image ########################################################################### # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux - apt-get install -yqq apt-transport-https gnupg \ + apt-get install -yqq apt-transport-https gnupg lsb-release \ && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list \ + && curl https://packages.microsoft.com/config/debian/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list \ && apt-get update -yqq \ && ACCEPT_EULA=Y apt-get install -yqq unixodbc unixodbc-dev libgss3 odbcinst msodbcsql17 locales \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && ln -sfn /etc/locale.alias /usr/share/locale/locale.alias \ && locale-gen \ - && if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "2" ]; then \ - pecl install pdo_sqlsrv-5.8.1 sqlsrv-5.8.1 \ - ;elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ - pecl install pdo_sqlsrv-5.6.1 sqlsrv-5.6.1 \ - ;elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ + && if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ pecl install pdo_sqlsrv-5.3.0 sqlsrv-5.3.0 \ + ;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ + pecl install pdo_sqlsrv-5.6.1 sqlsrv-5.6.1 \ + ;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70200" ]; then \ + pecl install pdo_sqlsrv-5.8.1 sqlsrv-5.8.1 \ ;else \ pecl install pdo_sqlsrv sqlsrv \ ;fi \ && docker-php-ext-enable pdo_sqlsrv sqlsrv \ - && php -m | grep -q 'pdo_sqlsrv' \ - && php -m | grep -q 'sqlsrv' \ + && php -m | grep -oiE '^pdo_sqlsrv$' \ + && php -m | grep -oiE '^sqlsrv$' \ ;fi \ ;fi @@ -787,7 +787,9 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ ARG INSTALL_SMB=false RUN if [ ${INSTALL_SMB} = true ]; then \ - apt-get install -yqq smbclient php-smbclient coreutils \ + apt-get install apt-get install -yqq smbclient libsmbclient-dev coreutils && \ + pecl install smbclient && \ + docker-php-ext-enable smbclient \ -yqq smbclient php-smbclient coreutils \ ;fi ########################################################################### From 6c9ca44573d392221570f679cf83c7fdff5f4f0f Mon Sep 17 00:00:00 2001 From: Gautier DELEGLISE Date: Mon, 30 Aug 2021 14:10:24 +0200 Subject: [PATCH 10/97] :bug: wrong command --- php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index c873cad9..7e467532 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -789,7 +789,7 @@ ARG INSTALL_SMB=false RUN if [ ${INSTALL_SMB} = true ]; then \ apt-get install apt-get install -yqq smbclient libsmbclient-dev coreutils && \ pecl install smbclient && \ - docker-php-ext-enable smbclient \ -yqq smbclient php-smbclient coreutils \ + docker-php-ext-enable smbclient \ ;fi ########################################################################### From 850eadc1434796a48f6b75502938bc732896e307 Mon Sep 17 00:00:00 2001 From: Joe Niland Date: Mon, 6 Sep 2021 10:13:43 +1000 Subject: [PATCH 11/97] Add ability to install MSSQL drivers in php-worker --- .env.example | 1 + docker-compose.yml | 1 + php-worker/Dockerfile | 515 ++++++++++++++++++++++-------------------- 3 files changed, 275 insertions(+), 242 deletions(-) diff --git a/.env.example b/.env.example index 8db7984c..bad14536 100644 --- a/.env.example +++ b/.env.example @@ -293,6 +293,7 @@ PHP_WORKER_INSTALL_BCMATH=false PHP_WORKER_INSTALL_MEMCACHED=false # PHP_WORKER_INSTALL_OCI8 Does not work in php5.6 version PHP_WORKER_INSTALL_OCI8=false +PHP_WORKER_INSTALL_MSSQL=false PHP_WORKER_INSTALL_PHALCON=false PHP_WORKER_INSTALL_SOAP=false PHP_WORKER_INSTALL_ZIP_ARCHIVE=false diff --git a/docker-compose.yml b/docker-compose.yml index 4bd260d9..0538fe9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -322,6 +322,7 @@ services: - INSTALL_BCMATH=${PHP_WORKER_INSTALL_BCMATH} - INSTALL_MEMCACHED=${PHP_WORKER_INSTALL_MEMCACHED} - INSTALL_OCI8=${PHP_WORKER_INSTALL_OCI8} + - INSTALL_MSSQL=${PHP_WORKER_INSTALL_MSSQL} - INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON} - INSTALL_SOAP=${PHP_WORKER_INSTALL_SOAP} - INSTALL_ZIP_ARCHIVE=${PHP_WORKER_INSTALL_ZIP_ARCHIVE} diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index c06bd7ee..8dabe290 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -15,9 +15,9 @@ ARG LARADOCK_PHP_VERSION ARG CHANGE_SOURCE=false RUN if [ ${CHANGE_SOURCE} = true ]; then \ - # Change application source from dl-cdn.alpinelinux.org to aliyun source - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \ -;fi + # Change application source from dl-cdn.alpinelinux.org to aliyun source + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \ + ;fi RUN apk --update add wget \ curl \ @@ -37,7 +37,7 @@ RUN apk --update add wget \ RUN pecl channel-update pecl.php.net; \ - docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl + docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl # Add a non-root user: ARG PUID=1000 @@ -46,14 +46,14 @@ ARG PGID=1000 ENV PGID ${PGID} RUN addgroup -g ${PGID} laradock && \ - adduser -D -G laradock -u ${PUID} laradock + adduser -D -G laradock -u ${PUID} laradock #Install BZ2: ARG INSTALL_BZ2=false RUN if [ ${INSTALL_BZ2} = true ]; then \ apk --update add bzip2-dev; \ docker-php-ext-install bz2; \ -fi + fi ########################################################################### # PHP GnuPG: @@ -62,35 +62,35 @@ fi ARG INSTALL_GNUPG=false RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \ - apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \ - apk add --no-cache --no-progress gpgme; \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install gnupg-1.5.0RC2; \ - else \ - pecl install gnupg; \ - fi; \ - docker-php-ext-enable gnupg; \ - fi + apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \ + apk add --no-cache --no-progress gpgme; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + pecl install gnupg-1.5.0RC2; \ + else \ + pecl install gnupg; \ + fi; \ + docker-php-ext-enable gnupg; \ + fi #Install LDAP ARG INSTALL_LDAP=false; RUN set -eux; if [ ${INSTALL_LDAP} = true ]; then \ - apk add --no-cache --no-progress openldap-dev; \ - docker-php-ext-install ldap; \ - php -m | grep -oiE '^ldap$'; \ - fi + apk add --no-cache --no-progress openldap-dev; \ + docker-php-ext-install ldap; \ + php -m | grep -oiE '^ldap$'; \ + fi #Install GD package: ARG INSTALL_GD=false RUN if [ ${INSTALL_GD} = true ]; then \ - apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ]; then \ - docker-php-ext-configure gd --with-freetype --with-jpeg --with-png; \ - else \ - docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/; \ - fi; \ - docker-php-ext-install gd \ -;fi + apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ]; then \ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-png; \ + else \ + docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/; \ + fi; \ + docker-php-ext-install gd \ + ;fi #Install ImageMagick: ARG INSTALL_IMAGEMAGICK=false @@ -98,57 +98,57 @@ ARG IMAGEMAGICK_VERSION=latest ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION} RUN set -eux; \ if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apk add --update --no-cache imagemagick-dev imagemagick; \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - cd /tmp && \ - if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \ - git clone https://github.com/Imagick/imagick; \ - else \ - git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \ - fi && \ - cd imagick && \ - phpize && \ - ./configure && \ - make && \ - make install && \ - rm -r /tmp/imagick; \ - else \ - pecl install imagick; \ - fi && \ - docker-php-ext-enable imagick; \ - php -m | grep -q 'imagick'; \ + apk add --update --no-cache imagemagick-dev imagemagick; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + cd /tmp && \ + if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \ + git clone https://github.com/Imagick/imagick; \ + else \ + git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \ + fi && \ + cd imagick && \ + phpize && \ + ./configure && \ + make && \ + make install && \ + rm -r /tmp/imagick; \ + else \ + pecl install imagick; \ + fi && \ + docker-php-ext-enable imagick; \ + php -m | grep -q 'imagick'; \ fi #Install GMP package: ARG INSTALL_GMP=false RUN if [ ${INSTALL_GMP} = true ]; then \ - apk add --update --no-cache gmp gmp-dev \ - && docker-php-ext-install gmp \ -;fi + apk add --update --no-cache gmp gmp-dev \ + && docker-php-ext-install gmp \ + ;fi #Install BCMath package: ARG INSTALL_BCMATH=false RUN if [ ${INSTALL_BCMATH} = true ]; then \ - docker-php-ext-install bcmath \ -;fi + docker-php-ext-install bcmath \ + ;fi #Install SOAP package: ARG INSTALL_SOAP=false RUN if [ ${INSTALL_SOAP} = true ]; then \ - docker-php-ext-install soap \ -;fi + docker-php-ext-install soap \ + ;fi # Install MongoDB drivers: ARG INSTALL_MONGO=false RUN if [ ${INSTALL_MONGO} = true ]; then \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install mongo; \ - docker-php-ext-enable mongo; \ - else \ - pecl install mongodb; \ - docker-php-ext-enable mongodb; \ - fi; \ - fi + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + pecl install mongo; \ + docker-php-ext-enable mongo; \ + else \ + pecl install mongodb; \ + docker-php-ext-enable mongodb; \ + fi; \ + fi ########################################################################### # PHP OCI8: @@ -160,144 +160,144 @@ ENV LD_LIBRARY_PATH="/usr/local/instantclient" ENV ORACLE_HOME="/usr/local/instantclient" RUN if [ ${INSTALL_OCI8} = true ] && [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ - apk add make php7-pear php7-dev gcc musl-dev libnsl libaio poppler-utils libzip-dev zip unzip libaio-dev freetds-dev && \ - ## Download and unarchive Instant Client v11 - curl -o /tmp/basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/basic.zip && \ - unzip -d /usr/local/ /tmp/sdk.zip && \ - unzip -d /usr/local/ /tmp/sqlplus.zip \ - ## Links are required for older SDKs - && ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus &&\ - ln -s /usr/lib/libnsl.so.2.0.0 /usr/lib/libnsl.so.1 && \ - ## Build OCI8 with PECL - echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \ - echo 'extension=oci8.so' > /etc/php7/conf.d/30-oci8.ini \ - # Clean up - apk del php7-pear php7-dev gcc musl-dev && \ - rm -rf /tmp/*.zip /tmp/pear/ && \ - docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/local/instantclient \ - && docker-php-ext-configure pdo_dblib --with-libdir=/lib \ - && docker-php-ext-install pdo_oci \ - && docker-php-ext-enable oci8 \ - && docker-php-ext-install zip && \ - # Install the zip extension - docker-php-ext-configure zip && \ - php -m | grep -q 'zip' \ -;fi + apk add make php7-pear php7-dev gcc musl-dev libnsl libaio poppler-utils libzip-dev zip unzip libaio-dev freetds-dev && \ + ## Download and unarchive Instant Client v11 + curl -o /tmp/basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/basic.zip && \ + unzip -d /usr/local/ /tmp/sdk.zip && \ + unzip -d /usr/local/ /tmp/sqlplus.zip \ + ## Links are required for older SDKs + && ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus &&\ + ln -s /usr/lib/libnsl.so.2.0.0 /usr/lib/libnsl.so.1 && \ + ## Build OCI8 with PECL + echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \ + echo 'extension=oci8.so' > /etc/php7/conf.d/30-oci8.ini \ + # Clean up + apk del php7-pear php7-dev gcc musl-dev && \ + rm -rf /tmp/*.zip /tmp/pear/ && \ + docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/local/instantclient \ + && docker-php-ext-configure pdo_dblib --with-libdir=/lib \ + && docker-php-ext-install pdo_oci \ + && docker-php-ext-enable oci8 \ + && docker-php-ext-install zip && \ + # Install the zip extension + docker-php-ext-configure zip && \ + php -m | grep -q 'zip' \ + ;fi # Install PostgreSQL drivers: ARG INSTALL_PGSQL=false RUN if [ ${INSTALL_PGSQL} = true ]; then \ - apk --update add postgresql-dev \ - && docker-php-ext-install pdo_pgsql \ -;fi + apk --update add postgresql-dev \ + && docker-php-ext-install pdo_pgsql \ + ;fi # Install ZipArchive: ARG INSTALL_ZIP_ARCHIVE=false RUN set -eux; \ if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ - apk --update add libzip-dev && \ - if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - docker-php-ext-configure zip; \ - else \ - docker-php-ext-configure zip --with-libzip; \ - fi && \ - # Install the zip extension - docker-php-ext-install zip \ -;fi + apk --update add libzip-dev && \ + if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ] || [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + docker-php-ext-configure zip; \ + else \ + docker-php-ext-configure zip --with-libzip; \ + fi && \ + # Install the zip extension + docker-php-ext-install zip \ + ;fi # Install MySQL Client: ARG INSTALL_MYSQL_CLIENT=false RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \ - apk --update add mysql-client \ -;fi + apk --update add mysql-client \ + ;fi # Install FFMPEG: ARG INSTALL_FFMPEG=false RUN if [ ${INSTALL_FFMPEG} = true ]; then \ - apk --update add ffmpeg \ -;fi + apk --update add ffmpeg \ + ;fi # Install BBC Audio Waveform Image Generator: ARG INSTALL_AUDIOWAVEFORM=false RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \ - apk add git make cmake gcc g++ libmad-dev libid3tag-dev libsndfile-dev gd-dev boost-dev libgd libpng-dev zlib-dev \ - && apk add autoconf automake libtool gettext \ - && wget https://github.com/xiph/flac/archive/1.3.3.tar.gz \ - && tar xzf 1.3.3.tar.gz \ - && cd flac-1.3.3 \ - && ./autogen.sh \ - && ./configure --enable-shared=no \ - && make \ - && make install \ - && cd .. \ - && git clone https://github.com/bbc/audiowaveform.git \ - && cd audiowaveform \ - && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \ - && tar xzf release-1.10.0.tar.gz \ - && ln -s googletest-release-1.10.0/googletest googletest \ - && ln -s googletest-release-1.10.0/googlemock googlemock \ - && mkdir build \ - && cd build \ - && cmake .. \ - && make \ - && make install \ -;fi + apk add git make cmake gcc g++ libmad-dev libid3tag-dev libsndfile-dev gd-dev boost-dev libgd libpng-dev zlib-dev \ + && apk add autoconf automake libtool gettext \ + && wget https://github.com/xiph/flac/archive/1.3.3.tar.gz \ + && tar xzf 1.3.3.tar.gz \ + && cd flac-1.3.3 \ + && ./autogen.sh \ + && ./configure --enable-shared=no \ + && make \ + && make install \ + && cd .. \ + && git clone https://github.com/bbc/audiowaveform.git \ + && cd audiowaveform \ + && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \ + && tar xzf release-1.10.0.tar.gz \ + && ln -s googletest-release-1.10.0/googletest googletest \ + && ln -s googletest-release-1.10.0/googlemock googlemock \ + && mkdir build \ + && cd build \ + && cmake .. \ + && make \ + && make install \ + ;fi # Install AMQP: ARG INSTALL_AMQP=false RUN if [ ${INSTALL_AMQP} = true ]; then \ - apk --update add -q rabbitmq-c rabbitmq-c-dev && \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - printf "\n" | pecl install amqp-1.11.0beta; \ - else \ - printf "\n" | pecl install amqp; \ - fi && \ - docker-php-ext-enable amqp && \ - apk del -q rabbitmq-c-dev && \ - docker-php-ext-install sockets \ -;fi + apk --update add -q rabbitmq-c rabbitmq-c-dev && \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + printf "\n" | pecl install amqp-1.11.0beta; \ + else \ + printf "\n" | pecl install amqp; \ + fi && \ + docker-php-ext-enable amqp && \ + apk del -q rabbitmq-c-dev && \ + docker-php-ext-install sockets \ + ;fi # Install Gearman: ARG INSTALL_GEARMAN=false RUN if [ ${INSTALL_GEARMAN} = true ]; then \ - sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/main" /etc/apk/repositories && \ - sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/community" /etc/apk/repositories && \ - sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/testing" /etc/apk/repositories && \ - apk --update add php7-gearman && \ - sh -c 'echo "extension=/usr/lib/php7/modules/gearman.so" > /usr/local/etc/php/conf.d/gearman.ini' \ -;fi + sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/main" /etc/apk/repositories && \ + sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/community" /etc/apk/repositories && \ + sed -i "\$ahttp://dl-cdn.alpinelinux.org/alpine/edge/testing" /etc/apk/repositories && \ + apk --update add php7-gearman && \ + sh -c 'echo "extension=/usr/lib/php7/modules/gearman.so" > /usr/local/etc/php/conf.d/gearman.ini' \ + ;fi # Install Cassandra drivers: ARG INSTALL_CASSANDRA=false RUN if [ ${INSTALL_CASSANDRA} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - echo "PHP Driver for Cassandra is not supported for PHP 8.0."; \ + echo "PHP Driver for Cassandra is not supported for PHP 8.0."; \ else \ - apk add --update --no-cache cassandra-cpp-driver libuv gmp \ - && apk add --update --no-cache cassandra-cpp-driver-dev gmp-dev --virtual .build-sec \ - && cd /usr/src \ - && git clone https://github.com/datastax/php-driver.git \ - && cd php-driver/ext \ - && phpize \ - && mkdir -p /usr/src/php-driver/build \ - && cd /usr/src/php-driver/build \ - && ../ext/configure > /dev/null \ - && make clean > /dev/null \ - && make > /dev/null 2>&1 \ - && make install \ - && docker-php-ext-enable cassandra \ - && apk del .build-sec; \ + apk add --update --no-cache cassandra-cpp-driver libuv gmp \ + && apk add --update --no-cache cassandra-cpp-driver-dev gmp-dev --virtual .build-sec \ + && cd /usr/src \ + && git clone https://github.com/datastax/php-driver.git \ + && cd php-driver/ext \ + && phpize \ + && mkdir -p /usr/src/php-driver/build \ + && cd /usr/src/php-driver/build \ + && ../ext/configure > /dev/null \ + && make clean > /dev/null \ + && make > /dev/null 2>&1 \ + && make install \ + && docker-php-ext-enable cassandra \ + && apk del .build-sec; \ fi \ -;fi + ;fi # Install Phalcon ext ARG INSTALL_PHALCON=false @@ -305,38 +305,38 @@ ARG PHALCON_VERSION ENV PHALCON_VERSION ${PHALCON_VERSION} RUN if [ $INSTALL_PHALCON = true ]; then \ - apk --update add unzip gcc make re2c bash\ - && git clone https://github.com/jbboehr/php-psr.git \ - && cd php-psr \ - && phpize \ - && ./configure \ - && make \ - && make test \ - && make install \ - && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.zip \ - && unzip -d /tmp/ /tmp/cphalcon.zip \ - && cd /tmp/cphalcon-${PHALCON_VERSION}/build \ - && ./install \ - && rm -rf /tmp/cphalcon* \ -;fi + apk --update add unzip gcc make re2c bash\ + && git clone https://github.com/jbboehr/php-psr.git \ + && cd php-psr \ + && phpize \ + && ./configure \ + && make \ + && make test \ + && make install \ + && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.zip \ + && unzip -d /tmp/ /tmp/cphalcon.zip \ + && cd /tmp/cphalcon-${PHALCON_VERSION}/build \ + && ./install \ + && rm -rf /tmp/cphalcon* \ + ;fi ARG INSTALL_GHOSTSCRIPT=false RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \ - apk --update add ghostscript \ -;fi + apk --update add ghostscript \ + ;fi # Install Redis package: ARG INSTALL_REDIS=false RUN if [ ${INSTALL_REDIS} = true ]; then \ - # Install Redis Extension - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - printf "\n" | pecl install -o -f redis-4.3.0; \ - else \ - printf "\n" | pecl install -o -f redis; \ - fi; \ - rm -rf /tmp/pear; \ - docker-php-ext-enable redis \ -;fi + # Install Redis Extension + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + printf "\n" | pecl install -o -f redis-4.3.0; \ + else \ + printf "\n" | pecl install -o -f redis; \ + fi; \ + rm -rf /tmp/pear; \ + docker-php-ext-enable redis \ + ;fi ########################################################################### # Swoole EXTENSION @@ -345,19 +345,19 @@ RUN if [ ${INSTALL_REDIS} = true ]; then \ ARG INSTALL_SWOOLE=false RUN if [ ${INSTALL_SWOOLE} = true ]; then \ - # Install Php Swoole Extension - if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ - echo '' | pecl -q install swoole-2.0.10; \ - elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ - echo '' | pecl -q install swoole-4.3.5; \ - elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ - echo '' | pecl -q install swoole-4.5.11; \ - else \ - echo '' | pecl -q install swoole; \ - fi; \ - docker-php-ext-enable swoole \ - && php -m | grep -q 'swoole' \ -;fi + # Install Php Swoole Extension + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ + echo '' | pecl -q install swoole-2.0.10; \ + elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + echo '' | pecl -q install swoole-4.3.5; \ + elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ + echo '' | pecl -q install swoole-4.5.11; \ + else \ + echo '' | pecl -q install swoole; \ + fi; \ + docker-php-ext-enable swoole \ + && php -m | grep -q 'swoole' \ + ;fi ########################################################################### # Taint EXTENSION @@ -366,15 +366,15 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \ ARG INSTALL_TAINT=false RUN if [ ${INSTALL_TAINT} = true ]; then \ - # Install Php TAINT Extension - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ - pecl install taint; \ - docker-php-ext-enable taint; \ - php -m | grep -q 'taint'; \ - else \ - echo 'taint not Support'; \ - fi \ -;fi + # Install Php TAINT Extension + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ + pecl install taint; \ + docker-php-ext-enable taint; \ + php -m | grep -q 'taint'; \ + else \ + echo 'taint not Support'; \ + fi \ + ;fi ########################################################################### # Imap EXTENSION @@ -383,10 +383,10 @@ RUN if [ ${INSTALL_TAINT} = true ]; then \ ARG INSTALL_IMAP=false RUN if [ ${INSTALL_IMAP} = true ]; then \ - apk add --update imap-dev && \ - docker-php-ext-configure imap --with-imap --with-imap-ssl && \ - docker-php-ext-install imap \ -;fi + apk add --update imap-dev && \ + docker-php-ext-configure imap --with-imap --with-imap-ssl && \ + docker-php-ext-install imap \ + ;fi ########################################################################### # XMLRPC: @@ -395,14 +395,14 @@ RUN if [ ${INSTALL_IMAP} = true ]; then \ ARG INSTALL_XMLRPC=false RUN if [ ${INSTALL_XMLRPC} = true ]; then \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install xmlrpc-1.0.0RC2; \ - docker-php-ext-enable xmlrpc; \ - else \ - docker-php-ext-install xmlrpc; \ - fi; \ - php -m | grep -r 'xmlrpc'; \ - fi + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ + pecl install xmlrpc-1.0.0RC2; \ + docker-php-ext-enable xmlrpc; \ + else \ + docker-php-ext-install xmlrpc; \ + fi; \ + php -m | grep -r 'xmlrpc'; \ + fi ########################################################################### # PHP Memcached: @@ -414,13 +414,44 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \ apk --update add libmemcached-dev; \ # Install the php memcached extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install memcached-2.2.0; \ + pecl install memcached-2.2.0; \ else \ - pecl install memcached; \ + pecl install memcached; \ fi; \ docker-php-ext-enable memcached; \ php -m | grep -r 'memcached'; \ -fi + fi + +########################################################################### +# SQL SERVER: +########################################################################### + +ARG INSTALL_MSSQL=false + +RUN set -eux; \ + if [ ${INSTALL_MSSQL} = true ]; then \ + apk add --update gnupg \ + ########################################################################### + # Ref from: + # - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15#alpine17 + ########################################################################### + # Add Microsoft repo for Microsoft ODBC Driver 17 for Linux + # Driver version 17.5 or higher is required for Alpine support. + # Download the desired package(s) + && curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.8.1.1-1_amd64.apk \ + # Verify signature, if 'gpg' is missing install it using 'apk add gnupg': + && curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.8.1.1-1_amd64.sig \ + && curl https://packages.microsoft.com/keys/microsoft.asc | gpg --import - \ + && gpg --verify msodbcsql17_17.8.1.1-1_amd64.sig msodbcsql17_17.8.1.1-1_amd64.apk \ + # Install the package(s) + && apk add --allow-untrusted msodbcsql17_17.8.1.1-1_amd64.apk unixodbc-dev \ + && pecl install sqlsrv pdo_sqlsrv \ + # && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/10_pdo_sqlsrv.ini + # && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/00_sqlsrv.ini + && docker-php-ext-enable pdo_sqlsrv sqlsrv \ + && php -m | grep -q 'pdo_sqlsrv' \ + && php -m | grep -q 'sqlsrv' \ + ;fi ########################################################################### # PHP SSDB: @@ -431,23 +462,23 @@ USER root ARG INSTALL_SSDB=false RUN set -xe; \ - if [ ${INSTALL_SSDB} = true ] && [ $(php -r "echo PHP_MAJOR_VERSION;") != "8" ]; then \ - apk --update add sudo wget && \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ - curl -L -o /tmp/ssdb-client-php.tar.gz https://github.com/jonnywang/phpssdb/archive/php7.tar.gz; \ - else \ - curl -L -o /tmp/ssdb-client-php.tar.gz https://github.com/jonnywang/phpssdb/archive/master.tar.gz; \ - fi \ - && mkdir -p /tmp/ssdb-client-php \ - && tar -C /tmp/ssdb-client-php -zxvf /tmp/ssdb-client-php.tar.gz --strip 1 \ - && cd /tmp/ssdb-client-php \ - && phpize \ - && ./configure \ - && make \ - && make install \ - && rm /tmp/ssdb-client-php.tar.gz \ - && docker-php-ext-enable ssdb \ -;fi + if [ ${INSTALL_SSDB} = true ] && [ $(php -r "echo PHP_MAJOR_VERSION;") != "8" ]; then \ + apk --update add sudo wget && \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ + curl -L -o /tmp/ssdb-client-php.tar.gz https://github.com/jonnywang/phpssdb/archive/php7.tar.gz; \ + else \ + curl -L -o /tmp/ssdb-client-php.tar.gz https://github.com/jonnywang/phpssdb/archive/master.tar.gz; \ + fi \ + && mkdir -p /tmp/ssdb-client-php \ + && tar -C /tmp/ssdb-client-php -zxvf /tmp/ssdb-client-php.tar.gz --strip 1 \ + && cd /tmp/ssdb-client-php \ + && phpize \ + && ./configure \ + && make \ + && make install \ + && rm /tmp/ssdb-client-php.tar.gz \ + && docker-php-ext-enable ssdb \ + ;fi # #-------------------------------------------------------------------------- @@ -469,7 +500,7 @@ ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisord.conf"] # # If you need to modify this image, feel free to do it right here. # - # -- Your awesome modifications go here -- # +# -- Your awesome modifications go here -- # # #-------------------------------------------------------------------------- @@ -487,6 +518,6 @@ RUN php -v | head -n 1 | grep -q "PHP ${PHP_VERSION}." # Clean up RUN rm /var/cache/apk/* \ - && mkdir -p /var/www + && mkdir -p /var/www WORKDIR /etc/supervisor/conf.d/ From 2d09864c96b55ce1208a33b75726273d1703c822 Mon Sep 17 00:00:00 2001 From: Nisar Ahmed Date: Mon, 6 Sep 2021 12:00:58 +1000 Subject: [PATCH 12/97] PHP-FPM: Fix arguments passed to PHP-FPM Dockerfile to install NEWRELIC --- php-fpm/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 531b68bc..d6638a9e 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1132,8 +1132,8 @@ RUN if [ ${NEW_RELIC} = true ]; then \ /tmp/newrelic-php5-*/newrelic-install install && \ rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* && \ sed -i \ - -e 's/"REPLACE_WITH_REAL_KEY"/"${NEW_RELIC_KEY}"/' \ - -e 's/newrelic.appname = "PHP Application"/newrelic.appname = "${NEW_RELIC_APP_NAME}"/' \ + -e 's/"REPLACE_WITH_REAL_KEY"/"'${NEW_RELIC_KEY}'"/' \ + -e 's/newrelic.appname = "PHP Application"/newrelic.appname = "'${NEW_RELIC_APP_NAME}'"/' \ -e 's/;newrelic.daemon.app_connect_timeout =.*/newrelic.daemon.app_connect_timeout=15s/' \ -e 's/;newrelic.daemon.start_timeout =.*/newrelic.daemon.start_timeout=5s/' \ /usr/local/etc/php/conf.d/newrelic.ini \ From 2117e7765bb9485a398bd637963c688efcf71a2f Mon Sep 17 00:00:00 2001 From: lila Date: Tue, 7 Sep 2021 22:46:51 +0800 Subject: [PATCH 13/97] laravel octane nginx configuration added --- nginx/sites/octane.conf.example | 56 +++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 nginx/sites/octane.conf.example diff --git a/nginx/sites/octane.conf.example b/nginx/sites/octane.conf.example new file mode 100644 index 00000000..57b5e7d4 --- /dev/null +++ b/nginx/sites/octane.conf.example @@ -0,0 +1,56 @@ +map $http_upgrade $connection_upgrade { + default upgrade; + '' close; +} + +upstream octane { + server workspace:8000 weight=5 max_fails=3 fail_timeout=30s; + keepalive 16; +} + +server { + listen 80; + listen [::]:80; + server_name octane.test; + server_tokens off; + root /var/www/octane/public; + + index index.php; + + charset utf-8; + + location /index.php { + try_files /not_exists @octane; + } + + location / { + try_files $uri $uri/ @octane; + } + + location = /favicon.ico { access_log off; log_not_found off; } + location = /robots.txt { access_log off; log_not_found off; } + + error_page 404 /index.php; + + location @octane { + set $suffix ""; + + if ($uri = /index.php) { + set $suffix ?$query_string; + } + + proxy_http_version 1.1; + proxy_set_header Host $http_host; + proxy_set_header Scheme $scheme; + proxy_set_header SERVER_PORT $server_port; + proxy_set_header REMOTE_ADDR $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + + proxy_pass http://octane$suffix; + } + + error_log /var/log/nginx/octane_error.log; + access_log /var/log/nginx/octane_access.log; +} \ No newline at end of file From 71d73e0d837f961219dce86fd8f15b908996d4a1 Mon Sep 17 00:00:00 2001 From: lila Date: Tue, 7 Sep 2021 22:47:55 +0800 Subject: [PATCH 14/97] fix for laravel octane watch --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4bd260d9..3794dac9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -192,6 +192,7 @@ services: - DOCKER_TLS_VERIFY=1 - DOCKER_TLS_CERTDIR=/certs - DOCKER_CERT_PATH=/certs/client + - CHOKIDAR_USEPOLLING=true networks: - frontend - backend From a8be1768b92be739fff4ff73f18653d73b4bbdf3 Mon Sep 17 00:00:00 2001 From: eric-reichenbach <8860625+eric-reichenbach@users.noreply.github.com> Date: Fri, 10 Sep 2021 09:04:53 +0200 Subject: [PATCH 15/97] Fix the python dependancies in laravel echo server The build fail with the previous Dockerfile --- laravel-echo-server/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel-echo-server/Dockerfile b/laravel-echo-server/Dockerfile index 26a64c1a..5f6d41b8 100644 --- a/laravel-echo-server/Dockerfile +++ b/laravel-echo-server/Dockerfile @@ -16,8 +16,8 @@ RUN if [ ${CHANGE_SOURCE} = true ]; then \ ;fi RUN apk add --update \ - python \ - python-dev \ + python3 \ + python3-dev \ py-pip \ build-base From 70ff1d6da74ae9bc1f1ee8b8de1caecf47823e30 Mon Sep 17 00:00:00 2001 From: Adam Ducho Date: Fri, 10 Sep 2021 09:32:43 +0200 Subject: [PATCH 16/97] php fix oci8 versions --- php-fpm/Dockerfile | 6 ++++-- workspace/Dockerfile | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index d6638a9e..19c45270 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -602,9 +602,11 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ freetds-dev && \ # Install PHP extensions if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10; \ - else \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.12; \ + elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \ + else \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \ fi \ && docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/opt/oracle/instantclient_12_1,12.1 \ && docker-php-ext-configure pdo_dblib --with-libdir=/lib/x86_64-linux-gnu \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index d017a9d6..97be9629 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -903,11 +903,13 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ && apt-get install --no-install-recommends -y \ libaio-dev && \ # Install PHP extensions - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10; \ - else \ - echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \ - fi \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.12; \ + elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \ + else \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \ + fi \ && echo "extension=oci8.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \ && php -m | grep -q 'oci8' \ ;fi From 5b04b8a6d192d5a0c97348ed0741053de1b96ce9 Mon Sep 17 00:00:00 2001 From: Adam Ducho Date: Fri, 10 Sep 2021 09:36:58 +0200 Subject: [PATCH 17/97] php fix oci8 versions --- workspace/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 97be9629..80e6978a 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -903,13 +903,13 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ && apt-get install --no-install-recommends -y \ libaio-dev && \ # Install PHP extensions - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.12; \ - elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ - echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \ - else \ - echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \ - fi \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.12; \ + elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \ + else \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \ + fi \ && echo "extension=oci8.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \ && php -m | grep -q 'oci8' \ ;fi From 7511d4f148ccf3ab55a86b8fc800339a25842f3a Mon Sep 17 00:00:00 2001 From: Geovanek Date: Tue, 14 Sep 2021 09:43:27 -0300 Subject: [PATCH 18/97] Set phyton version to work laravel-echo-server --- .env.example | 1027 -------------------------------- laravel-echo-server/Dockerfile | 6 +- workspace/crontab/laradock | 2 + 3 files changed, 5 insertions(+), 1030 deletions(-) delete mode 100644 .env.example diff --git a/.env.example b/.env.example deleted file mode 100644 index bad14536..00000000 --- a/.env.example +++ /dev/null @@ -1,1027 +0,0 @@ -########################################################### -###################### General Setup ###################### -########################################################### - -### Paths ################################################# - -# Point to the path of your applications code on your host -APP_CODE_PATH_HOST=../ - -# Point to where the `APP_CODE_PATH_HOST` should be in the container -APP_CODE_PATH_CONTAINER=/var/www - -# You may add flags to the path `:cached`, `:delegated`. When using Docker Sync add `:nocopy` -APP_CODE_CONTAINER_FLAG=:cached - -# Choose storage path on your machine. For all storage systems -DATA_PATH_HOST=~/.laradock/data - -### Drivers ################################################ - -# All volumes driver -VOLUMES_DRIVER=local - -# All Networks driver -NETWORKS_DRIVER=bridge - -### Docker compose files ################################## - -# Select which docker-compose files to include. If using docker-sync append `:docker-compose.sync.yml` at the end -COMPOSE_FILE=docker-compose.yml - -# Change the separator from : to ; on Windows -COMPOSE_PATH_SEPARATOR=: - -# Define the prefix of container names. This is useful if you have multiple projects that use laradock to have separate containers per project. -COMPOSE_PROJECT_NAME=laradock - -### PHP Version ########################################### - -# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). -# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 -PHP_VERSION=7.3 - -### Phalcon Version ########################################### - -# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 3.4.0+ -PHALCON_VERSION=4.0.5 - -### PHP Interpreter ####################################### - -# Select the PHP Interpreter. Accepted values: hhvm - php-fpm -PHP_INTERPRETER=php-fpm - -### Docker Host IP ######################################## - -# Enter your Docker Host IP (will be appended to /etc/hosts). Default is `10.0.75.1` -DOCKER_HOST_IP=10.0.75.1 - -### Remote Interpreter #################################### - -# Choose a Remote Interpreter entry matching name. Default is `laradock` -PHP_IDE_CONFIG=serverName=laradock - -### PHP DOWNGRADEOPENSSL TLS AND SECLEVEL ################# - -PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false - -### Windows Path ########################################## - -# A fix for Windows users, to ensure the application path works -COMPOSE_CONVERT_WINDOWS_PATHS=1 - -### Environment ########################################### - -# If you need to change the sources (i.e. to China), set CHANGE_SOURCE to true -CHANGE_SOURCE=false -# Set ORACLE INSTANT_CLIENT_MIRROR option if you want to use Intranet improve download, you can download files first -ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/ - -### Docker Sync ########################################### - -# If you are using Docker Sync. For `osx` use 'native_osx', for `windows` use 'unison', for `linux` docker-sync is not required -DOCKER_SYNC_STRATEGY=native_osx - -### Install Oh My ZSH! #################################### - -# If you want to use "Oh My ZSH!" with Laravel autocomplete plugin, set SHELL_OH_MY_ZSH to true. - -SHELL_OH_MY_ZSH=false -SHELL_OH_MY_ZSH_AUTOSUGESTIONS=false -SHELL_OH_MY_ZSH_ALIASES=false - -########################################################### -################ Containers Customization ################# -########################################################### - -### WORKSPACE ############################################# - -WORKSPACE_BASE_IMAGE_TAG_PREFIX=latest -WORKSPACE_COMPOSER_GLOBAL_INSTALL=true -WORKSPACE_COMPOSER_VERSION=2 -WORKSPACE_COMPOSER_AUTH=false -WORKSPACE_COMPOSER_REPO_PACKAGIST= -WORKSPACE_NVM_NODEJS_ORG_MIRROR= -WORKSPACE_INSTALL_NODE=true -WORKSPACE_NODE_VERSION=node -WORKSPACE_NPM_REGISTRY= -WORKSPACE_NPM_FETCH_RETRIES=2 -WORKSPACE_NPM_FETCH_RETRY_FACTOR=10 -WORKSPACE_NPM_FETCH_RETRY_MINTIMEOUT=10000 -WORKSPACE_NPM_FETCH_RETRY_MAXTIMEOUT=60000 -WORKSPACE_INSTALL_PNPM=false -WORKSPACE_INSTALL_YARN=true -WORKSPACE_YARN_VERSION=latest -WORKSPACE_INSTALL_NPM_GULP=true -WORKSPACE_INSTALL_NPM_BOWER=false -WORKSPACE_INSTALL_NPM_VUE_CLI=true -WORKSPACE_INSTALL_NPM_ANGULAR_CLI=false -WORKSPACE_INSTALL_PHPREDIS=true -WORKSPACE_INSTALL_WORKSPACE_SSH=false -WORKSPACE_INSTALL_SUBVERSION=false -WORKSPACE_INSTALL_BZ2=false -WORKSPACE_INSTALL_GMP=false -WORKSPACE_INSTALL_GNUPG=false -WORKSPACE_INSTALL_XDEBUG=false -WORKSPACE_INSTALL_PCOV=false -WORKSPACE_INSTALL_PHPDBG=false -WORKSPACE_INSTALL_SSH2=false -WORKSPACE_INSTALL_LDAP=false -WORKSPACE_INSTALL_SOAP=false -WORKSPACE_INSTALL_XSL=false -WORKSPACE_INSTALL_SMB=false -WORKSPACE_INSTALL_IMAP=false -WORKSPACE_INSTALL_MONGO=false -WORKSPACE_INSTALL_AMQP=false -WORKSPACE_INSTALL_CASSANDRA=false -WORKSPACE_INSTALL_GEARMAN=false -WORKSPACE_INSTALL_MSSQL=false -WORKSPACE_INSTALL_DRUSH=false -WORKSPACE_DRUSH_VERSION=8.4.6 -WORKSPACE_INSTALL_DRUPAL_CONSOLE=false -WORKSPACE_INSTALL_WP_CLI=false -WORKSPACE_INSTALL_AEROSPIKE=false -WORKSPACE_INSTALL_OCI8=false -WORKSPACE_INSTALL_V8JS=false -WORKSPACE_INSTALL_LARAVEL_ENVOY=false -WORKSPACE_INSTALL_LARAVEL_INSTALLER=false -WORKSPACE_INSTALL_DEPLOYER=false -WORKSPACE_INSTALL_PRESTISSIMO=false -WORKSPACE_INSTALL_LINUXBREW=false -WORKSPACE_INSTALL_MC=false -WORKSPACE_INSTALL_SYMFONY=false -WORKSPACE_INSTALL_PYTHON=false -WORKSPACE_INSTALL_PYTHON3=false -WORKSPACE_INSTALL_POWERLINE=false -WORKSPACE_INSTALL_SUPERVISOR=false -WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false -WORKSPACE_INSTALL_IMAGEMAGICK=false -WORKSPACE_IMAGEMAGICK_VERSION=latest -WORKSPACE_INSTALL_TERRAFORM=false -WORKSPACE_INSTALL_DUSK_DEPS=false -WORKSPACE_INSTALL_PG_CLIENT=false -WORKSPACE_INSTALL_PHALCON=false -WORKSPACE_INSTALL_SWOOLE=false -WORKSPACE_INSTALL_TAINT=false -WORKSPACE_INSTALL_LIBPNG=false -WORKSPACE_INSTALL_GRAPHVIZ=false -WORKSPACE_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592 -WORKSPACE_INSTALL_MYSQL_CLIENT=false -WORKSPACE_INSTALL_PING=false -WORKSPACE_INSTALL_SSHPASS=false -WORKSPACE_INSTALL_INOTIFY=false -WORKSPACE_INSTALL_FSWATCH=false -WORKSPACE_INSTALL_YAML=false -WORKSPACE_INSTALL_RDKAFKA=false -WORKSPACE_INSTALL_MAILPARSE=false -WORKSPACE_INSTALL_XMLRPC=false -WORKSPACE_PUID=1000 -WORKSPACE_PGID=1000 -WORKSPACE_CHROME_DRIVER_VERSION=2.42 -WORKSPACE_TIMEZONE=UTC -WORKSPACE_SSH_PORT=2222 -WORKSPACE_INSTALL_FFMPEG=false -WORKSPACE_INSTALL_AUDIOWAVEFORM=false -WORKSPACE_INSTALL_WKHTMLTOPDF=false -WORKSPACE_INSTALL_GNU_PARALLEL=false -WORKSPACE_INSTALL_AST=true -WORKSPACE_AST_VERSION=1.0.10 -WORKSPACE_BROWSERSYNC_HOST_PORT=3000 -WORKSPACE_BROWSERSYNC_UI_HOST_PORT=3001 -WORKSPACE_VUE_CLI_SERVE_HOST_PORT=8080 -WORKSPACE_VUE_CLI_UI_HOST_PORT=8001 -WORKSPACE_ANGULAR_CLI_SERVE_HOST_PORT=4200 -WORKSPACE_INSTALL_GIT_PROMPT=false -WORKSPACE_INSTALL_DOCKER_CLIENT=false -WORKSPACE_INSTALL_LNAV=false -WORKSPACE_INSTALL_PROTOC=false -WORKSPACE_INSTALL_PHPDECIMAL=false -WORKSPACE_INSTALL_ZOOKEEPER=false -WORKSPACE_INSTALL_SSDB=false -WORKSPACE_PROTOC_VERSION=latest -WORKSPACE_INSTALL_MEMCACHED=true - -### PHP_FPM ############################################### - -PHP_FPM_BASE_IMAGE_TAG_PREFIX=latest -PHP_FPM_INSTALL_BCMATH=true -PHP_FPM_INSTALL_MYSQLI=true -PHP_FPM_INSTALL_INTL=true -PHP_FPM_INSTALL_IMAGEMAGICK=true -PHP_FPM_IMAGEMAGICK_VERSION=latest -PHP_FPM_INSTALL_OPCACHE=true -PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true -PHP_FPM_INSTALL_PHPREDIS=true -PHP_FPM_INSTALL_MEMCACHED=false -PHP_FPM_INSTALL_BZ2=false -PHP_FPM_INSTALL_ENCHANT=false -PHP_FPM_INSTALL_GMP=false -PHP_FPM_INSTALL_GNUPG=false -PHP_FPM_INSTALL_XDEBUG=false -PHP_FPM_INSTALL_PCOV=false -PHP_FPM_INSTALL_XHPROF=false -PHP_FPM_INSTALL_PHPDBG=false -PHP_FPM_INSTALL_SMB=false -PHP_FPM_INSTALL_IMAP=false -PHP_FPM_INSTALL_MONGO=false -PHP_FPM_INSTALL_AMQP=false -PHP_FPM_INSTALL_CASSANDRA=false -PHP_FPM_INSTALL_GEARMAN=false -PHP_FPM_INSTALL_MSSQL=false -PHP_FPM_INSTALL_SSH2=false -PHP_FPM_INSTALL_SOAP=false -PHP_FPM_INSTALL_XSL=false -PHP_FPM_INSTALL_EXIF=false -PHP_FPM_INSTALL_AEROSPIKE=false -PHP_FPM_INSTALL_OCI8=false -PHP_FPM_INSTALL_PGSQL=false -PHP_FPM_INSTALL_GHOSTSCRIPT=false -PHP_FPM_INSTALL_LDAP=false -PHP_FPM_INSTALL_PHALCON=false -PHP_FPM_INSTALL_SWOOLE=false -PHP_FPM_INSTALL_TAINT=false -PHP_FPM_INSTALL_PG_CLIENT=false -PHP_FPM_INSTALL_POSTGIS=false -PHP_FPM_INSTALL_PCNTL=false -PHP_FPM_INSTALL_CALENDAR=false -PHP_FPM_INSTALL_FAKETIME=false -PHP_FPM_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592 -PHP_FPM_INSTALL_RDKAFKA=false -PHP_FPM_INSTALL_GETTEXT=false -PHP_FPM_INSTALL_XMLRPC=false -PHP_FPM_FAKETIME=-0 -PHP_FPM_INSTALL_APCU=false -PHP_FPM_INSTALL_CACHETOOL=false -PHP_FPM_INSTALL_YAML=false -PHP_FPM_INSTALL_ADDITIONAL_LOCALES=false -PHP_FPM_INSTALL_MYSQL_CLIENT=false -PHP_FPM_INSTALL_PING=false -PHP_FPM_INSTALL_SSHPASS=false -PHP_FPM_INSTALL_MAILPARSE=false -PHP_FPM_INSTALL_WKHTMLTOPDF=false -PHP_FPM_INSTALL_PHPDECIMAL=false -PHP_FPM_INSTALL_ZOOKEEPER=false -PHP_FPM_INSTALL_SSDB=false -PHP_FPM_FFMPEG=false -PHP_FPM_AUDIOWAVEFORM=false -PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8" -PHP_FPM_INSTALL_DOCKER_CLIENT=false -PHP_FPM_DEFAULT_LOCALE=POSIX -PHP_FPM_XDEBUG_PORT=9003 - -PHP_FPM_PUID=1000 -PHP_FPM_PGID=1000 - -### PHP_FPM_NEW_RELIC ##################################### - -PHP_FPM_NEW_RELIC=false -PHP_FPM_NEW_RELIC_KEY=0000 -PHP_FPM_NEW_RELIC_APP_NAME=app_name - -### PHP_WORKER ############################################ - -PHP_WORKER_INSTALL_BZ2=false -PHP_WORKER_INSTALL_GD=false -PHP_WORKER_INSTALL_IMAGEMAGICK=false -PHP_WORKER_IMAGEMAGICK_VERSION=latest -PHP_WORKER_INSTALL_GMP=false -PHP_WORKER_INSTALL_GNUPG=false -PHP_WORKER_INSTALL_LDAP=false -PHP_WORKER_INSTALL_PGSQL=false -PHP_WORKER_INSTALL_MONGO=false -PHP_WORKER_INSTALL_BCMATH=false -PHP_WORKER_INSTALL_MEMCACHED=false -# PHP_WORKER_INSTALL_OCI8 Does not work in php5.6 version -PHP_WORKER_INSTALL_OCI8=false -PHP_WORKER_INSTALL_MSSQL=false -PHP_WORKER_INSTALL_PHALCON=false -PHP_WORKER_INSTALL_SOAP=false -PHP_WORKER_INSTALL_ZIP_ARCHIVE=false -PHP_WORKER_INSTALL_MYSQL_CLIENT=false -PHP_WORKER_INSTALL_AMQP=false -PHP_WORKER_INSTALL_GHOSTSCRIPT=false -PHP_WORKER_INSTALL_SWOOLE=false -PHP_WORKER_INSTALL_TAINT=false -PHP_WORKER_INSTALL_FFMPEG=false -PHP_WORKER_INSTALL_AUDIOWAVEFORM=false -PHP_WORKER_INSTALL_CASSANDRA=false -PHP_WORKER_INSTALL_GEARMAN=false -PHP_WORKER_INSTALL_REDIS=false -PHP_WORKER_INSTALL_IMAP=false -PHP_WORKER_INSTALL_XMLRPC=false -PHP_WORKER_INSTALL_SSDB=false - -PHP_WORKER_PUID=1000 -PHP_WORKER_PGID=1000 - -### NGINX ################################################# - -NGINX_HOST_HTTP_PORT=80 -NGINX_HOST_HTTPS_PORT=443 -NGINX_HOST_LOG_PATH=./logs/nginx/ -NGINX_SITES_PATH=./nginx/sites/ -NGINX_PHP_UPSTREAM_CONTAINER=php-fpm -NGINX_PHP_UPSTREAM_PORT=9000 -NGINX_SSL_PATH=./nginx/ssl/ - -### OpenResty ################################################# - -OPENRESTY_HOST_HTTP_PORT=80 -OPENRESTY_HOST_HTTPS_PORT=443 -OPENRESTY_HOST_LOG_PATH=./logs/openresty/ -OPENRESTY_SITES_PATH=./openresty/sites/ -OPENRESTY_PHP_UPSTREAM_CONTAINER=php-fpm -OPENRESTY_PHP_UPSTREAM_PORT=9000 -OPENRESTY_SSL_PATH=./openresty/ssl/ - -### LARAVEL_HORIZON ################################################ - -LARAVEL_HORIZON_INSTALL_BZ2=false -LARAVEL_HORIZON_INSTALL_GD=false -LARAVEL_HORIZON_INSTALL_GMP=false -LARAVEL_HORIZON_INSTALL_GNUPG=false -LARAVEL_HORIZON_INSTALL_LDAP=false -LARAVEL_HORIZON_INSTALL_IMAGEMAGICK=false -LARAVEL_HORIZON_IMAGEMAGICK_VERSION=latest -LARAVEL_HORIZON_INSTALL_SOCKETS=false -LARAVEL_HORIZON_INSTALL_YAML=false -LARAVEL_HORIZON_INSTALL_ZIP_ARCHIVE=false -LARAVEL_HORIZON_INSTALL_PHPREDIS=false -LARAVEL_HORIZON_INSTALL_MONGO=false -LARAVEL_HORIZON_INSTALL_CASSANDRA=false -LARAVEL_HORIZON_INSTALL_FFMPEG=false -LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM=false -LARAVEL_HORIZON_PGID=1000 -LARAVEL_HORIZON_PUID=1000 - -### APACHE ################################################ - -APACHE_HOST_HTTP_PORT=80 -APACHE_HOST_HTTPS_PORT=443 -APACHE_HOST_LOG_PATH=./logs/apache2 -APACHE_SITES_PATH=./apache2/sites -APACHE_PHP_UPSTREAM_CONTAINER=php-fpm -APACHE_PHP_UPSTREAM_PORT=9000 -APACHE_PHP_UPSTREAM_TIMEOUT=60 -APACHE_DOCUMENT_ROOT=/var/www/ -APACHE_SSL_PATH=./apache2/ssl/ -APACHE_INSTALL_HTTP2=false - -### MYSQL ################################################# - -MYSQL_VERSION=latest -MYSQL_DATABASE=default -MYSQL_USER=default -MYSQL_PASSWORD=secret -MYSQL_PORT=3306 -MYSQL_ROOT_PASSWORD=root -MYSQL_ENTRYPOINT_INITDB=./mysql/docker-entrypoint-initdb.d - -### CLICKHOUSE ################################################# - -CLICKHOUSE_VERSION=20.9.4.76 -CLICKHOUSE_GOSU_VERSION=1.10 -CLICKHOUSE_CUSTOM_CONFIG=./clickhouse/config.xml -CLICKHOUSE_USERS_CUSTOM_CONFIG=./clickhouse/users.xml -CLICKHOUSE_USER=default -CLICKHOUSE_PASSWORD=HAHA -CLICKHOUSE_HTTP_PORT=8123 -CLICKHOUSE_CLIENT_PORT=9000 -CLICKHOUSE_NATIVE_PORT=9009 -CLICKHOUSE_ENTRYPOINT_INITDB=./clickhouse/docker-entrypoint-initdb.d -CLICKHOUSE_HOST_LOG_PATH=./logs/clickhouse - -### REDIS ################################################# - -REDIS_PORT=6379 - -### REDIS CLUSTER ######################################### - -REDIS_CLUSTER_PORT_RANGE=7000-7005 - -### SSDB ################################################# - -SSDB_PORT=16801 - -### ZooKeeper ############################################# - -ZOOKEEPER_PORT=2181 - -### Percona ############################################### - -PERCONA_DATABASE=homestead -PERCONA_USER=homestead -PERCONA_PASSWORD=secret -PERCONA_PORT=3306 -PERCONA_ROOT_PASSWORD=root -PERCONA_ENTRYPOINT_INITDB=./percona/docker-entrypoint-initdb.d - -### MSSQL ################################################# - -MSSQL_DATABASE=master -MSSQL_PASSWORD="yourStrong(!)Password" -MSSQL_PORT=1433 - -### MARIADB ############################################### - -MARIADB_VERSION=latest -MARIADB_DATABASE=default -MARIADB_USER=default -MARIADB_PASSWORD=secret -MARIADB_PORT=3306 -MARIADB_ROOT_PASSWORD=root -MARIADB_ENTRYPOINT_INITDB=./mariadb/docker-entrypoint-initdb.d - -### POSTGRES ############################################## - -POSTGRES_VERSION=alpine -POSTGRES_DB=default -POSTGRES_USER=default -POSTGRES_PASSWORD=secret -POSTGRES_PORT=5432 -POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d - -### SQS ############################################## - -SQS_NODE_HOST_PORT=9324 -SQS_MANAGEMENT_HTTP_HOST_PORT=9325 - -### RABBITMQ ############################################## - -RABBITMQ_NODE_HOST_PORT=5672 -RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672 -RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671 - -### MERCURE ############################################## - -MERCURE_NODE_HOST_HTTP_PORT=1337 -MERCURE_NODE_HOST_HTTPS_PORT=1338 -MERCURE_PUBLISHER_JWT_KEY=secret -MERCURE_SUBSCRIBER_JWT_KEY=another_secret -MERCURE_DEBUG=debug -MERCURE_SERVER_NAME=:80 - -### MEILISEARCH ########################################### - -MEILISEARCH_HOST_PORT=7700 -MEILISEARCH_KEY=masterkey - -### ELASTICSEARCH ######################################### - -ELASTICSEARCH_HOST_HTTP_PORT=9200 -ELASTICSEARCH_HOST_TRANSPORT_PORT=9300 - -### KIBANA ################################################ - -KIBANA_HTTP_PORT=5601 - -### DEJAVU ################################################ - -DEJAVU_HTTP_PORT=1358 - -### MEMCACHED ############################################# - -MEMCACHED_HOST_PORT=11211 - -### BEANSTALKD CONSOLE #################################### - -BEANSTALKD_CONSOLE_BUILD_PATH=./beanstalkd-console -BEANSTALKD_CONSOLE_CONTAINER_NAME=beanstalkd-console -BEANSTALKD_CONSOLE_HOST_PORT=2080 - -### BEANSTALKD ############################################ - -BEANSTALKD_HOST_PORT=11300 - -### SELENIUM ############################################## - -SELENIUM_PORT=4444 - -### MINIO ################################################# - -MINIO_PORT=9000 -MINIO_CONSOLE_PORT=9001 -MINIO_ROOT_USER=laradock -MINIO_ROOT_PASSWORD=laradock - -### ADMINER ############################################### - -ADM_PORT=8081 -ADM_INSTALL_MSSQL=false -ADM_PLUGINS= -ADM_DESIGN=pepa-linha -ADM_DEFAULT_SERVER=mysql - -### PHP MY ADMIN ########################################## - -# Accepted values: mariadb - mysql - -PMA_DB_ENGINE=mysql - -# Credentials/Port: - -PMA_USER=default -PMA_PASSWORD=secret -PMA_ROOT_PASSWORD=secret -PMA_PORT=8081 -PMA_MAX_EXECUTION_TIME=600 -PMA_MEMORY_LIMIT=256M -PMA_UPLOAD_LIMIT=2G - -### MAILDEV ############################################### - -MAILDEV_HTTP_PORT=1080 -MAILDEV_SMTP_PORT=25 - -### VARNISH ############################################### - -VARNISH_CONFIG=/etc/varnish/default.vcl -VARNISH_PORT=6081 -VARNISH_BACKEND_PORT=81 -VARNISHD_PARAMS="-p default_ttl=3600 -p default_grace=3600" - -### Varnish ############################################### - -# Proxy 1 -VARNISH_PROXY1_CACHE_SIZE=128m -VARNISH_PROXY1_BACKEND_HOST=workspace -VARNISH_PROXY1_SERVER=SERVER1 - -# Proxy 2 -VARNISH_PROXY2_CACHE_SIZE=128m -VARNISH_PROXY2_BACKEND_HOST=workspace -VARNISH_PROXY2_SERVER=SERVER2 - -### HAPROXY ############################################### - -HAPROXY_HOST_HTTP_PORT=8085 - -### JENKINS ############################################### - -JENKINS_HOST_HTTP_PORT=8090 -JENKINS_HOST_SLAVE_AGENT_PORT=50000 -JENKINS_HOME=./jenkins/jenkins_home - -### CONFLUENCE ############################################### -CONFLUENCE_POSTGRES_INIT=true -CONFLUENCE_VERSION=6.13-ubuntu-18.04-adoptopenjdk8 -CONFLUENCE_POSTGRES_DB=laradock_confluence -CONFLUENCE_POSTGRES_USER=laradock_confluence -CONFLUENCE_POSTGRES_PASSWORD=laradock_confluence -CONFLUENCE_HOST_HTTP_PORT=8090 - -### GRAFANA ############################################### - -GRAFANA_PORT=3000 - -### GRAYLOG ############################################### - -# password must be 16 characters long -GRAYLOG_PASSWORD=somesupersecretpassword -# sha256 representation of the password -GRAYLOG_SHA256_PASSWORD=b1cb6e31e172577918c9e7806c572b5ed8477d3f57aa737bee4b5b1db3696f09 -GRAYLOG_PORT=9000 -GRAYLOG_SYSLOG_TCP_PORT=514 -GRAYLOG_SYSLOG_UDP_PORT=514 -GRAYLOG_GELF_TCP_PORT=12201 -GRAYLOG_GELF_UDP_PORT=12201 - -### BLACKFIRE ############################################# - -# Create an account on blackfire.io. Don't enable blackfire and xDebug at the same time. # visit https://blackfire.io/docs/24-days/06-installation#install-probe-debian for more info. -INSTALL_BLACKFIRE=false -BLACKFIRE_CLIENT_ID="" -BLACKFIRE_CLIENT_TOKEN="" -BLACKFIRE_SERVER_ID="" -BLACKFIRE_SERVER_TOKEN="" - -### AEROSPIKE ############################################# - -AEROSPIKE_SERVICE_PORT=3000 -AEROSPIKE_FABRIC_PORT=3001 -AEROSPIKE_HEARTBEAT_PORT=3002 -AEROSPIKE_INFO_PORT=3003 -AEROSPIKE_STORAGE_GB=1 -AEROSPIKE_MEM_GB=1 -AEROSPIKE_NAMESPACE=test - -### RETHINKDB ############################################# - -RETHINKDB_PORT=8090 - -### MONGODB ############################################### - -MONGODB_PORT=27017 - -### CADDY ################################################# - -CADDY_HOST_HTTP_PORT=80 -CADDY_HOST_HTTPS_PORT=443 -CADDY_HOST_LOG_PATH=./logs/caddy -CADDY_CONFIG_PATH=./caddy/caddy - -### LARAVEL ECHO SERVER ################################### - -LARAVEL_ECHO_SERVER_PORT=6001 - -### THUMBOR ############################################################################################################ - -THUMBOR_PORT=8000 -THUMBOR_LOG_FORMAT="%(asctime)s %(name)s:%(levelname)s %(message)s" -THUMBOR_LOG_DATE_FORMAT="%Y-%m-%d %H:%M:%S" -MAX_WIDTH=0 -MAX_HEIGHT=0 -MIN_WIDTH=1 -MIN_HEIGHT=1 -ALLOWED_SOURCES=[] -QUALITY=80 -WEBP_QUALITY=None -PNG_COMPRESSION_LEVEL=6 -AUTO_WEBP=False -MAX_AGE=86400 -MAX_AGE_TEMP_IMAGE=0 -RESPECT_ORIENTATION=False -IGNORE_SMART_ERRORS=False -PRESERVE_EXIF_INFO=False -ALLOW_ANIMATED_GIFS=True -USE_GIFSICLE_ENGINE=False -USE_BLACKLIST=False -LOADER=thumbor.loaders.http_loader -STORAGE=thumbor.storages.file_storage -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -RESULT_STORAGE=thumbor.result_storages.file_storage -ENGINE=thumbor.engines.pil -SECURITY_KEY="MY_SECURE_KEY" -ALLOW_UNSAFE_URL=True -ALLOW_OLD_URLS=True -FILE_LOADER_ROOT_PATH=/data/loader -HTTP_LOADER_CONNECT_TIMEOUT=5 -HTTP_LOADER_REQUEST_TIMEOUT=20 -HTTP_LOADER_FOLLOW_REDIRECTS=True -HTTP_LOADER_MAX_REDIRECTS=5 -HTTP_LOADER_FORWARD_USER_AGENT=False -HTTP_LOADER_DEFAULT_USER_AGENT="Thumbor/5.2.1" -HTTP_LOADER_PROXY_HOST=None -HTTP_LOADER_PROXY_PORT=None -HTTP_LOADER_PROXY_USERNAME=None -HTTP_LOADER_PROXY_PASSWORD=None -HTTP_LOADER_CA_CERTS=None -HTTP_LOADER_VALIDATE_CERTS=True -HTTP_LOADER_CLIENT_KEY=None -HTTP_LOADER_CLIENT_CERT=None -HTTP_LOADER_CURL_ASYNC_HTTP_CLIENT=False -STORAGE_EXPIRATION_SECONDS=2592000 -STORES_CRYPTO_KEY_FOR_EACH_IMAGE=False -FILE_STORAGE_ROOT_PATH=/data/storage -UPLOAD_MAX_SIZE=0 -UPLOAD_ENABLED=False -UPLOAD_PHOTO_STORAGE=thumbor.storages.file_storage -UPLOAD_DELETE_ALLOWED=False -UPLOAD_PUT_ALLOWED=False -UPLOAD_DEFAULT_FILENAME=image -MONGO_STORAGE_SERVER_HOST=mongo -MONGO_STORAGE_SERVER_PORT=27017 -MONGO_STORAGE_SERVER_DB=thumbor -MONGO_STORAGE_SERVER_COLLECTION=images -REDIS_STORAGE_SERVER_HOST=redis -REDIS_STORAGE_SERVER_PORT=6379 -REDIS_STORAGE_SERVER_DB=0 -REDIS_STORAGE_SERVER_PASSWORD=None -REDIS_RESULT_STORAGE_SERVER_HOST=redis -REDIS_RESULT_STORAGE_SERVER_PORT=6379 -REDIS_RESULT_STORAGE_SERVER_DB=0 -REDIS_RESULT_STORAGE_SERVER_PASSWORD=None -MEMCACHE_STORAGE_SERVERS=["localhost:11211",] -MIXED_STORAGE_FILE_STORAGE=thumbor.storages.no_storage -MIXED_STORAGE_CRYPTO_STORAGE=thumbor.storages.no_storage -MIXED_STORAGE_DETECTOR_STORAGE=thumbor.storages.no_storage -META_CALLBACK_NAME=None -DETECTORS=[] -FACE_DETECTOR_CASCADE_FILE=haarcascade_frontalface_alt.xml -OPTIMIZERS=[] -JPEGTRAN_PATH=/usr/bin/jpegtran -PROGRESSIVE_JPEG=True -FILTERS="[thumbor.filters.brightness, thumbor.filters.contrast, thumbor.filters.rgb, thumbor.filters.round_corner, thumbor.filters.quality, thumbor.filters.noise, thumbor.filters.watermark, thumbor.filters.equalize, thumbor.filters.fill, thumbor.filters.sharpen, thumbor.filters.strip_icc, thumbor.filters.frame, thumbor.filters.grayscale, thumbor.filters.rotate, thumbor.filters.format, thumbor.filters.max_bytes, thumbor.filters.convolution, thumbor.filters.blur, thumbor.filters.extract_focal, thumbor.filters.no_upscale]" -RESULT_STORAGE_EXPIRATION_SECONDS=0 -RESULT_STORAGE_FILE_STORAGE_ROOT_PATH=/data/result_storage -RESULT_STORAGE_STORES_UNSAFE=False -REDIS_QUEUE_SERVER_HOST=redis -REDIS_QUEUE_SERVER_PORT=6379 -REDIS_QUEUE_SERVER_DB="0" -REDIS_QUEUE_SERVER_PASSWORD=None -SQS_QUEUE_KEY_ID=None -SQS_QUEUE_KEY_SECRET=None -SQS_QUEUE_REGION=us-east-1 -USE_CUSTOM_ERROR_HANDLING=False -ERROR_HANDLER_MODULE=thumbor.error_handlers.sentry -ERROR_FILE_LOGGER=None -ERROR_FILE_NAME_USE_CONTEXT="False" -SENTRY_DSN_URL= -TC_AWS_REGION=eu-west-1 -TC_AWS_ENDPOINT=None -TC_AWS_STORAGE_BUCKET= -TC_AWS_STORAGE_ROOT_PATH= -TC_AWS_LOADER_BUCKET= -TC_AWS_LOADER_ROOT_PATH= -TC_AWS_RESULT_STORAGE_BUCKET= -TC_AWS_RESULT_STORAGE_ROOT_PATH= -TC_AWS_STORAGE_SSE=False -TC_AWS_STORAGE_RRS=False -TC_AWS_ENABLE_HTTP_LOADER=False -TC_AWS_ALLOWED_BUCKETS=False -TC_AWS_STORE_METADATA=False - -### SOLR ################################################## - -SOLR_VERSION=5.5 -SOLR_PORT=8983 -SOLR_DATAIMPORTHANDLER_MYSQL=false -SOLR_DATAIMPORTHANDLER_MSSQL=false - -### GITLAB ############################################### -GITLAB_POSTGRES_INIT=true -GITLAB_HOST_HTTP_PORT=8989 -GITLAB_HOST_HTTPS_PORT=9898 -GITLAB_HOST_SSH_PORT=2289 -GITLAB_DOMAIN_NAME=http://localhost -GITLAB_ROOT_PASSWORD=laradock -GITLAB_HOST_LOG_PATH=./logs/gitlab -GITLAB_POSTGRES_HOST=postgres -GITLAB_POSTGRES_USER=laradock_gitlab -GITLAB_POSTGRES_PASSWORD=laradock_gitlab -GITLAB_POSTGRES_DB=laradock_gitlab - -### GITLAB-RUNNER ############################################### -GITLAB_CI_SERVER_URL=http://localhost:8989 -GITLAB_RUNNER_REGISTRATION_TOKEN="" -GITLAB_REGISTER_NON_INTERACTIVE=true - -### JUPYTERHUB ############################################### -JUPYTERHUB_POSTGRES_INIT=true -JUPYTERHUB_POSTGRES_HOST=postgres -JUPYTERHUB_POSTGRES_USER=laradock_jupyterhub -JUPYTERHUB_POSTGRES_PASSWORD=laradock_jupyterhub -JUPYTERHUB_POSTGRES_DB=laradock_jupyterhub -JUPYTERHUB_PORT=9991 -JUPYTERHUB_OAUTH_CALLBACK_URL=http://laradock:9991/hub/oauth_callback -JUPYTERHUB_OAUTH_CLIENT_ID={GITHUB_CLIENT_ID} -JUPYTERHUB_OAUTH_CLIENT_SECRET={GITHUB_CLIENT_SECRET} -JUPYTERHUB_CUSTOM_CONFIG=./jupyterhub/jupyterhub_config.py -JUPYTERHUB_USER_DATA=/jupyterhub -JUPYTERHUB_USER_LIST=./jupyterhub/userlist -JUPYTERHUB_ENABLE_NVIDIA=false - -### IPYTHON ################################################## -LARADOCK_IPYTHON_CONTROLLER_IP=127.0.0.1 - -### NETDATA ############################################### -NETDATA_PORT=19999 - -### REDISWEBUI ######################################### -REDIS_WEBUI_USERNAME=laradock -REDIS_WEBUI_PASSWORD=laradock -REDIS_WEBUI_CONNECT_HOST=redis -REDIS_WEBUI_CONNECT_PORT=6379 -REDIS_WEBUI_PORT=9987 - -### MONGOWEBUI ############################################### -MONGO_WEBUI_PORT=3000 -MONGO_WEBUI_ROOT_URL=http://localhost -MONGO_WEBUI_MONGO_URL=mongodb://mongo:27017/ -MONGO_WEBUI_INSTALL_MONGO=false - -### METABASE ############################################### -METABASE_PORT=3030 -METABASE_DB_FILE=metabase.db -METABASE_JAVA_TIMEZONE=US/Pacific - -### IDE ############################################### -IDE_THEIA_PORT=987 -IDE_WEBIDE_PORT=984 -IDE_CODIAD_PORT=985 -IDE_ICECODER_PORT=986 - -### DOCKERREGISTRY ############################################### -DOCKER_REGISTRY_PORT=5000 - -### DOCKERWEBUI ############################################### -DOCKER_WEBUI_REGISTRY_HOST=docker-registry -DOCKER_WEBUI_REGISTRY_PORT=5000 -# if have use https proxy please set to 1 -DOCKER_REGISTRY_USE_SSL=0 -DOCKER_REGISTRY_BROWSE_ONLY=false -DOCKER_WEBUI_PORT=8754 - -### MAILU ############################################### -MAILU_VERSION=latest -MAILU_RECAPTCHA_PUBLIC_KEY="" -MAILU_RECAPTCHA_PRIVATE_KEY="" -# Main mail domain -MAILU_HTTP_PORT=6080 -MAILU_HTTPS_PORT=60443 -MAILU_DOMAIN=example.com -MAILU_INIT_ADMIN_USERNAME=laradock -MAILU_INIT_ADMIN_PASSWORD=laradock -# Hostnames for this server, separated with comas -MAILU_HOSTNAMES=mail.example.com,alternative.example.com,yetanother.example.com -# Postmaster local part (will append the main mail domain) -MAILU_POSTMASTER=admin -# Set to a randomly generated 16 bytes string -MAILU_SECRET_KEY=ChangeMeChangeMe -# Choose how secure connections will behave (value: letsencrypt, cert, notls, mail) -MAILU_TLS_FLAVOR=cert -# Authentication rate limit (per source IP address) -MAILU_AUTH_RATELIMIT="10/minute;1000/hour" -# Opt-out of statistics, replace with "True" to opt out -MAILU_DISABLE_STATISTICS=False -# Message size limit in bytes -# Default: accept messages up to 50MB -MAILU_MESSAGE_SIZE_LIMIT=50000000 -# Will relay all outgoing mails if configured -MAILU_RELAYHOST= -# Networks granted relay permissions, make sure that you include your Docker -# internal network (default to 172.17.0.0/16) -MAILU_RELAYNETS=172.16.0.0/12 -# Fetchmail delay -MAILU_FETCHMAIL_DELAY=600 -# Recipient delimiter, character used to delimiter localpart from custom address part -# e.g. localpart+custom@domain;tld -MAILU_RECIPIENT_DELIMITER=+ -# DMARC rua and ruf email -MAILU_DMARC_RUA=admin -MAILU_DMARC_RUF=admin -# Welcome email, enable and set a topic and body if you wish to send welcome -# emails to all users. -MAILU_WELCOME=True -MAILU_WELCOME_SUBJECT="Welcome to your new email account" -MAILU_WELCOME_BODY="Welcome to your new email account, if you can read this, then it is configured properly!" -# Path to the admin interface if enabled -MAILU_WEB_ADMIN=/admin -# Path to the webmail if enabled -MAILU_WEB_WEBMAIL=/webmail -# Website name -MAILU_SITENAME="Example Mail" -# Linked Website URL -MAILU_WEBSITE=http://mail.example.com -# Default password scheme used for newly created accounts and changed passwords -# (value: SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) -MAILU_PASSWORD_SCHEME=SHA512-CRYPT -# Expose the admin interface (value: true, false) -MAILU_ADMIN=true -# Choose which webmail to run if any (values: roundcube, rainloop, none) -MAILU_WEBMAIL=rainloop -# Dav server implementation (value: radicale, none) -MAILU_WEBDAV=radicale - - -### TRAEFIK ################################################# - -TRAEFIK_HOST_HTTP_PORT=80 -TRAEFIK_HOST_HTTPS_PORT=443 -TRAEFIK_DASHBOARD_PORT=8888 -# basic authentication for traefik dashboard username: admin password:admin -TRAEFIK_DASHBOARD_USER=admin:$2y$10$lXaL3lj6raFic6rFqr2.lOBoCudAIhB6zyoqObNg290UFppiUzTTi -ACME_DOMAIN=example.org -ACME_EMAIL=email@example.org - - -### MOSQUITTO ################################################# - -MOSQUITTO_PORT=9001 - -### COUCHDB ################################################### - -COUCHDB_PORT=5984 - -### Manticore Search ########################################## - -MANTICORE_CONFIG_PATH=./manticore/config -MANTICORE_API_PORT=9312 -MANTICORE_SPHINXQL_PORT=9306 -MANTICORE_HTTP_PORT=9308 - -### pgadmin ################################################## -# use this address http://ip6-localhost:5050 -PGADMIN_PORT=5050 -PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org -PGADMIN_DEFAULT_PASSWORD=admin - -### SWAGGER EDITOR ########################################### - -SWAGGER_EDITOR_PORT=5151 - -### SWAGGER UI ############################################### - -SWAGGER_API_URL=http://generator.swagger.io/api/swagger.json -SWAGGER_UI_PORT=5555 - -### SONARQUBE ################################################ -## docker-compose up -d sonarqube -## (If you encounter a database error) -## docker-compose exec --user=root postgres -## source docker-entrypoint-initdb.d/init_sonarqube_db.sh -## (If you encounter logs error) -## docker-compose run --user=root --rm sonarqube chown sonarqube:sonarqube /opt/sonarqube/logs - -SONARQUBE_HOSTNAME=sonar.example.com -SONARQUBE_PORT=9000 -SONARQUBE_POSTGRES_INIT=true -SONARQUBE_POSTGRES_HOST=postgres -SONARQUBE_POSTGRES_DB=sonar -SONARQUBE_POSTGRES_USER=sonar -SONARQUBE_POSTGRES_PASSWORD=sonarPass - -### TOMCAT ################################################ -TOMCAT_VERSION=8.5.43 -TOMCAT_HOST_HTTP_PORT=8080 - -### CASSANDRA ################################################ - -# Cassandra Version, supported tags can be found at https://hub.docker.com/r/bitnami/cassandra/ -CASSANDRA_VERSION=latest -# Inter-node cluster communication port. Default: 7000 -CASSANDRA_TRANSPORT_PORT_NUMBER=7000 -# JMX connections port. Default: 7199 -CASSANDRA_JMX_PORT_NUMBER=7199 -# Client port. Default: 9042. -CASSANDRA_CQL_PORT_NUMBER=9042 -# Cassandra user name. Defaults: cassandra -CASSANDRA_USER=cassandra -# Password seeder will change the Cassandra default credentials at initialization. In clusters, only one node should be marked as password seeder. Default: no -CASSANDRA_PASSWORD_SEEDER=no -# Cassandra user password. Default: cassandra -CASSANDRA_PASSWORD=cassandra -# Number of tokens for the node. Default: 256. -CASSANDRA_NUM_TOKENS=256 -# Hostname used to configure Cassandra. It can be either an IP or a domain. If left empty, it will be resolved to the machine IP. -CASSANDRA_HOST= -# Cluster name to configure Cassandra.. Defaults: My Cluster -CASSANDRA_CLUSTER_NAME="My Cluster" -# : Hosts that will act as Cassandra seeds. No defaults. -CASSANDRA_SEEDS= - # Snitch name (which determines which data centers and racks nodes belong to). Default SimpleSnitch -CASSANDRA_ENDPOINT_SNITCH=SimpleSnitch - # Enable the thrift RPC endpoint. Default :true -CASSANDRA_ENABLE_RPC=true -# Datacenter name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: dc1. -CASSANDRA_DATACENTER=dc1 -# Rack name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: rack1. -CASSANDRA_RACK=rack1 - -### GEARMAN ################################################## - -# Gearman version to use. See available tags at https://hub.docker.com/r/artefactual/gearmand -GEARMAN_VERSION=latest -# Port to use (Default: 4730) -GEARMAN_PORT=4730 -# Logging Level (Default: INFO) -GEARMAN_VERBOSE=INFO -# Persistent queue type to use (Default: builtin) -GEARMAN_QUEUE_TYPE=builtin -# Number of I/O threads to use (Default: 4) -GEARMAN_THREADS=4 -# Number of backlog connections for listen (Default: 32) -GEARMAN_BACKLOG=32 -# Number of file descriptors to allow for the process (Default is max allowed for user) -GEARMAN_FILE_DESCRIPTORS= -# Number of attempts to run the job before the job server removes it. (Default: no limit = 0) -GEARMAN_JOB_RETRIES=0 -# Assign work in round-robin order per worker connection (Default: 0) -GEARMAN_ROUND_ROBIN=0 -# Number of workers to wakeup for each job received (Default: 0) -GEARMAN_WORKER_WAKEUP=0 -# Enable keepalive on sockets (Default: 0) -GEARMAN_KEEPALIVE=0 -# The duration between two keepalive transmissions in idle condition (Default: 30) -GEARMAN_KEEPALIVE_IDLE=30 -# The duration between two successive keepalive retransmissions, if acknowledgement to the previous keepalive transmission is not received (Default: 10) -GEARMAN_KEEPALIVE_INTERVAL=10 -# The number of retransmissions to be carried out before declaring that remote end is not available (Default: 5) -GEARMAN_KEEPALIVE_COUNT=5 -# Mysql server host (Default: localhost) -GEARMAN_MYSQL_HOST=localhost -# Mysql server port (Default: 3306) -GEARMAN_MYSQL_PORT=3306 -# Mysql server user (Default: root) -GEARMAN_MYSQL_USER=root -# Mysql password -GEARMAN_MYSQL_PASSWORD= -# Path to file with mysql password(Docker secrets) -GEARMAN_MYSQL_PASSWORD_FILE= -# Database to use by Gearman (Default: Gearmand) -GEARMAN_MYSQL_DB=Gearmand -# Table to use by Gearman (Default: gearman_queue) -GEARMAN_MYSQL_TABLE=gearman_queue - -### ELK Stack ################################################## -ELK_VERSION=7.9.1 - -### Tarantool ################################################## -TARANTOOL_PORT=3301 -TARANTOOL_ADMIN_PORT=8002 - -### NATS ################################################## -NATS_CLIENT_PORT=4222 -NATS_MONITORING_PORT=6222 -NATS_ROUTE_PORT=8222 diff --git a/laravel-echo-server/Dockerfile b/laravel-echo-server/Dockerfile index 26a64c1a..bbdd54d5 100644 --- a/laravel-echo-server/Dockerfile +++ b/laravel-echo-server/Dockerfile @@ -16,9 +16,9 @@ RUN if [ ${CHANGE_SOURCE} = true ]; then \ ;fi RUN apk add --update \ - python \ - python-dev \ - py-pip \ + python3 \ + python3-dev \ + py3-pip \ build-base RUN npm install diff --git a/workspace/crontab/laradock b/workspace/crontab/laradock index d21529bf..0ebfe935 100644 --- a/workspace/crontab/laradock +++ b/workspace/crontab/laradock @@ -1 +1,3 @@ * * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1 + +* * * * * cd /var/www/artisan && php artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file From 2dc5954bbfd909e7cefe89ccb5c2b632d7361ae7 Mon Sep 17 00:00:00 2001 From: Marcos Kubis Date: Sun, 19 Sep 2021 17:48:42 -0300 Subject: [PATCH 19/97] Add php trader extension --- .env.example | 2 ++ docker-compose.yml | 2 ++ php-fpm/Dockerfile | 13 +++++++++++++ workspace/Dockerfile | 15 +++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/.env.example b/.env.example index bad14536..37a46465 100644 --- a/.env.example +++ b/.env.example @@ -198,6 +198,7 @@ WORKSPACE_INSTALL_PROTOC=false WORKSPACE_INSTALL_PHPDECIMAL=false WORKSPACE_INSTALL_ZOOKEEPER=false WORKSPACE_INSTALL_SSDB=false +WORKSPACE_INSTALL_TRADER=false WORKSPACE_PROTOC_VERSION=latest WORKSPACE_INSTALL_MEMCACHED=true @@ -262,6 +263,7 @@ PHP_FPM_INSTALL_WKHTMLTOPDF=false PHP_FPM_INSTALL_PHPDECIMAL=false PHP_FPM_INSTALL_ZOOKEEPER=false PHP_FPM_INSTALL_SSDB=false +PHP_FPM_INSTALL_TRADER=false PHP_FPM_FFMPEG=false PHP_FPM_AUDIOWAVEFORM=false PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8" diff --git a/docker-compose.yml b/docker-compose.yml index 0538fe9f..295be6c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -166,6 +166,7 @@ services: - INSTALL_PHPDECIMAL=${WORKSPACE_INSTALL_PHPDECIMAL} - INSTALL_ZOOKEEPER=${WORKSPACE_INSTALL_ZOOKEEPER} - INSTALL_SSDB=${WORKSPACE_INSTALL_SSDB} + - INSTALL_TRADER=${WORKSPACE_INSTALL_TRADER} - PROTOC_VERSION=${WORKSPACE_PROTOC_VERSION} - INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT} - INSTALL_MEMCACHED=${WORKSPACE_INSTALL_MEMCACHED} @@ -267,6 +268,7 @@ services: - INSTALL_PHPDECIMAL=${PHP_FPM_INSTALL_PHPDECIMAL} - INSTALL_ZOOKEEPER=${PHP_FPM_INSTALL_ZOOKEEPER} - INSTALL_SSDB=${PHP_FPM_INSTALL_SSDB} + - INSTALL_TRADER=${PHP_FPM_INSTALL_TRADER} - DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=${PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL} - PUID=${PHP_FPM_PUID} - PGID=${PHP_FPM_PGID} diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index d6638a9e..ab63bccd 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1029,6 +1029,19 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ && apt -f install \ ;fi +##################################### +# trader: +##################################### + +USER root + +ARG INSTALL_TRADER=false + +RUN if [ ${INSTALL_TRADER} = true ]; then \ + pecl install trader \ + && echo "extension=trader.so" >> $PHP_INI_DIR/conf.d/trader.ini \ +;fi + ########################################################################### # Mailparse extension: ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index d017a9d6..a44f27c7 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1668,6 +1668,21 @@ RUN set -xe; \ && rm /tmp/ssdb-client-php.tar.gz \ && docker-php-ext-enable ssdb \ ;fi + +##################################### +# trader: +##################################### + +USER root + +ARG INSTALL_TRADER=false + +RUN if [ ${INSTALL_TRADER} = true ]; then \ + pecl install trader \ + && echo "extension=trader.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/trader.ini \ + && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/trader.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-trader.ini \ +;fi + # #-------------------------------------------------------------------------- # Final Touch From aaf04367e61b4d83cc3f3eeb7854aeaaee637b02 Mon Sep 17 00:00:00 2001 From: Gautier DELEGLISE Date: Mon, 20 Sep 2021 11:11:45 +0200 Subject: [PATCH 20/97] :bug: duplicates apt-get install --- php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index d6638a9e..3ec7ecdd 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -787,7 +787,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ ARG INSTALL_SMB=false RUN if [ ${INSTALL_SMB} = true ]; then \ - apt-get install apt-get install -yqq smbclient libsmbclient-dev coreutils && \ + apt-get install -yqq smbclient libsmbclient-dev coreutils && \ pecl install smbclient && \ docker-php-ext-enable smbclient \ ;fi From 147ff33530b6ec40c75de303a97bc49f158042a7 Mon Sep 17 00:00:00 2001 From: Gautier DELEGLISE Date: Mon, 20 Sep 2021 11:13:00 +0200 Subject: [PATCH 21/97] :sparkles: added mongo credentials --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0538fe9f..796d3d60 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -656,6 +656,9 @@ services: build: ./mongo ports: - "${MONGODB_PORT}:27017" + environment: + - MONGO_INITDB_ROOT_USERNAME=${MONGO_USERNAME} + - MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD} volumes: - ${DATA_PATH_HOST}/mongo:/data/db - ${DATA_PATH_HOST}/mongo_config:/data/configdb From 00a3e0cb64782ae8df4cf4386f431316f1380945 Mon Sep 17 00:00:00 2001 From: Gautier DELEGLISE Date: Mon, 20 Sep 2021 11:13:47 +0200 Subject: [PATCH 22/97] :sparkles: added mongo credentials --- .env.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.example b/.env.example index bad14536..4cb24645 100644 --- a/.env.example +++ b/.env.example @@ -612,6 +612,8 @@ RETHINKDB_PORT=8090 ### MONGODB ############################################### MONGODB_PORT=27017 +MONGO_USERNAME=root +MONGO_PASSWORD=example ### CADDY ################################################# From cb9d98476a05518e3d7b576c124d31a5b1b6b4d1 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Wed, 22 Sep 2021 17:20:45 +0800 Subject: [PATCH 23/97] Fix #3060 --- .env.example | 1027 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1027 insertions(+) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 00000000..bad14536 --- /dev/null +++ b/.env.example @@ -0,0 +1,1027 @@ +########################################################### +###################### General Setup ###################### +########################################################### + +### Paths ################################################# + +# Point to the path of your applications code on your host +APP_CODE_PATH_HOST=../ + +# Point to where the `APP_CODE_PATH_HOST` should be in the container +APP_CODE_PATH_CONTAINER=/var/www + +# You may add flags to the path `:cached`, `:delegated`. When using Docker Sync add `:nocopy` +APP_CODE_CONTAINER_FLAG=:cached + +# Choose storage path on your machine. For all storage systems +DATA_PATH_HOST=~/.laradock/data + +### Drivers ################################################ + +# All volumes driver +VOLUMES_DRIVER=local + +# All Networks driver +NETWORKS_DRIVER=bridge + +### Docker compose files ################################## + +# Select which docker-compose files to include. If using docker-sync append `:docker-compose.sync.yml` at the end +COMPOSE_FILE=docker-compose.yml + +# Change the separator from : to ; on Windows +COMPOSE_PATH_SEPARATOR=: + +# Define the prefix of container names. This is useful if you have multiple projects that use laradock to have separate containers per project. +COMPOSE_PROJECT_NAME=laradock + +### PHP Version ########################################### + +# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). +# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 +PHP_VERSION=7.3 + +### Phalcon Version ########################################### + +# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 3.4.0+ +PHALCON_VERSION=4.0.5 + +### PHP Interpreter ####################################### + +# Select the PHP Interpreter. Accepted values: hhvm - php-fpm +PHP_INTERPRETER=php-fpm + +### Docker Host IP ######################################## + +# Enter your Docker Host IP (will be appended to /etc/hosts). Default is `10.0.75.1` +DOCKER_HOST_IP=10.0.75.1 + +### Remote Interpreter #################################### + +# Choose a Remote Interpreter entry matching name. Default is `laradock` +PHP_IDE_CONFIG=serverName=laradock + +### PHP DOWNGRADEOPENSSL TLS AND SECLEVEL ################# + +PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false + +### Windows Path ########################################## + +# A fix for Windows users, to ensure the application path works +COMPOSE_CONVERT_WINDOWS_PATHS=1 + +### Environment ########################################### + +# If you need to change the sources (i.e. to China), set CHANGE_SOURCE to true +CHANGE_SOURCE=false +# Set ORACLE INSTANT_CLIENT_MIRROR option if you want to use Intranet improve download, you can download files first +ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/ + +### Docker Sync ########################################### + +# If you are using Docker Sync. For `osx` use 'native_osx', for `windows` use 'unison', for `linux` docker-sync is not required +DOCKER_SYNC_STRATEGY=native_osx + +### Install Oh My ZSH! #################################### + +# If you want to use "Oh My ZSH!" with Laravel autocomplete plugin, set SHELL_OH_MY_ZSH to true. + +SHELL_OH_MY_ZSH=false +SHELL_OH_MY_ZSH_AUTOSUGESTIONS=false +SHELL_OH_MY_ZSH_ALIASES=false + +########################################################### +################ Containers Customization ################# +########################################################### + +### WORKSPACE ############################################# + +WORKSPACE_BASE_IMAGE_TAG_PREFIX=latest +WORKSPACE_COMPOSER_GLOBAL_INSTALL=true +WORKSPACE_COMPOSER_VERSION=2 +WORKSPACE_COMPOSER_AUTH=false +WORKSPACE_COMPOSER_REPO_PACKAGIST= +WORKSPACE_NVM_NODEJS_ORG_MIRROR= +WORKSPACE_INSTALL_NODE=true +WORKSPACE_NODE_VERSION=node +WORKSPACE_NPM_REGISTRY= +WORKSPACE_NPM_FETCH_RETRIES=2 +WORKSPACE_NPM_FETCH_RETRY_FACTOR=10 +WORKSPACE_NPM_FETCH_RETRY_MINTIMEOUT=10000 +WORKSPACE_NPM_FETCH_RETRY_MAXTIMEOUT=60000 +WORKSPACE_INSTALL_PNPM=false +WORKSPACE_INSTALL_YARN=true +WORKSPACE_YARN_VERSION=latest +WORKSPACE_INSTALL_NPM_GULP=true +WORKSPACE_INSTALL_NPM_BOWER=false +WORKSPACE_INSTALL_NPM_VUE_CLI=true +WORKSPACE_INSTALL_NPM_ANGULAR_CLI=false +WORKSPACE_INSTALL_PHPREDIS=true +WORKSPACE_INSTALL_WORKSPACE_SSH=false +WORKSPACE_INSTALL_SUBVERSION=false +WORKSPACE_INSTALL_BZ2=false +WORKSPACE_INSTALL_GMP=false +WORKSPACE_INSTALL_GNUPG=false +WORKSPACE_INSTALL_XDEBUG=false +WORKSPACE_INSTALL_PCOV=false +WORKSPACE_INSTALL_PHPDBG=false +WORKSPACE_INSTALL_SSH2=false +WORKSPACE_INSTALL_LDAP=false +WORKSPACE_INSTALL_SOAP=false +WORKSPACE_INSTALL_XSL=false +WORKSPACE_INSTALL_SMB=false +WORKSPACE_INSTALL_IMAP=false +WORKSPACE_INSTALL_MONGO=false +WORKSPACE_INSTALL_AMQP=false +WORKSPACE_INSTALL_CASSANDRA=false +WORKSPACE_INSTALL_GEARMAN=false +WORKSPACE_INSTALL_MSSQL=false +WORKSPACE_INSTALL_DRUSH=false +WORKSPACE_DRUSH_VERSION=8.4.6 +WORKSPACE_INSTALL_DRUPAL_CONSOLE=false +WORKSPACE_INSTALL_WP_CLI=false +WORKSPACE_INSTALL_AEROSPIKE=false +WORKSPACE_INSTALL_OCI8=false +WORKSPACE_INSTALL_V8JS=false +WORKSPACE_INSTALL_LARAVEL_ENVOY=false +WORKSPACE_INSTALL_LARAVEL_INSTALLER=false +WORKSPACE_INSTALL_DEPLOYER=false +WORKSPACE_INSTALL_PRESTISSIMO=false +WORKSPACE_INSTALL_LINUXBREW=false +WORKSPACE_INSTALL_MC=false +WORKSPACE_INSTALL_SYMFONY=false +WORKSPACE_INSTALL_PYTHON=false +WORKSPACE_INSTALL_PYTHON3=false +WORKSPACE_INSTALL_POWERLINE=false +WORKSPACE_INSTALL_SUPERVISOR=false +WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false +WORKSPACE_INSTALL_IMAGEMAGICK=false +WORKSPACE_IMAGEMAGICK_VERSION=latest +WORKSPACE_INSTALL_TERRAFORM=false +WORKSPACE_INSTALL_DUSK_DEPS=false +WORKSPACE_INSTALL_PG_CLIENT=false +WORKSPACE_INSTALL_PHALCON=false +WORKSPACE_INSTALL_SWOOLE=false +WORKSPACE_INSTALL_TAINT=false +WORKSPACE_INSTALL_LIBPNG=false +WORKSPACE_INSTALL_GRAPHVIZ=false +WORKSPACE_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592 +WORKSPACE_INSTALL_MYSQL_CLIENT=false +WORKSPACE_INSTALL_PING=false +WORKSPACE_INSTALL_SSHPASS=false +WORKSPACE_INSTALL_INOTIFY=false +WORKSPACE_INSTALL_FSWATCH=false +WORKSPACE_INSTALL_YAML=false +WORKSPACE_INSTALL_RDKAFKA=false +WORKSPACE_INSTALL_MAILPARSE=false +WORKSPACE_INSTALL_XMLRPC=false +WORKSPACE_PUID=1000 +WORKSPACE_PGID=1000 +WORKSPACE_CHROME_DRIVER_VERSION=2.42 +WORKSPACE_TIMEZONE=UTC +WORKSPACE_SSH_PORT=2222 +WORKSPACE_INSTALL_FFMPEG=false +WORKSPACE_INSTALL_AUDIOWAVEFORM=false +WORKSPACE_INSTALL_WKHTMLTOPDF=false +WORKSPACE_INSTALL_GNU_PARALLEL=false +WORKSPACE_INSTALL_AST=true +WORKSPACE_AST_VERSION=1.0.10 +WORKSPACE_BROWSERSYNC_HOST_PORT=3000 +WORKSPACE_BROWSERSYNC_UI_HOST_PORT=3001 +WORKSPACE_VUE_CLI_SERVE_HOST_PORT=8080 +WORKSPACE_VUE_CLI_UI_HOST_PORT=8001 +WORKSPACE_ANGULAR_CLI_SERVE_HOST_PORT=4200 +WORKSPACE_INSTALL_GIT_PROMPT=false +WORKSPACE_INSTALL_DOCKER_CLIENT=false +WORKSPACE_INSTALL_LNAV=false +WORKSPACE_INSTALL_PROTOC=false +WORKSPACE_INSTALL_PHPDECIMAL=false +WORKSPACE_INSTALL_ZOOKEEPER=false +WORKSPACE_INSTALL_SSDB=false +WORKSPACE_PROTOC_VERSION=latest +WORKSPACE_INSTALL_MEMCACHED=true + +### PHP_FPM ############################################### + +PHP_FPM_BASE_IMAGE_TAG_PREFIX=latest +PHP_FPM_INSTALL_BCMATH=true +PHP_FPM_INSTALL_MYSQLI=true +PHP_FPM_INSTALL_INTL=true +PHP_FPM_INSTALL_IMAGEMAGICK=true +PHP_FPM_IMAGEMAGICK_VERSION=latest +PHP_FPM_INSTALL_OPCACHE=true +PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true +PHP_FPM_INSTALL_PHPREDIS=true +PHP_FPM_INSTALL_MEMCACHED=false +PHP_FPM_INSTALL_BZ2=false +PHP_FPM_INSTALL_ENCHANT=false +PHP_FPM_INSTALL_GMP=false +PHP_FPM_INSTALL_GNUPG=false +PHP_FPM_INSTALL_XDEBUG=false +PHP_FPM_INSTALL_PCOV=false +PHP_FPM_INSTALL_XHPROF=false +PHP_FPM_INSTALL_PHPDBG=false +PHP_FPM_INSTALL_SMB=false +PHP_FPM_INSTALL_IMAP=false +PHP_FPM_INSTALL_MONGO=false +PHP_FPM_INSTALL_AMQP=false +PHP_FPM_INSTALL_CASSANDRA=false +PHP_FPM_INSTALL_GEARMAN=false +PHP_FPM_INSTALL_MSSQL=false +PHP_FPM_INSTALL_SSH2=false +PHP_FPM_INSTALL_SOAP=false +PHP_FPM_INSTALL_XSL=false +PHP_FPM_INSTALL_EXIF=false +PHP_FPM_INSTALL_AEROSPIKE=false +PHP_FPM_INSTALL_OCI8=false +PHP_FPM_INSTALL_PGSQL=false +PHP_FPM_INSTALL_GHOSTSCRIPT=false +PHP_FPM_INSTALL_LDAP=false +PHP_FPM_INSTALL_PHALCON=false +PHP_FPM_INSTALL_SWOOLE=false +PHP_FPM_INSTALL_TAINT=false +PHP_FPM_INSTALL_PG_CLIENT=false +PHP_FPM_INSTALL_POSTGIS=false +PHP_FPM_INSTALL_PCNTL=false +PHP_FPM_INSTALL_CALENDAR=false +PHP_FPM_INSTALL_FAKETIME=false +PHP_FPM_INSTALL_IONCUBE=false # PHP 8.0 is not supported yet. Reference: https://forum.ioncube.com/viewtopic.php?t=4592 +PHP_FPM_INSTALL_RDKAFKA=false +PHP_FPM_INSTALL_GETTEXT=false +PHP_FPM_INSTALL_XMLRPC=false +PHP_FPM_FAKETIME=-0 +PHP_FPM_INSTALL_APCU=false +PHP_FPM_INSTALL_CACHETOOL=false +PHP_FPM_INSTALL_YAML=false +PHP_FPM_INSTALL_ADDITIONAL_LOCALES=false +PHP_FPM_INSTALL_MYSQL_CLIENT=false +PHP_FPM_INSTALL_PING=false +PHP_FPM_INSTALL_SSHPASS=false +PHP_FPM_INSTALL_MAILPARSE=false +PHP_FPM_INSTALL_WKHTMLTOPDF=false +PHP_FPM_INSTALL_PHPDECIMAL=false +PHP_FPM_INSTALL_ZOOKEEPER=false +PHP_FPM_INSTALL_SSDB=false +PHP_FPM_FFMPEG=false +PHP_FPM_AUDIOWAVEFORM=false +PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8" +PHP_FPM_INSTALL_DOCKER_CLIENT=false +PHP_FPM_DEFAULT_LOCALE=POSIX +PHP_FPM_XDEBUG_PORT=9003 + +PHP_FPM_PUID=1000 +PHP_FPM_PGID=1000 + +### PHP_FPM_NEW_RELIC ##################################### + +PHP_FPM_NEW_RELIC=false +PHP_FPM_NEW_RELIC_KEY=0000 +PHP_FPM_NEW_RELIC_APP_NAME=app_name + +### PHP_WORKER ############################################ + +PHP_WORKER_INSTALL_BZ2=false +PHP_WORKER_INSTALL_GD=false +PHP_WORKER_INSTALL_IMAGEMAGICK=false +PHP_WORKER_IMAGEMAGICK_VERSION=latest +PHP_WORKER_INSTALL_GMP=false +PHP_WORKER_INSTALL_GNUPG=false +PHP_WORKER_INSTALL_LDAP=false +PHP_WORKER_INSTALL_PGSQL=false +PHP_WORKER_INSTALL_MONGO=false +PHP_WORKER_INSTALL_BCMATH=false +PHP_WORKER_INSTALL_MEMCACHED=false +# PHP_WORKER_INSTALL_OCI8 Does not work in php5.6 version +PHP_WORKER_INSTALL_OCI8=false +PHP_WORKER_INSTALL_MSSQL=false +PHP_WORKER_INSTALL_PHALCON=false +PHP_WORKER_INSTALL_SOAP=false +PHP_WORKER_INSTALL_ZIP_ARCHIVE=false +PHP_WORKER_INSTALL_MYSQL_CLIENT=false +PHP_WORKER_INSTALL_AMQP=false +PHP_WORKER_INSTALL_GHOSTSCRIPT=false +PHP_WORKER_INSTALL_SWOOLE=false +PHP_WORKER_INSTALL_TAINT=false +PHP_WORKER_INSTALL_FFMPEG=false +PHP_WORKER_INSTALL_AUDIOWAVEFORM=false +PHP_WORKER_INSTALL_CASSANDRA=false +PHP_WORKER_INSTALL_GEARMAN=false +PHP_WORKER_INSTALL_REDIS=false +PHP_WORKER_INSTALL_IMAP=false +PHP_WORKER_INSTALL_XMLRPC=false +PHP_WORKER_INSTALL_SSDB=false + +PHP_WORKER_PUID=1000 +PHP_WORKER_PGID=1000 + +### NGINX ################################################# + +NGINX_HOST_HTTP_PORT=80 +NGINX_HOST_HTTPS_PORT=443 +NGINX_HOST_LOG_PATH=./logs/nginx/ +NGINX_SITES_PATH=./nginx/sites/ +NGINX_PHP_UPSTREAM_CONTAINER=php-fpm +NGINX_PHP_UPSTREAM_PORT=9000 +NGINX_SSL_PATH=./nginx/ssl/ + +### OpenResty ################################################# + +OPENRESTY_HOST_HTTP_PORT=80 +OPENRESTY_HOST_HTTPS_PORT=443 +OPENRESTY_HOST_LOG_PATH=./logs/openresty/ +OPENRESTY_SITES_PATH=./openresty/sites/ +OPENRESTY_PHP_UPSTREAM_CONTAINER=php-fpm +OPENRESTY_PHP_UPSTREAM_PORT=9000 +OPENRESTY_SSL_PATH=./openresty/ssl/ + +### LARAVEL_HORIZON ################################################ + +LARAVEL_HORIZON_INSTALL_BZ2=false +LARAVEL_HORIZON_INSTALL_GD=false +LARAVEL_HORIZON_INSTALL_GMP=false +LARAVEL_HORIZON_INSTALL_GNUPG=false +LARAVEL_HORIZON_INSTALL_LDAP=false +LARAVEL_HORIZON_INSTALL_IMAGEMAGICK=false +LARAVEL_HORIZON_IMAGEMAGICK_VERSION=latest +LARAVEL_HORIZON_INSTALL_SOCKETS=false +LARAVEL_HORIZON_INSTALL_YAML=false +LARAVEL_HORIZON_INSTALL_ZIP_ARCHIVE=false +LARAVEL_HORIZON_INSTALL_PHPREDIS=false +LARAVEL_HORIZON_INSTALL_MONGO=false +LARAVEL_HORIZON_INSTALL_CASSANDRA=false +LARAVEL_HORIZON_INSTALL_FFMPEG=false +LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM=false +LARAVEL_HORIZON_PGID=1000 +LARAVEL_HORIZON_PUID=1000 + +### APACHE ################################################ + +APACHE_HOST_HTTP_PORT=80 +APACHE_HOST_HTTPS_PORT=443 +APACHE_HOST_LOG_PATH=./logs/apache2 +APACHE_SITES_PATH=./apache2/sites +APACHE_PHP_UPSTREAM_CONTAINER=php-fpm +APACHE_PHP_UPSTREAM_PORT=9000 +APACHE_PHP_UPSTREAM_TIMEOUT=60 +APACHE_DOCUMENT_ROOT=/var/www/ +APACHE_SSL_PATH=./apache2/ssl/ +APACHE_INSTALL_HTTP2=false + +### MYSQL ################################################# + +MYSQL_VERSION=latest +MYSQL_DATABASE=default +MYSQL_USER=default +MYSQL_PASSWORD=secret +MYSQL_PORT=3306 +MYSQL_ROOT_PASSWORD=root +MYSQL_ENTRYPOINT_INITDB=./mysql/docker-entrypoint-initdb.d + +### CLICKHOUSE ################################################# + +CLICKHOUSE_VERSION=20.9.4.76 +CLICKHOUSE_GOSU_VERSION=1.10 +CLICKHOUSE_CUSTOM_CONFIG=./clickhouse/config.xml +CLICKHOUSE_USERS_CUSTOM_CONFIG=./clickhouse/users.xml +CLICKHOUSE_USER=default +CLICKHOUSE_PASSWORD=HAHA +CLICKHOUSE_HTTP_PORT=8123 +CLICKHOUSE_CLIENT_PORT=9000 +CLICKHOUSE_NATIVE_PORT=9009 +CLICKHOUSE_ENTRYPOINT_INITDB=./clickhouse/docker-entrypoint-initdb.d +CLICKHOUSE_HOST_LOG_PATH=./logs/clickhouse + +### REDIS ################################################# + +REDIS_PORT=6379 + +### REDIS CLUSTER ######################################### + +REDIS_CLUSTER_PORT_RANGE=7000-7005 + +### SSDB ################################################# + +SSDB_PORT=16801 + +### ZooKeeper ############################################# + +ZOOKEEPER_PORT=2181 + +### Percona ############################################### + +PERCONA_DATABASE=homestead +PERCONA_USER=homestead +PERCONA_PASSWORD=secret +PERCONA_PORT=3306 +PERCONA_ROOT_PASSWORD=root +PERCONA_ENTRYPOINT_INITDB=./percona/docker-entrypoint-initdb.d + +### MSSQL ################################################# + +MSSQL_DATABASE=master +MSSQL_PASSWORD="yourStrong(!)Password" +MSSQL_PORT=1433 + +### MARIADB ############################################### + +MARIADB_VERSION=latest +MARIADB_DATABASE=default +MARIADB_USER=default +MARIADB_PASSWORD=secret +MARIADB_PORT=3306 +MARIADB_ROOT_PASSWORD=root +MARIADB_ENTRYPOINT_INITDB=./mariadb/docker-entrypoint-initdb.d + +### POSTGRES ############################################## + +POSTGRES_VERSION=alpine +POSTGRES_DB=default +POSTGRES_USER=default +POSTGRES_PASSWORD=secret +POSTGRES_PORT=5432 +POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d + +### SQS ############################################## + +SQS_NODE_HOST_PORT=9324 +SQS_MANAGEMENT_HTTP_HOST_PORT=9325 + +### RABBITMQ ############################################## + +RABBITMQ_NODE_HOST_PORT=5672 +RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672 +RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671 + +### MERCURE ############################################## + +MERCURE_NODE_HOST_HTTP_PORT=1337 +MERCURE_NODE_HOST_HTTPS_PORT=1338 +MERCURE_PUBLISHER_JWT_KEY=secret +MERCURE_SUBSCRIBER_JWT_KEY=another_secret +MERCURE_DEBUG=debug +MERCURE_SERVER_NAME=:80 + +### MEILISEARCH ########################################### + +MEILISEARCH_HOST_PORT=7700 +MEILISEARCH_KEY=masterkey + +### ELASTICSEARCH ######################################### + +ELASTICSEARCH_HOST_HTTP_PORT=9200 +ELASTICSEARCH_HOST_TRANSPORT_PORT=9300 + +### KIBANA ################################################ + +KIBANA_HTTP_PORT=5601 + +### DEJAVU ################################################ + +DEJAVU_HTTP_PORT=1358 + +### MEMCACHED ############################################# + +MEMCACHED_HOST_PORT=11211 + +### BEANSTALKD CONSOLE #################################### + +BEANSTALKD_CONSOLE_BUILD_PATH=./beanstalkd-console +BEANSTALKD_CONSOLE_CONTAINER_NAME=beanstalkd-console +BEANSTALKD_CONSOLE_HOST_PORT=2080 + +### BEANSTALKD ############################################ + +BEANSTALKD_HOST_PORT=11300 + +### SELENIUM ############################################## + +SELENIUM_PORT=4444 + +### MINIO ################################################# + +MINIO_PORT=9000 +MINIO_CONSOLE_PORT=9001 +MINIO_ROOT_USER=laradock +MINIO_ROOT_PASSWORD=laradock + +### ADMINER ############################################### + +ADM_PORT=8081 +ADM_INSTALL_MSSQL=false +ADM_PLUGINS= +ADM_DESIGN=pepa-linha +ADM_DEFAULT_SERVER=mysql + +### PHP MY ADMIN ########################################## + +# Accepted values: mariadb - mysql + +PMA_DB_ENGINE=mysql + +# Credentials/Port: + +PMA_USER=default +PMA_PASSWORD=secret +PMA_ROOT_PASSWORD=secret +PMA_PORT=8081 +PMA_MAX_EXECUTION_TIME=600 +PMA_MEMORY_LIMIT=256M +PMA_UPLOAD_LIMIT=2G + +### MAILDEV ############################################### + +MAILDEV_HTTP_PORT=1080 +MAILDEV_SMTP_PORT=25 + +### VARNISH ############################################### + +VARNISH_CONFIG=/etc/varnish/default.vcl +VARNISH_PORT=6081 +VARNISH_BACKEND_PORT=81 +VARNISHD_PARAMS="-p default_ttl=3600 -p default_grace=3600" + +### Varnish ############################################### + +# Proxy 1 +VARNISH_PROXY1_CACHE_SIZE=128m +VARNISH_PROXY1_BACKEND_HOST=workspace +VARNISH_PROXY1_SERVER=SERVER1 + +# Proxy 2 +VARNISH_PROXY2_CACHE_SIZE=128m +VARNISH_PROXY2_BACKEND_HOST=workspace +VARNISH_PROXY2_SERVER=SERVER2 + +### HAPROXY ############################################### + +HAPROXY_HOST_HTTP_PORT=8085 + +### JENKINS ############################################### + +JENKINS_HOST_HTTP_PORT=8090 +JENKINS_HOST_SLAVE_AGENT_PORT=50000 +JENKINS_HOME=./jenkins/jenkins_home + +### CONFLUENCE ############################################### +CONFLUENCE_POSTGRES_INIT=true +CONFLUENCE_VERSION=6.13-ubuntu-18.04-adoptopenjdk8 +CONFLUENCE_POSTGRES_DB=laradock_confluence +CONFLUENCE_POSTGRES_USER=laradock_confluence +CONFLUENCE_POSTGRES_PASSWORD=laradock_confluence +CONFLUENCE_HOST_HTTP_PORT=8090 + +### GRAFANA ############################################### + +GRAFANA_PORT=3000 + +### GRAYLOG ############################################### + +# password must be 16 characters long +GRAYLOG_PASSWORD=somesupersecretpassword +# sha256 representation of the password +GRAYLOG_SHA256_PASSWORD=b1cb6e31e172577918c9e7806c572b5ed8477d3f57aa737bee4b5b1db3696f09 +GRAYLOG_PORT=9000 +GRAYLOG_SYSLOG_TCP_PORT=514 +GRAYLOG_SYSLOG_UDP_PORT=514 +GRAYLOG_GELF_TCP_PORT=12201 +GRAYLOG_GELF_UDP_PORT=12201 + +### BLACKFIRE ############################################# + +# Create an account on blackfire.io. Don't enable blackfire and xDebug at the same time. # visit https://blackfire.io/docs/24-days/06-installation#install-probe-debian for more info. +INSTALL_BLACKFIRE=false +BLACKFIRE_CLIENT_ID="" +BLACKFIRE_CLIENT_TOKEN="" +BLACKFIRE_SERVER_ID="" +BLACKFIRE_SERVER_TOKEN="" + +### AEROSPIKE ############################################# + +AEROSPIKE_SERVICE_PORT=3000 +AEROSPIKE_FABRIC_PORT=3001 +AEROSPIKE_HEARTBEAT_PORT=3002 +AEROSPIKE_INFO_PORT=3003 +AEROSPIKE_STORAGE_GB=1 +AEROSPIKE_MEM_GB=1 +AEROSPIKE_NAMESPACE=test + +### RETHINKDB ############################################# + +RETHINKDB_PORT=8090 + +### MONGODB ############################################### + +MONGODB_PORT=27017 + +### CADDY ################################################# + +CADDY_HOST_HTTP_PORT=80 +CADDY_HOST_HTTPS_PORT=443 +CADDY_HOST_LOG_PATH=./logs/caddy +CADDY_CONFIG_PATH=./caddy/caddy + +### LARAVEL ECHO SERVER ################################### + +LARAVEL_ECHO_SERVER_PORT=6001 + +### THUMBOR ############################################################################################################ + +THUMBOR_PORT=8000 +THUMBOR_LOG_FORMAT="%(asctime)s %(name)s:%(levelname)s %(message)s" +THUMBOR_LOG_DATE_FORMAT="%Y-%m-%d %H:%M:%S" +MAX_WIDTH=0 +MAX_HEIGHT=0 +MIN_WIDTH=1 +MIN_HEIGHT=1 +ALLOWED_SOURCES=[] +QUALITY=80 +WEBP_QUALITY=None +PNG_COMPRESSION_LEVEL=6 +AUTO_WEBP=False +MAX_AGE=86400 +MAX_AGE_TEMP_IMAGE=0 +RESPECT_ORIENTATION=False +IGNORE_SMART_ERRORS=False +PRESERVE_EXIF_INFO=False +ALLOW_ANIMATED_GIFS=True +USE_GIFSICLE_ENGINE=False +USE_BLACKLIST=False +LOADER=thumbor.loaders.http_loader +STORAGE=thumbor.storages.file_storage +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +RESULT_STORAGE=thumbor.result_storages.file_storage +ENGINE=thumbor.engines.pil +SECURITY_KEY="MY_SECURE_KEY" +ALLOW_UNSAFE_URL=True +ALLOW_OLD_URLS=True +FILE_LOADER_ROOT_PATH=/data/loader +HTTP_LOADER_CONNECT_TIMEOUT=5 +HTTP_LOADER_REQUEST_TIMEOUT=20 +HTTP_LOADER_FOLLOW_REDIRECTS=True +HTTP_LOADER_MAX_REDIRECTS=5 +HTTP_LOADER_FORWARD_USER_AGENT=False +HTTP_LOADER_DEFAULT_USER_AGENT="Thumbor/5.2.1" +HTTP_LOADER_PROXY_HOST=None +HTTP_LOADER_PROXY_PORT=None +HTTP_LOADER_PROXY_USERNAME=None +HTTP_LOADER_PROXY_PASSWORD=None +HTTP_LOADER_CA_CERTS=None +HTTP_LOADER_VALIDATE_CERTS=True +HTTP_LOADER_CLIENT_KEY=None +HTTP_LOADER_CLIENT_CERT=None +HTTP_LOADER_CURL_ASYNC_HTTP_CLIENT=False +STORAGE_EXPIRATION_SECONDS=2592000 +STORES_CRYPTO_KEY_FOR_EACH_IMAGE=False +FILE_STORAGE_ROOT_PATH=/data/storage +UPLOAD_MAX_SIZE=0 +UPLOAD_ENABLED=False +UPLOAD_PHOTO_STORAGE=thumbor.storages.file_storage +UPLOAD_DELETE_ALLOWED=False +UPLOAD_PUT_ALLOWED=False +UPLOAD_DEFAULT_FILENAME=image +MONGO_STORAGE_SERVER_HOST=mongo +MONGO_STORAGE_SERVER_PORT=27017 +MONGO_STORAGE_SERVER_DB=thumbor +MONGO_STORAGE_SERVER_COLLECTION=images +REDIS_STORAGE_SERVER_HOST=redis +REDIS_STORAGE_SERVER_PORT=6379 +REDIS_STORAGE_SERVER_DB=0 +REDIS_STORAGE_SERVER_PASSWORD=None +REDIS_RESULT_STORAGE_SERVER_HOST=redis +REDIS_RESULT_STORAGE_SERVER_PORT=6379 +REDIS_RESULT_STORAGE_SERVER_DB=0 +REDIS_RESULT_STORAGE_SERVER_PASSWORD=None +MEMCACHE_STORAGE_SERVERS=["localhost:11211",] +MIXED_STORAGE_FILE_STORAGE=thumbor.storages.no_storage +MIXED_STORAGE_CRYPTO_STORAGE=thumbor.storages.no_storage +MIXED_STORAGE_DETECTOR_STORAGE=thumbor.storages.no_storage +META_CALLBACK_NAME=None +DETECTORS=[] +FACE_DETECTOR_CASCADE_FILE=haarcascade_frontalface_alt.xml +OPTIMIZERS=[] +JPEGTRAN_PATH=/usr/bin/jpegtran +PROGRESSIVE_JPEG=True +FILTERS="[thumbor.filters.brightness, thumbor.filters.contrast, thumbor.filters.rgb, thumbor.filters.round_corner, thumbor.filters.quality, thumbor.filters.noise, thumbor.filters.watermark, thumbor.filters.equalize, thumbor.filters.fill, thumbor.filters.sharpen, thumbor.filters.strip_icc, thumbor.filters.frame, thumbor.filters.grayscale, thumbor.filters.rotate, thumbor.filters.format, thumbor.filters.max_bytes, thumbor.filters.convolution, thumbor.filters.blur, thumbor.filters.extract_focal, thumbor.filters.no_upscale]" +RESULT_STORAGE_EXPIRATION_SECONDS=0 +RESULT_STORAGE_FILE_STORAGE_ROOT_PATH=/data/result_storage +RESULT_STORAGE_STORES_UNSAFE=False +REDIS_QUEUE_SERVER_HOST=redis +REDIS_QUEUE_SERVER_PORT=6379 +REDIS_QUEUE_SERVER_DB="0" +REDIS_QUEUE_SERVER_PASSWORD=None +SQS_QUEUE_KEY_ID=None +SQS_QUEUE_KEY_SECRET=None +SQS_QUEUE_REGION=us-east-1 +USE_CUSTOM_ERROR_HANDLING=False +ERROR_HANDLER_MODULE=thumbor.error_handlers.sentry +ERROR_FILE_LOGGER=None +ERROR_FILE_NAME_USE_CONTEXT="False" +SENTRY_DSN_URL= +TC_AWS_REGION=eu-west-1 +TC_AWS_ENDPOINT=None +TC_AWS_STORAGE_BUCKET= +TC_AWS_STORAGE_ROOT_PATH= +TC_AWS_LOADER_BUCKET= +TC_AWS_LOADER_ROOT_PATH= +TC_AWS_RESULT_STORAGE_BUCKET= +TC_AWS_RESULT_STORAGE_ROOT_PATH= +TC_AWS_STORAGE_SSE=False +TC_AWS_STORAGE_RRS=False +TC_AWS_ENABLE_HTTP_LOADER=False +TC_AWS_ALLOWED_BUCKETS=False +TC_AWS_STORE_METADATA=False + +### SOLR ################################################## + +SOLR_VERSION=5.5 +SOLR_PORT=8983 +SOLR_DATAIMPORTHANDLER_MYSQL=false +SOLR_DATAIMPORTHANDLER_MSSQL=false + +### GITLAB ############################################### +GITLAB_POSTGRES_INIT=true +GITLAB_HOST_HTTP_PORT=8989 +GITLAB_HOST_HTTPS_PORT=9898 +GITLAB_HOST_SSH_PORT=2289 +GITLAB_DOMAIN_NAME=http://localhost +GITLAB_ROOT_PASSWORD=laradock +GITLAB_HOST_LOG_PATH=./logs/gitlab +GITLAB_POSTGRES_HOST=postgres +GITLAB_POSTGRES_USER=laradock_gitlab +GITLAB_POSTGRES_PASSWORD=laradock_gitlab +GITLAB_POSTGRES_DB=laradock_gitlab + +### GITLAB-RUNNER ############################################### +GITLAB_CI_SERVER_URL=http://localhost:8989 +GITLAB_RUNNER_REGISTRATION_TOKEN="" +GITLAB_REGISTER_NON_INTERACTIVE=true + +### JUPYTERHUB ############################################### +JUPYTERHUB_POSTGRES_INIT=true +JUPYTERHUB_POSTGRES_HOST=postgres +JUPYTERHUB_POSTGRES_USER=laradock_jupyterhub +JUPYTERHUB_POSTGRES_PASSWORD=laradock_jupyterhub +JUPYTERHUB_POSTGRES_DB=laradock_jupyterhub +JUPYTERHUB_PORT=9991 +JUPYTERHUB_OAUTH_CALLBACK_URL=http://laradock:9991/hub/oauth_callback +JUPYTERHUB_OAUTH_CLIENT_ID={GITHUB_CLIENT_ID} +JUPYTERHUB_OAUTH_CLIENT_SECRET={GITHUB_CLIENT_SECRET} +JUPYTERHUB_CUSTOM_CONFIG=./jupyterhub/jupyterhub_config.py +JUPYTERHUB_USER_DATA=/jupyterhub +JUPYTERHUB_USER_LIST=./jupyterhub/userlist +JUPYTERHUB_ENABLE_NVIDIA=false + +### IPYTHON ################################################## +LARADOCK_IPYTHON_CONTROLLER_IP=127.0.0.1 + +### NETDATA ############################################### +NETDATA_PORT=19999 + +### REDISWEBUI ######################################### +REDIS_WEBUI_USERNAME=laradock +REDIS_WEBUI_PASSWORD=laradock +REDIS_WEBUI_CONNECT_HOST=redis +REDIS_WEBUI_CONNECT_PORT=6379 +REDIS_WEBUI_PORT=9987 + +### MONGOWEBUI ############################################### +MONGO_WEBUI_PORT=3000 +MONGO_WEBUI_ROOT_URL=http://localhost +MONGO_WEBUI_MONGO_URL=mongodb://mongo:27017/ +MONGO_WEBUI_INSTALL_MONGO=false + +### METABASE ############################################### +METABASE_PORT=3030 +METABASE_DB_FILE=metabase.db +METABASE_JAVA_TIMEZONE=US/Pacific + +### IDE ############################################### +IDE_THEIA_PORT=987 +IDE_WEBIDE_PORT=984 +IDE_CODIAD_PORT=985 +IDE_ICECODER_PORT=986 + +### DOCKERREGISTRY ############################################### +DOCKER_REGISTRY_PORT=5000 + +### DOCKERWEBUI ############################################### +DOCKER_WEBUI_REGISTRY_HOST=docker-registry +DOCKER_WEBUI_REGISTRY_PORT=5000 +# if have use https proxy please set to 1 +DOCKER_REGISTRY_USE_SSL=0 +DOCKER_REGISTRY_BROWSE_ONLY=false +DOCKER_WEBUI_PORT=8754 + +### MAILU ############################################### +MAILU_VERSION=latest +MAILU_RECAPTCHA_PUBLIC_KEY="" +MAILU_RECAPTCHA_PRIVATE_KEY="" +# Main mail domain +MAILU_HTTP_PORT=6080 +MAILU_HTTPS_PORT=60443 +MAILU_DOMAIN=example.com +MAILU_INIT_ADMIN_USERNAME=laradock +MAILU_INIT_ADMIN_PASSWORD=laradock +# Hostnames for this server, separated with comas +MAILU_HOSTNAMES=mail.example.com,alternative.example.com,yetanother.example.com +# Postmaster local part (will append the main mail domain) +MAILU_POSTMASTER=admin +# Set to a randomly generated 16 bytes string +MAILU_SECRET_KEY=ChangeMeChangeMe +# Choose how secure connections will behave (value: letsencrypt, cert, notls, mail) +MAILU_TLS_FLAVOR=cert +# Authentication rate limit (per source IP address) +MAILU_AUTH_RATELIMIT="10/minute;1000/hour" +# Opt-out of statistics, replace with "True" to opt out +MAILU_DISABLE_STATISTICS=False +# Message size limit in bytes +# Default: accept messages up to 50MB +MAILU_MESSAGE_SIZE_LIMIT=50000000 +# Will relay all outgoing mails if configured +MAILU_RELAYHOST= +# Networks granted relay permissions, make sure that you include your Docker +# internal network (default to 172.17.0.0/16) +MAILU_RELAYNETS=172.16.0.0/12 +# Fetchmail delay +MAILU_FETCHMAIL_DELAY=600 +# Recipient delimiter, character used to delimiter localpart from custom address part +# e.g. localpart+custom@domain;tld +MAILU_RECIPIENT_DELIMITER=+ +# DMARC rua and ruf email +MAILU_DMARC_RUA=admin +MAILU_DMARC_RUF=admin +# Welcome email, enable and set a topic and body if you wish to send welcome +# emails to all users. +MAILU_WELCOME=True +MAILU_WELCOME_SUBJECT="Welcome to your new email account" +MAILU_WELCOME_BODY="Welcome to your new email account, if you can read this, then it is configured properly!" +# Path to the admin interface if enabled +MAILU_WEB_ADMIN=/admin +# Path to the webmail if enabled +MAILU_WEB_WEBMAIL=/webmail +# Website name +MAILU_SITENAME="Example Mail" +# Linked Website URL +MAILU_WEBSITE=http://mail.example.com +# Default password scheme used for newly created accounts and changed passwords +# (value: SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT) +MAILU_PASSWORD_SCHEME=SHA512-CRYPT +# Expose the admin interface (value: true, false) +MAILU_ADMIN=true +# Choose which webmail to run if any (values: roundcube, rainloop, none) +MAILU_WEBMAIL=rainloop +# Dav server implementation (value: radicale, none) +MAILU_WEBDAV=radicale + + +### TRAEFIK ################################################# + +TRAEFIK_HOST_HTTP_PORT=80 +TRAEFIK_HOST_HTTPS_PORT=443 +TRAEFIK_DASHBOARD_PORT=8888 +# basic authentication for traefik dashboard username: admin password:admin +TRAEFIK_DASHBOARD_USER=admin:$2y$10$lXaL3lj6raFic6rFqr2.lOBoCudAIhB6zyoqObNg290UFppiUzTTi +ACME_DOMAIN=example.org +ACME_EMAIL=email@example.org + + +### MOSQUITTO ################################################# + +MOSQUITTO_PORT=9001 + +### COUCHDB ################################################### + +COUCHDB_PORT=5984 + +### Manticore Search ########################################## + +MANTICORE_CONFIG_PATH=./manticore/config +MANTICORE_API_PORT=9312 +MANTICORE_SPHINXQL_PORT=9306 +MANTICORE_HTTP_PORT=9308 + +### pgadmin ################################################## +# use this address http://ip6-localhost:5050 +PGADMIN_PORT=5050 +PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org +PGADMIN_DEFAULT_PASSWORD=admin + +### SWAGGER EDITOR ########################################### + +SWAGGER_EDITOR_PORT=5151 + +### SWAGGER UI ############################################### + +SWAGGER_API_URL=http://generator.swagger.io/api/swagger.json +SWAGGER_UI_PORT=5555 + +### SONARQUBE ################################################ +## docker-compose up -d sonarqube +## (If you encounter a database error) +## docker-compose exec --user=root postgres +## source docker-entrypoint-initdb.d/init_sonarqube_db.sh +## (If you encounter logs error) +## docker-compose run --user=root --rm sonarqube chown sonarqube:sonarqube /opt/sonarqube/logs + +SONARQUBE_HOSTNAME=sonar.example.com +SONARQUBE_PORT=9000 +SONARQUBE_POSTGRES_INIT=true +SONARQUBE_POSTGRES_HOST=postgres +SONARQUBE_POSTGRES_DB=sonar +SONARQUBE_POSTGRES_USER=sonar +SONARQUBE_POSTGRES_PASSWORD=sonarPass + +### TOMCAT ################################################ +TOMCAT_VERSION=8.5.43 +TOMCAT_HOST_HTTP_PORT=8080 + +### CASSANDRA ################################################ + +# Cassandra Version, supported tags can be found at https://hub.docker.com/r/bitnami/cassandra/ +CASSANDRA_VERSION=latest +# Inter-node cluster communication port. Default: 7000 +CASSANDRA_TRANSPORT_PORT_NUMBER=7000 +# JMX connections port. Default: 7199 +CASSANDRA_JMX_PORT_NUMBER=7199 +# Client port. Default: 9042. +CASSANDRA_CQL_PORT_NUMBER=9042 +# Cassandra user name. Defaults: cassandra +CASSANDRA_USER=cassandra +# Password seeder will change the Cassandra default credentials at initialization. In clusters, only one node should be marked as password seeder. Default: no +CASSANDRA_PASSWORD_SEEDER=no +# Cassandra user password. Default: cassandra +CASSANDRA_PASSWORD=cassandra +# Number of tokens for the node. Default: 256. +CASSANDRA_NUM_TOKENS=256 +# Hostname used to configure Cassandra. It can be either an IP or a domain. If left empty, it will be resolved to the machine IP. +CASSANDRA_HOST= +# Cluster name to configure Cassandra.. Defaults: My Cluster +CASSANDRA_CLUSTER_NAME="My Cluster" +# : Hosts that will act as Cassandra seeds. No defaults. +CASSANDRA_SEEDS= + # Snitch name (which determines which data centers and racks nodes belong to). Default SimpleSnitch +CASSANDRA_ENDPOINT_SNITCH=SimpleSnitch + # Enable the thrift RPC endpoint. Default :true +CASSANDRA_ENABLE_RPC=true +# Datacenter name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: dc1. +CASSANDRA_DATACENTER=dc1 +# Rack name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: rack1. +CASSANDRA_RACK=rack1 + +### GEARMAN ################################################## + +# Gearman version to use. See available tags at https://hub.docker.com/r/artefactual/gearmand +GEARMAN_VERSION=latest +# Port to use (Default: 4730) +GEARMAN_PORT=4730 +# Logging Level (Default: INFO) +GEARMAN_VERBOSE=INFO +# Persistent queue type to use (Default: builtin) +GEARMAN_QUEUE_TYPE=builtin +# Number of I/O threads to use (Default: 4) +GEARMAN_THREADS=4 +# Number of backlog connections for listen (Default: 32) +GEARMAN_BACKLOG=32 +# Number of file descriptors to allow for the process (Default is max allowed for user) +GEARMAN_FILE_DESCRIPTORS= +# Number of attempts to run the job before the job server removes it. (Default: no limit = 0) +GEARMAN_JOB_RETRIES=0 +# Assign work in round-robin order per worker connection (Default: 0) +GEARMAN_ROUND_ROBIN=0 +# Number of workers to wakeup for each job received (Default: 0) +GEARMAN_WORKER_WAKEUP=0 +# Enable keepalive on sockets (Default: 0) +GEARMAN_KEEPALIVE=0 +# The duration between two keepalive transmissions in idle condition (Default: 30) +GEARMAN_KEEPALIVE_IDLE=30 +# The duration between two successive keepalive retransmissions, if acknowledgement to the previous keepalive transmission is not received (Default: 10) +GEARMAN_KEEPALIVE_INTERVAL=10 +# The number of retransmissions to be carried out before declaring that remote end is not available (Default: 5) +GEARMAN_KEEPALIVE_COUNT=5 +# Mysql server host (Default: localhost) +GEARMAN_MYSQL_HOST=localhost +# Mysql server port (Default: 3306) +GEARMAN_MYSQL_PORT=3306 +# Mysql server user (Default: root) +GEARMAN_MYSQL_USER=root +# Mysql password +GEARMAN_MYSQL_PASSWORD= +# Path to file with mysql password(Docker secrets) +GEARMAN_MYSQL_PASSWORD_FILE= +# Database to use by Gearman (Default: Gearmand) +GEARMAN_MYSQL_DB=Gearmand +# Table to use by Gearman (Default: gearman_queue) +GEARMAN_MYSQL_TABLE=gearman_queue + +### ELK Stack ################################################## +ELK_VERSION=7.9.1 + +### Tarantool ################################################## +TARANTOOL_PORT=3301 +TARANTOOL_ADMIN_PORT=8002 + +### NATS ################################################## +NATS_CLIENT_PORT=4222 +NATS_MONITORING_PORT=6222 +NATS_ROUTE_PORT=8222 From 306a8a6050bc842c8cef62f90a44e6ac5e314466 Mon Sep 17 00:00:00 2001 From: Nisar Ahmed Date: Tue, 28 Sep 2021 12:57:04 +1000 Subject: [PATCH 24/97] Update newrelic PHP Agent version to support PHP 8.x --- php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index d6638a9e..eae6e0c3 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1126,7 +1126,7 @@ ARG NEW_RELIC_KEY=${NEW_RELIC_KEY} ARG NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME} RUN if [ ${NEW_RELIC} = true ]; then \ - curl -L http://download.newrelic.com/php_agent/archive/9.9.0.260/newrelic-php5-9.9.0.260-linux.tar.gz | tar -C /tmp -zx && \ + curl -L http://download.newrelic.com/php_agent/release/newrelic-php5-9.18.1.303-linux.tar.gz | tar -C /tmp -zx && \ export NR_INSTALL_USE_CP_NOT_LN=1 && \ export NR_INSTALL_SILENT=1 && \ /tmp/newrelic-php5-*/newrelic-install install && \ From 42abd8b39098bb5fe95febf08a8d07c527ad703e Mon Sep 17 00:00:00 2001 From: dhtmdgkr123 Date: Mon, 4 Oct 2021 17:59:11 +0900 Subject: [PATCH 25/97] fix docker-compose up error FIx docker-compose up error --- weaver/conf/sample.env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weaver/conf/sample.env b/weaver/conf/sample.env index ccb48de5..eb6d8c3b 100644 --- a/weaver/conf/sample.env +++ b/weaver/conf/sample.env @@ -1,8 +1,8 @@ GIN_MODE=debug # Weaver -WEAVER_AUTH_KEY=arachnys-weaver -WEAVER_ATHENA_CMD=athenapdf -S +WEAVER_AUTH_KEY="arachnys-weaver" +WEAVER_ATHENA_CMD="athenapdf -S" WEAVER_MAX_WORKERS=10 WEAVER_MAX_CONVERSION_QUEUE=50 WEAVER_WORKER_TIMEOUT=90 @@ -16,4 +16,4 @@ WEAVER_CONVERSION_FALLBACK=false # Monitoring # STATSD_ADDRESS= # STATSD_PREFIX= -# SENTRY_DSN= \ No newline at end of file +# SENTRY_DSN= From c393bf226b45a69902fe2510f27f57faf2957294 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 21:57:09 +0800 Subject: [PATCH 26/97] workspace: add ionCube Loader enabled check --- workspace/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 49c89b96..1d525c41 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -659,6 +659,7 @@ RUN if [ ${INSTALL_IONCUBE} = true ]; then \ && echo "zend_extension=ioncube_loader.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/ioncube.ini \ && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/ioncube.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/0ioncube.ini \ && rm -rf /tmp/ioncube* \ + && php -m | grep -oiE '^ionCube Loader$' \ ;fi \ ;fi From ee9955025829adda6ab8a6a23006488cd041bd46 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 22:04:06 +0800 Subject: [PATCH 27/97] CI: skip ENCHANT --- .github/workflows/main-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 8fe4e51c..97a324cb 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -43,6 +43,7 @@ jobs: sed -i -- 's/V8JS=true/V8JS=false/g' .env sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env sed -i -- 's/SSDB=true/SSDB=false/g' .env + sed -i -- 's/ENCHANT=true/ENCHANT=false/g' .env docker-compose build ${{ matrix.service }} docker-compose up -d --no-deps -- ${{ matrix.service }} docker-compose exec -T -- ${{ matrix.service }} php -m From ee80578fc6267d53cdcf27c7ccccce94222cb6fb Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 22:49:24 +0800 Subject: [PATCH 28/97] php7.0 mongodb fixed version number --- php-fpm/Dockerfile | 16 +++++++++++----- workspace/Dockerfile | 24 +++++++++++++++--------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 46503669..44b296d2 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -358,12 +358,18 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl install mongo && \ - docker-php-ext-enable mongo \ - ;else \ - pecl install mongodb && \ + docker-php-ext-enable mongo; \ + php -m | grep -oiE '^mongo$'; \ + else \ + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + pecl install mongodb-1.9.2; \ + else \ + pecl install mongodb; \ + fi; \ docker-php-ext-enable mongodb \ - ;fi \ -;fi + php -m | grep -oiE '^mongodb$'; \ + fi; \ +fi ########################################################################### # Xhprof: diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 1d525c41..092e7115 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -452,15 +452,21 @@ ARG INSTALL_MONGO=false RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install mongo && \ - echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini && \ - ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini \ - ;else \ - pecl install mongodb && \ - echo "extension=mongodb.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini && \ - ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongodb.ini \ - ;fi \ -;fi + pecl install mongo; \ + echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini; \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini; \ + php -m | grep -oiE '^mongo$'; \ + else \ + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + pecl install mongodb-1.9.2; \ + else \ + pecl install mongodb; \ + fi; \ + echo "extension=mongodb.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini; \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongodb.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongodb.ini; \ + php -m | grep -oiE '^mongodb$'; \ + fi; \ +fi ########################################################################### # AMQP: From 4439c16acd22586b7700477dffead81ada7161d0 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 22:58:28 +0800 Subject: [PATCH 29/97] CI: skip install PG_CLIENT --- .github/workflows/main-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 97a324cb..6721cc70 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -44,6 +44,7 @@ jobs: sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env sed -i -- 's/SSDB=true/SSDB=false/g' .env sed -i -- 's/ENCHANT=true/ENCHANT=false/g' .env + sed -i -- 's/PG_CLIENT=true/PG_CLIENT=false/g' .env docker-compose build ${{ matrix.service }} docker-compose up -d --no-deps -- ${{ matrix.service }} docker-compose exec -T -- ${{ matrix.service }} php -m From 67b7d186071b83761e010c60fda0c1de0d70285e Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 23:32:57 +0800 Subject: [PATCH 30/97] fix typo --- php-fpm/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 44b296d2..1f99e726 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -357,7 +357,7 @@ ARG INSTALL_MONGO=false RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install mongo && \ + pecl install mongo; \ docker-php-ext-enable mongo; \ php -m | grep -oiE '^mongo$'; \ else \ @@ -366,7 +366,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ else \ pecl install mongodb; \ fi; \ - docker-php-ext-enable mongodb \ + docker-php-ext-enable mongodb; \ php -m | grep -oiE '^mongodb$'; \ fi; \ fi From 50300f5bb14591866afbd0cad84722e9c2c4d22c Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Thu, 7 Oct 2021 23:39:34 +0800 Subject: [PATCH 31/97] php-worker mongodb --- php-worker/Dockerfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 8dabe290..0f6335d7 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -141,13 +141,19 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \ # Install MongoDB drivers: ARG INSTALL_MONGO=false RUN if [ ${INSTALL_MONGO} = true ]; then \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install mongo; \ - docker-php-ext-enable mongo; \ - else \ - pecl install mongodb; \ - docker-php-ext-enable mongodb; \ - fi; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + pecl install mongo; \ + docker-php-ext-enable mongo; \ + php -m | grep -oiE '^mongo$'; \ + else \ + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + pecl install mongodb-1.9.2; \ + else \ + pecl install mongodb; \ + fi; \ + docker-php-ext-enable mongodb; \ + php -m | grep -oiE '^mongodb$'; \ + fi; \ fi ########################################################################### From 986deb692530619af53556bf4313f92e3bdd7811 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Fri, 8 Oct 2021 08:42:30 +0800 Subject: [PATCH 32/97] CI: skip install MSSQL --- .github/workflows/main-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 6721cc70..dee2275e 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -43,8 +43,7 @@ jobs: sed -i -- 's/V8JS=true/V8JS=false/g' .env sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env sed -i -- 's/SSDB=true/SSDB=false/g' .env - sed -i -- 's/ENCHANT=true/ENCHANT=false/g' .env - sed -i -- 's/PG_CLIENT=true/PG_CLIENT=false/g' .env + sed -i -- 's/MSSQL=true/MSSQL=false/g' .env docker-compose build ${{ matrix.service }} docker-compose up -d --no-deps -- ${{ matrix.service }} docker-compose exec -T -- ${{ matrix.service }} php -m From 45a7f9ad6fc7f557a2ccba650e0c03ecc7750d3d Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Fri, 8 Oct 2021 08:51:33 +0800 Subject: [PATCH 33/97] CI: skip ENCHANT, PG_CLIENT --- .github/workflows/main-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index dee2275e..3fa12814 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -43,6 +43,8 @@ jobs: sed -i -- 's/V8JS=true/V8JS=false/g' .env sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env sed -i -- 's/SSDB=true/SSDB=false/g' .env + sed -i -- 's/ENCHANT=true/ENCHANT=false/g' .env + sed -i -- 's/PG_CLIENT=true/PG_CLIENT=false/g' .env sed -i -- 's/MSSQL=true/MSSQL=false/g' .env docker-compose build ${{ matrix.service }} docker-compose up -d --no-deps -- ${{ matrix.service }} From 6c50719b75b3030c1c696ae00143facd60ddd60b Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sat, 9 Oct 2021 01:18:32 +0800 Subject: [PATCH 34/97] fix php5.6 php-worker swoole --- php-worker/Dockerfile | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 0f6335d7..d386f239 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -25,6 +25,7 @@ RUN apk --update add wget \ build-base \ libmcrypt-dev \ libxml2-dev \ + linux-headers \ pcre-dev \ zlib-dev \ autoconf \ @@ -350,20 +351,21 @@ RUN if [ ${INSTALL_REDIS} = true ]; then \ ARG INSTALL_SWOOLE=false -RUN if [ ${INSTALL_SWOOLE} = true ]; then \ - # Install Php Swoole Extension - if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ - echo '' | pecl -q install swoole-2.0.10; \ - elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ - echo '' | pecl -q install swoole-4.3.5; \ - elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ - echo '' | pecl -q install swoole-4.5.11; \ - else \ - echo '' | pecl -q install swoole; \ - fi; \ - docker-php-ext-enable swoole \ - && php -m | grep -q 'swoole' \ - ;fi +RUN set -eux; \ + if [ ${INSTALL_SWOOLE} = true ]; then \ + # Install Php Swoole Extension + if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ + pecl install swoole-2.0.10; \ + elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + pecl install swoole-4.3.5; \ + elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ + pecl install swoole-4.5.11; \ + else \ + pecl install swoole; \ + fi; \ + docker-php-ext-enable swoole; \ + php -m | grep -oiE '^swoole$'; \ + fi ########################################################################### # Taint EXTENSION From 9a451684f2949c5cf3c5b21e9d07f164c6e6caa9 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sat, 9 Oct 2021 10:44:21 +0800 Subject: [PATCH 35/97] up php default version to 7.4 --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 78fb7f1a..248bcb19 100644 --- a/.env.example +++ b/.env.example @@ -39,7 +39,7 @@ COMPOSE_PROJECT_NAME=laradock # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). # Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 -PHP_VERSION=7.3 +PHP_VERSION=7.4 ### Phalcon Version ########################################### From d5e990caba08a62d54cedbf834348539cd6fc621 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sat, 9 Oct 2021 10:45:57 +0800 Subject: [PATCH 36/97] php-fpm: add ionCube Loader enabled check --- php-fpm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 1f99e726..06fa37cd 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -636,6 +636,7 @@ RUN if [ ${INSTALL_IONCUBE} = true ]; then \ && mv /tmp/ioncube/ioncube_loader_lin_${LARADOCK_PHP_VERSION}.so $(php -r "echo ini_get('extension_dir');")/ioncube_loader.so \ && printf "zend_extension=ioncube_loader.so\n" > $PHP_INI_DIR/conf.d/0ioncube.ini \ && rm -rf /tmp/ioncube* \ + && php -m | grep -oiE '^ionCube Loader$' \ ;fi \ ;fi From 3a7631c673252175ff64cd8bea863f26ab15c567 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sat, 9 Oct 2021 15:48:30 +0800 Subject: [PATCH 37/97] CI build enable install ioncube --- .github/workflows/main-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 3fa12814..f50d1a0e 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -39,7 +39,6 @@ jobs: sed -i -- 's/RDKAFKA=true/RDKAFKA=false/g' .env sed -i -- 's/MAILPARSE=true/MAILPARSE=false/g' .env sed -i -- 's/OCI8=true/OCI8=false/g' .env - sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env sed -i -- 's/V8JS=true/V8JS=false/g' .env sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env sed -i -- 's/SSDB=true/SSDB=false/g' .env From 145864fab2fc2b170add5448feb5c4969d337bf2 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 12 Oct 2021 12:40:28 +0200 Subject: [PATCH 38/97] fix crontab --- workspace/crontab/laradock | 2 -- 1 file changed, 2 deletions(-) diff --git a/workspace/crontab/laradock b/workspace/crontab/laradock index 0ebfe935..d21529bf 100644 --- a/workspace/crontab/laradock +++ b/workspace/crontab/laradock @@ -1,3 +1 @@ * * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1 - -* * * * * cd /var/www/artisan && php artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file From 4183251b7579a5680faccb4b2bbbf3e5f4f0c616 Mon Sep 17 00:00:00 2001 From: Artem Davletshin <49448966+davlet42@users.noreply.github.com> Date: Sat, 16 Oct 2021 00:03:02 +0300 Subject: [PATCH 39/97] Add RabbitMQ Web STOMP --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index 248bcb19..168ae649 100644 --- a/.env.example +++ b/.env.example @@ -453,6 +453,7 @@ SQS_MANAGEMENT_HTTP_HOST_PORT=9325 RABBITMQ_NODE_HOST_PORT=5672 RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672 RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671 +RABBITMQ_WEB_STOMP_HOST_PORT=15674 ### MERCURE ############################################## From 1d7477b68648ba7e43b00f78eea3586a122eb343 Mon Sep 17 00:00:00 2001 From: Artem Davletshin <49448966+davlet42@users.noreply.github.com> Date: Sat, 16 Oct 2021 00:04:28 +0300 Subject: [PATCH 40/97] Add RabbitMQ Web STOMP --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index a9fe7c90..24035d6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -809,6 +809,7 @@ services: - "${RABBITMQ_NODE_HOST_PORT}:5672" - "${RABBITMQ_MANAGEMENT_HTTP_HOST_PORT}:15672" - "${RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT}:15671" + - "${RABBITMQ_WEB_STOMP_HOST_PORT}:15674" privileged: true hostname: laradock-rabbitmq volumes: From 780d0bb764017554f95404d679c7edbf13261cef Mon Sep 17 00:00:00 2001 From: VVVi <2038584+VVVi@users.noreply.github.com> Date: Sun, 17 Oct 2021 11:45:27 +0200 Subject: [PATCH 41/97] Xdebug compatibilyti improvement Please take a look at https://xdebug.org/docs/compat , for now with PHP 8, 7.3, 7.4 should be used xdebug 3.1. --- php-fpm/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 06fa37cd..80bf946c 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -219,8 +219,9 @@ ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \ # Install the xdebug extension - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install xdebug-3.0.0; \ + # https://xdebug.org/docs/compat + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ + pecl install xdebug-3.1.1; \ else \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl install xdebug-2.5.5; \ From 986ea489698137ce905691e474082c9c4e3214f7 Mon Sep 17 00:00:00 2001 From: DowneyL Date: Thu, 28 Oct 2021 19:39:07 +0800 Subject: [PATCH 42/97] update jenkins version --- jenkins/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index df66c423..99d71acd 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -36,11 +36,11 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION ${JENKINS_VERSION:-2.89.2} +ENV JENKINS_VERSION ${JENKINS_VERSION:-2.303.2} # jenkins.war checksum, download will be validated using it -# 2.89.2 -ARG JENKINS_SHA=014f669f32bc6e925e926e260503670b32662f006799b133a031a70a794c8a14 +# 2.303.2 +ARG JENKINS_SHA=c4b8532e25a33001a3d8883d3cd87a664953ace239b486839b683065817d29cf # Can be used to customize where jenkins.war get downloaded from From 292783b76e1cf2456e8ca4bcf2aca296a0059457 Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Fri, 12 Nov 2021 15:22:34 +0100 Subject: [PATCH 43/97] display more logos --- DOCUMENTATION/content/introduction/index.md | 40 +++++++++++++++++++++ README.md | 40 +++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md index 0c726d49..689ab442 100644 --- a/DOCUMENTATION/content/introduction/index.md +++ b/DOCUMENTATION/content/introduction/index.md @@ -442,6 +442,13 @@ Sponsoring is an act of giving in a different fashion. 🌱 + + + + + + +

### Bronze Sponsors @@ -481,6 +488,39 @@ Sponsoring is an act of giving in a different fashion. 🌱 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff --git a/README.md b/README.md index fbe581eb..125db955 100644 --- a/README.md +++ b/README.md @@ -249,6 +249,13 @@ Sponsoring is an act of giving in a different fashion. 🌱 + + + + + + +

### Bronze Sponsors @@ -288,6 +295,39 @@ Sponsoring is an act of giving in a different fashion. 🌱 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

From 2b04ed5e0e3a1aaed76862f1a688c21e42843bc7 Mon Sep 17 00:00:00 2001 From: vaiil Date: Sun, 14 Nov 2021 16:19:09 +0300 Subject: [PATCH 44/97] Migrate to official DockerHub repository From readme of [phpmyadmin/docker](https://github.com/phpmyadmin/docker) > Note that since phpMyAdmin has been accepted in to the official DockerHub repository, you can use either that or this older phpMyAdmin repository for your Docker installation. This is maintained as a courtesy to users who have not migrated. P.S. version from `phpmyadmin` supports `caching_sha2_password`, that makes me happy :) --- phpmyadmin/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile index 75812d9b..367e3134 100644 --- a/phpmyadmin/Dockerfile +++ b/phpmyadmin/Dockerfile @@ -1,4 +1,4 @@ -FROM phpmyadmin/phpmyadmin +FROM phpmyadmin LABEL maintainer="Bo-Yi Wu " From e8137d0c758ff743bca7c09a44c9513f2ce26b7f Mon Sep 17 00:00:00 2001 From: Johnathan Douglas de Souza Santos Date: Tue, 14 Dec 2021 10:39:20 -0300 Subject: [PATCH 45/97] Extension for Oracle Database, php 8.0 Error: pecl/oci8 requires PHP (version >= 8.1.0), installed version is 8.0.13 --------- https://pecl.php.net/package/oci8 The OCI8 extension lets you access Oracle Database. Use 'pecl install oci8' to install for PHP 8.1. Use 'pecl install oci8-3.0.1' to install for PHP 8.0. Use 'pecl install oci8-2.2.0' to install for PHP 7. Use 'pecl install oci8-2.0.12' to install for PHP 5.2 - PHP 5.6. Use 'pecl install oci8-1.4.10' to install for PHP 4.3.9 - PHP 5.1. --- workspace/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 092e7115..28eb2622 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -914,6 +914,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.12; \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \ + elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-3.0.1; \ else \ echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \ fi \ From 4debd4f9653789745847d0e27320f753ad0f0b22 Mon Sep 17 00:00:00 2001 From: Erik Niebla Date: Tue, 14 Dec 2021 09:53:23 -0500 Subject: [PATCH 46/97] Add PHP 8.1 ini file --- php-fpm/php8.1.ini | 1948 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1948 insertions(+) create mode 100644 php-fpm/php8.1.ini diff --git a/php-fpm/php8.1.ini b/php-fpm/php8.1.ini new file mode 100644 index 00000000..604059bf --- /dev/null +++ b/php-fpm/php8.1.ini @@ -0,0 +1,1948 @@ +[PHP] + +;;;;;;;;;;;;;;;;;;; +; About php.ini ; +;;;;;;;;;;;;;;;;;;; +; PHP's initialization file, generally called php.ini, is responsible for +; configuring many of the aspects of PHP's behavior. + +; PHP attempts to find and load this configuration from a number of locations. +; The following is a summary of its search order: +; 1. SAPI module specific location. +; 2. The PHPRC environment variable. (As of PHP 5.2.0) +; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) +; 4. Current working directory (except CLI) +; 5. The web server's directory (for SAPI modules), or directory of PHP +; (otherwise in Windows) +; 6. The directory from the --with-config-file-path compile time option, or the +; Windows directory (usually C:\windows) +; See the PHP docs for more specific information. +; https://php.net/configuration.file + +; The syntax of the file is extremely simple. Whitespace and lines +; beginning with a semicolon are silently ignored (as you probably guessed). +; Section headers (e.g. [Foo]) are also silently ignored, even though +; they might mean something in the future. + +; Directives following the section heading [PATH=/www/mysite] only +; apply to PHP files in the /www/mysite directory. Directives +; following the section heading [HOST=www.example.com] only apply to +; PHP files served from www.example.com. Directives set in these +; special sections cannot be overridden by user-defined INI files or +; at runtime. Currently, [PATH=] and [HOST=] sections only work under +; CGI/FastCGI. +; https://php.net/ini.sections + +; Directives are specified using the following syntax: +; directive = value +; Directive names are *case sensitive* - foo=bar is different from FOO=bar. +; Directives are variables used to configure PHP or PHP extensions. +; There is no name validation. If PHP can't find an expected +; directive because it is not set or is mistyped, a default value will be used. + +; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one +; of the INI constants (On, Off, True, False, Yes, No and None) or an expression +; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a +; previously set variable or directive (e.g. ${foo}) + +; Expressions in the INI file are limited to bitwise operators and parentheses: +; | bitwise OR +; ^ bitwise XOR +; & bitwise AND +; ~ bitwise NOT +; ! boolean NOT + +; Boolean flags can be turned on using the values 1, On, True or Yes. +; They can be turned off using the values 0, Off, False or No. + +; An empty string can be denoted by simply not writing anything after the equal +; sign, or by using the None keyword: + +; foo = ; sets foo to an empty string +; foo = None ; sets foo to an empty string +; foo = "None" ; sets foo to the string 'None' + +; If you use constants in your value, and these constants belong to a +; dynamically loaded extension (either a PHP extension or a Zend extension), +; you may only use these constants *after* the line that loads the extension. + +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; PHP comes packaged with two INI files. One that is recommended to be used +; in production environments and one that is recommended to be used in +; development environments. + +; php.ini-production contains settings which hold security, performance and +; best practices at its core. But please be aware, these settings may break +; compatibility with older or less security conscience applications. We +; recommending using the production ini in production and testing environments. + +; php.ini-development is very similar to its production variant, except it is +; much more verbose when it comes to errors. We recommend using the +; development version only in development environments, as errors shown to +; application users can inadvertently leak otherwise secure information. + +; This is the php.ini-development INI file. + +;;;;;;;;;;;;;;;;;;; +; Quick Reference ; +;;;;;;;;;;;;;;;;;;; + +; The following are all the settings which are different in either the production +; or development versions of the INIs with respect to PHP's default behavior. +; Please see the actual settings later in the document for more details as to why +; we recommend these changes in PHP's behavior. + +; display_errors +; Default Value: On +; Development Value: On +; Production Value: Off + +; display_startup_errors +; Default Value: On +; Development Value: On +; Production Value: Off + +; error_reporting +; Default Value: E_ALL +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT + +; log_errors +; Default Value: Off +; Development Value: On +; Production Value: On + +; max_input_time +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) + +; output_buffering +; Default Value: Off +; Development Value: 4096 +; Production Value: 4096 + +; register_argc_argv +; Default Value: On +; Development Value: Off +; Production Value: Off + +; request_order +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" + +; session.gc_divisor +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 + +; session.sid_bits_per_character +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 + +; short_open_tag +; Default Value: On +; Development Value: Off +; Production Value: Off + +; variables_order +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS" + +; zend.exception_ignore_args +; Default Value: Off +; Development Value: Off +; Production Value: On + +; zend.exception_string_param_max_len +; Default Value: 15 +; Development Value: 15 +; Production Value: 0 + +;;;;;;;;;;;;;;;;;;;; +; php.ini Options ; +;;;;;;;;;;;;;;;;;;;; +; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini" +;user_ini.filename = ".user.ini" + +; To disable this feature set this option to an empty value +;user_ini.filename = + +; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) +;user_ini.cache_ttl = 300 + +;;;;;;;;;;;;;;;;;;;; +; Language Options ; +;;;;;;;;;;;;;;;;;;;; + +; Enable the PHP scripting language engine under Apache. +; https://php.net/engine +engine = On + +; This directive determines whether or not PHP will recognize code between +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the would work. +; https://php.net/syntax-highlighting +;highlight.string = #DD0000 +;highlight.comment = #FF9900 +;highlight.keyword = #007700 +;highlight.default = #0000BB +;highlight.html = #000000 + +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long requests, which may end up +; being interrupted by the user or a browser timing out. PHP's default behavior +; is to disable this feature. +; https://php.net/ignore-user-abort +;ignore_user_abort = On + +; Determines the size of the realpath cache to be used by PHP. This value should +; be increased on systems where PHP opens many files to reflect the quantity of +; the file operations performed. +; Note: if open_basedir is set, the cache is disabled +; https://php.net/realpath-cache-size +;realpath_cache_size = 4096k + +; Duration of time, in seconds for which to cache realpath information for a given +; file or directory. For systems with rarely changing files, consider increasing this +; value. +; https://php.net/realpath-cache-ttl +;realpath_cache_ttl = 120 + +; Enables or disables the circular reference collector. +; https://php.net/zend.enable-gc +zend.enable_gc = On + +; If enabled, scripts may be written in encodings that are incompatible with +; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such +; encodings. To use this feature, mbstring extension must be enabled. +;zend.multibyte = Off + +; Allows to set the default encoding for the scripts. This value will be used +; unless "declare(encoding=...)" directive appears at the top of the script. +; Only affects if zend.multibyte is set. +;zend.script_encoding = + +; Allows to include or exclude arguments from stack traces generated for exceptions. +; In production, it is recommended to turn this setting on to prohibit the output +; of sensitive information in stack traces +; Default Value: Off +; Development Value: Off +; Production Value: On +zend.exception_ignore_args = Off + +; Allows setting the maximum string length in an argument of a stringified stack trace +; to a value between 0 and 1000000. +; This has no effect when zend.exception_ignore_args is enabled. +; Default Value: 15 +; Development Value: 15 +; Production Value: 0 +zend.exception_string_param_max_len = 15 + +;;;;;;;;;;;;;;;;; +; Miscellaneous ; +;;;;;;;;;;;;;;;;; + +; Decides whether PHP may expose the fact that it is installed on the server +; (e.g. by adding its signature to the Web server header). It is no security +; threat in any way, but it makes it possible to determine whether you use PHP +; on your server or not. +; https://php.net/expose-php +expose_php = On + +;;;;;;;;;;;;;;;;;;; +; Resource Limits ; +;;;;;;;;;;;;;;;;;;; + +; Maximum execution time of each script, in seconds +; https://php.net/max-execution-time +; Note: This directive is hardcoded to 0 for the CLI SAPI +max_execution_time = 30 + +; Maximum amount of time each script may spend parsing request data. It's a good +; idea to limit this time on productions servers in order to eliminate unexpectedly +; long running scripts. +; Note: This directive is hardcoded to -1 for the CLI SAPI +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) +; https://php.net/max-input-time +max_input_time = 60 + +; Maximum input variable nesting level +; https://php.net/max-input-nesting-level +;max_input_nesting_level = 64 + +; How many GET/POST/COOKIE input variables may be accepted +;max_input_vars = 1000 + +; Maximum amount of memory a script may consume +; https://php.net/memory-limit +memory_limit = 128M + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Error handling and logging ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; This directive informs PHP of which errors, warnings and notices you would like +; it to take action for. The recommended way of setting values for this +; directive is through the use of the error level constants and bitwise +; operators. The error level constants are below here for convenience as well as +; some common settings and their meanings. +; By default, PHP is set to take action on all errors, notices and warnings EXCEPT +; those related to E_NOTICE and E_STRICT, which together cover best practices and +; recommended coding standards in PHP. For performance reasons, this is the +; recommend error reporting setting. Your production server shouldn't be wasting +; resources complaining about best practices and coding standards. That's what +; development servers and development settings are for. +; Note: The php.ini-development file has this setting as E_ALL. This +; means it pretty much reports everything which is exactly what you want during +; development and early testing. +; +; Error Level Constants: +; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ERROR - fatal run-time errors +; E_RECOVERABLE_ERROR - almost fatal run-time errors +; E_WARNING - run-time warnings (non-fatal errors) +; E_PARSE - compile-time parse errors +; E_NOTICE - run-time notices (these are warnings which often result +; from a bug in your code, but it's possible that it was +; intentional (e.g., using an uninitialized variable and +; relying on the fact it is automatically initialized to an +; empty string) +; E_STRICT - run-time notices, enable to have PHP suggest changes +; to your code which will ensure the best interoperability +; and forward compatibility of your code +; E_CORE_ERROR - fatal errors that occur during PHP's initial startup +; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's +; initial startup +; E_COMPILE_ERROR - fatal compile-time errors +; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message +; E_DEPRECATED - warn about code that will not work in future versions +; of PHP +; E_USER_DEPRECATED - user-generated deprecation warnings +; +; Common Values: +; E_ALL (Show all errors, warnings and notices including coding standards.) +; E_ALL & ~E_NOTICE (Show all errors, except for notices) +; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.) +; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) +; Default Value: E_ALL +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT +; https://php.net/error-reporting +error_reporting = E_ALL + +; This directive controls whether or not and where PHP will output errors, +; notices and warnings too. Error output is very useful during development, but +; it could be very dangerous in production environments. Depending on the code +; which is triggering the error, sensitive information could potentially leak +; out of your application such as database usernames and passwords or worse. +; For production environments, we recommend logging errors rather than +; sending them to STDOUT. +; Possible Values: +; Off = Do not display any errors +; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) +; On or stdout = Display errors to STDOUT +; Default Value: On +; Development Value: On +; Production Value: Off +; https://php.net/display-errors +display_errors = On + +; The display of errors which occur during PHP's startup sequence are handled +; separately from display_errors. We strongly recommend you set this to 'off' +; for production servers to avoid leaking configuration details. +; Default Value: On +; Development Value: On +; Production Value: Off +; https://php.net/display-startup-errors +display_startup_errors = On + +; Besides displaying errors, PHP can also log errors to locations such as a +; server-specific log, STDERR, or a location specified by the error_log +; directive found below. While errors should not be displayed on productions +; servers they should still be monitored and logging is a great way to do that. +; Default Value: Off +; Development Value: On +; Production Value: On +; https://php.net/log-errors +log_errors = On + +; Do not log repeated messages. Repeated errors must occur in same file on same +; line unless ignore_repeated_source is set true. +; https://php.net/ignore-repeated-errors +ignore_repeated_errors = Off + +; Ignore source of message when ignoring repeated messages. When this setting +; is On you will not log errors with repeated messages from different files or +; source lines. +; https://php.net/ignore-repeated-source +ignore_repeated_source = Off + +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This is only effective in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +; https://php.net/report-memleaks +report_memleaks = On + +; This setting is off by default. +;report_zend_debug = 0 + +; Turn off normal error reporting and emit XML-RPC error XML +; https://php.net/xmlrpc-errors +;xmlrpc_errors = 0 + +; An XML-RPC faultCode +;xmlrpc_error_number = 0 + +; When PHP displays or logs an error, it has the capability of formatting the +; error message as HTML for easier reading. This directive controls whether +; the error message is formatted as HTML or not. +; Note: This directive is hardcoded to Off for the CLI SAPI +; https://php.net/html-errors +;html_errors = On + +; If html_errors is set to On *and* docref_root is not empty, then PHP +; produces clickable error messages that direct to a page describing the error +; or function causing the error in detail. +; You can download a copy of the PHP manual from https://php.net/docs +; and change docref_root to the base URL of your local copy including the +; leading '/'. You must also specify the file extension being used including +; the dot. PHP's default behavior is to leave these settings empty, in which +; case no links to documentation are generated. +; Note: Never use this feature for production boxes. +; https://php.net/docref-root +; Examples +;docref_root = "/phpmanual/" + +; https://php.net/docref-ext +;docref_ext = .html + +; String to output before an error message. PHP's default behavior is to leave +; this setting blank. +; https://php.net/error-prepend-string +; Example: +;error_prepend_string = "" + +; String to output after an error message. PHP's default behavior is to leave +; this setting blank. +; https://php.net/error-append-string +; Example: +;error_append_string = "" + +; Log errors to specified file. PHP's default behavior is to leave this value +; empty. +; https://php.net/error-log +; Example: +;error_log = php_errors.log +; Log errors to syslog (Event Log on Windows). +;error_log = syslog + +; The syslog ident is a string which is prepended to every message logged +; to syslog. Only used when error_log is set to syslog. +;syslog.ident = php + +; The syslog facility is used to specify what type of program is logging +; the message. Only used when error_log is set to syslog. +;syslog.facility = user + +; Set this to disable filtering control characters (the default). +; Some loggers only accept NVT-ASCII, others accept anything that's not +; control characters. If your logger accepts everything, then no filtering +; is needed at all. +; Allowed values are: +; ascii (all printable ASCII characters and NL) +; no-ctrl (all characters except control characters) +; all (all characters) +; raw (like "all", but messages are not split at newlines) +; https://php.net/syslog.filter +;syslog.filter = ascii + +;windows.show_crt_warning +; Default value: 0 +; Development value: 0 +; Production value: 0 + +;;;;;;;;;;;;;;;;; +; Data Handling ; +;;;;;;;;;;;;;;;;; + +; The separator used in PHP generated URLs to separate arguments. +; PHP's default setting is "&". +; https://php.net/arg-separator.output +; Example: +;arg_separator.output = "&" + +; List of separator(s) used by PHP to parse input URLs into variables. +; PHP's default setting is "&". +; NOTE: Every character in this directive is considered as separator! +; https://php.net/arg-separator.input +; Example: +;arg_separator.input = ";&" + +; This directive determines which super global arrays are registered when PHP +; starts up. G,P,C,E & S are abbreviations for the following respective super +; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty +; paid for the registration of these arrays and because ENV is not as commonly +; used as the others, ENV is not recommended on productions servers. You +; can still get access to the environment variables through getenv() should you +; need to. +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS"; +; https://php.net/variables-order +variables_order = "GPCS" + +; This directive determines which super global data (G,P & C) should be +; registered into the super global array REQUEST. If so, it also determines +; the order in which that data is registered. The values for this directive +; are specified in the same manner as the variables_order directive, +; EXCEPT one. Leaving this value empty will cause PHP to use the value set +; in the variables_order directive. It does not mean it will leave the super +; globals array REQUEST empty. +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" +; https://php.net/request-order +request_order = "GP" + +; This directive determines whether PHP registers $argv & $argc each time it +; runs. $argv contains an array of all the arguments passed to PHP when a script +; is invoked. $argc contains an integer representing the number of arguments +; that were passed when the script was invoked. These arrays are extremely +; useful when running scripts from the command line. When this directive is +; enabled, registering these variables consumes CPU cycles and memory each time +; a script is executed. For performance reasons, this feature should be disabled +; on production servers. +; Note: This directive is hardcoded to On for the CLI SAPI +; Default Value: On +; Development Value: Off +; Production Value: Off +; https://php.net/register-argc-argv +register_argc_argv = Off + +; When enabled, the ENV, REQUEST and SERVER variables are created when they're +; first used (Just In Time) instead of when the script starts. If these +; variables are not used within a script, having this directive on will result +; in a performance gain. The PHP directive register_argc_argv must be disabled +; for this directive to have any effect. +; https://php.net/auto-globals-jit +auto_globals_jit = On + +; Whether PHP will read the POST data. +; This option is enabled by default. +; Most likely, you won't want to disable this option globally. It causes $_POST +; and $_FILES to always be empty; the only way you will be able to read the +; POST data will be through the php://input stream wrapper. This can be useful +; to proxy requests or to process the POST data in a memory efficient fashion. +; https://php.net/enable-post-data-reading +;enable_post_data_reading = Off + +; Maximum size of POST data that PHP will accept. +; Its value may be 0 to disable the limit. It is ignored if POST data reading +; is disabled through enable_post_data_reading. +; https://php.net/post-max-size +post_max_size = 8M + +; Automatically add files before PHP document. +; https://php.net/auto-prepend-file +auto_prepend_file = + +; Automatically add files after PHP document. +; https://php.net/auto-append-file +auto_append_file = + +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. +; +; PHP's built-in default media type is set to text/html. +; https://php.net/default-mimetype +default_mimetype = "text/html" + +; PHP's default character set is set to UTF-8. +; https://php.net/default-charset +default_charset = "UTF-8" + +; PHP internal character encoding is set to empty. +; If empty, default_charset is used. +; https://php.net/internal-encoding +;internal_encoding = + +; PHP input character encoding is set to empty. +; If empty, default_charset is used. +; https://php.net/input-encoding +;input_encoding = + +; PHP output character encoding is set to empty. +; If empty, default_charset is used. +; See also output_buffer. +; https://php.net/output-encoding +;output_encoding = + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Paths and Directories ; +;;;;;;;;;;;;;;;;;;;;;;;;; + +; UNIX: "/path1:/path2" +;include_path = ".:/php/includes" +; +; Windows: "\path1;\path2" +;include_path = ".;c:\php\includes" +; +; PHP's default setting for include_path is ".;/path/to/php/pear" +; https://php.net/include-path + +; The root of the PHP pages, used only if nonempty. +; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root +; if you are running php as a CGI under any web server (other than IIS) +; see documentation for security issues. The alternate is to use the +; cgi.force_redirect configuration below +; https://php.net/doc-root +doc_root = + +; The directory under which PHP opens the script using /~username used only +; if nonempty. +; https://php.net/user-dir +user_dir = + +; Directory in which the loadable extensions (modules) reside. +; https://php.net/extension-dir +;extension_dir = "./" +; On windows: +;extension_dir = "ext" + +; Directory where the temporary files should be placed. +; Defaults to the system default (see sys_get_temp_dir) +;sys_temp_dir = "/tmp" + +; Whether or not to enable the dl() function. The dl() function does NOT work +; properly in multithreaded servers, such as IIS or Zeus, and is automatically +; disabled on them. +; https://php.net/enable-dl +enable_dl = Off + +; cgi.force_redirect is necessary to provide security running PHP as a CGI under +; most web servers. Left undefined, PHP turns this on by default. You can +; turn it off here AT YOUR OWN RISK +; **You CAN safely turn this off for IIS, in fact, you MUST.** +; https://php.net/cgi.force-redirect +;cgi.force_redirect = 1 + +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. PHP's default behavior is to disable this feature. +;cgi.nph = 1 + +; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape +; (iPlanet) web servers, you MAY need to set an environment variable name that PHP +; will look for to know it is OK to continue execution. Setting this variable MAY +; cause security issues, KNOW WHAT YOU ARE DOING FIRST. +; https://php.net/cgi.redirect-status-env +;cgi.redirect_status_env = + +; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's +; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok +; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting +; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting +; of zero causes PHP to behave as before. Default is 1. You should fix your scripts +; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. +; https://php.net/cgi.fix-pathinfo +;cgi.fix_pathinfo=1 + +; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside +; of the web tree and people will not be able to circumvent .htaccess security. +;cgi.discard_path=1 + +; FastCGI under IIS supports the ability to impersonate +; security tokens of the calling client. This allows IIS to define the +; security context that the request runs under. mod_fastcgi under Apache +; does not currently support this feature (03/17/2002) +; Set to 1 if running under IIS. Default is zero. +; https://php.net/fastcgi.impersonate +;fastcgi.impersonate = 1 + +; Disable logging through FastCGI connection. PHP's default behavior is to enable +; this feature. +;fastcgi.logging = 0 + +; cgi.rfc2616_headers configuration option tells PHP what type of headers to +; use when sending HTTP response code. If set to 0, PHP sends Status: header that +; is supported by Apache. When this option is set to 1, PHP will send +; RFC2616 compliant header. +; Default is zero. +; https://php.net/cgi.rfc2616-headers +;cgi.rfc2616_headers = 0 + +; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #! +; (shebang) at the top of the running script. This line might be needed if the +; script support running both as stand-alone script and via PHP CGI<. PHP in CGI +; mode skips this line and ignores its content if this directive is turned on. +; https://php.net/cgi.check-shebang-line +;cgi.check_shebang_line=1 + +;;;;;;;;;;;;;;;; +; File Uploads ; +;;;;;;;;;;;;;;;; + +; Whether to allow HTTP file uploads. +; https://php.net/file-uploads +file_uploads = On + +; Temporary directory for HTTP uploaded files (will use system default if not +; specified). +; https://php.net/upload-tmp-dir +;upload_tmp_dir = + +; Maximum allowed size for uploaded files. +; https://php.net/upload-max-filesize +upload_max_filesize = 2M + +; Maximum number of files that can be uploaded via a single request +max_file_uploads = 20 + +;;;;;;;;;;;;;;;;;; +; Fopen wrappers ; +;;;;;;;;;;;;;;;;;; + +; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +; https://php.net/allow-url-fopen +allow_url_fopen = On + +; Whether to allow include/require to open URLs (like https:// or ftp://) as files. +; https://php.net/allow-url-include +allow_url_include = Off + +; Define the anonymous ftp password (your email address). PHP's default setting +; for this is empty. +; https://php.net/from +;from="john@doe.com" + +; Define the User-Agent string. PHP's default setting for this is empty. +; https://php.net/user-agent +;user_agent="PHP" + +; Default timeout for socket based streams (seconds) +; https://php.net/default-socket-timeout +default_socket_timeout = 60 + +; If your scripts have to deal with files from Macintosh systems, +; or you are running on a Mac and need to deal with files from +; unix or win32 systems, setting this flag will cause PHP to +; automatically detect the EOL character in those files so that +; fgets() and file() will work regardless of the source of the file. +; https://php.net/auto-detect-line-endings +;auto_detect_line_endings = Off + +;;;;;;;;;;;;;;;;;;;;;; +; Dynamic Extensions ; +;;;;;;;;;;;;;;;;;;;;;; + +; If you wish to have an extension loaded automatically, use the following +; syntax: +; +; extension=modulename +; +; For example: +; +; extension=mysqli +; +; When the extension library to load is not located in the default extension +; directory, You may specify an absolute path to the library file: +; +; extension=/path/to/extension/mysqli.so +; +; Note : The syntax used in previous PHP versions ('extension=.so' and +; 'extension='php_.dll') is supported for legacy reasons and may be +; deprecated in a future PHP major version. So, when it is possible, please +; move to the new ('extension=) syntax. +; +; Notes for Windows environments : +; +; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) +; extension folders as well as the separate PECL DLL download (PHP 5+). +; Be sure to appropriately set the extension_dir directive. +; +;extension=bz2 +;extension=curl +;extension=ffi +;extension=ftp +;extension=fileinfo +;extension=gd +;extension=gettext +;extension=gmp +;extension=intl +;extension=imap +;extension=ldap +;extension=mbstring +;extension=exif ; Must be after mbstring as it depends on it +;extension=mysqli +;extension=oci8_12c ; Use with Oracle Database 12c Instant Client +;extension=oci8_19 ; Use with Oracle Database 19 Instant Client +;extension=odbc +;extension=openssl +;extension=pdo_firebird +;extension=pdo_mysql +;extension=pdo_oci +;extension=pdo_odbc +;extension=pdo_pgsql +;extension=pdo_sqlite +;extension=pgsql +;extension=shmop + +; The MIBS data available in the PHP distribution must be installed. +; See https://www.php.net/manual/en/snmp.installation.php +;extension=snmp + +;extension=soap +;extension=sockets +;extension=sodium +;extension=sqlite3 +;extension=tidy +;extension=xsl + +;zend_extension=opcache + +;;;;;;;;;;;;;;;;;;; +; Module Settings ; +;;;;;;;;;;;;;;;;;;; + +[CLI Server] +; Whether the CLI web server uses ANSI color coding in its terminal output. +cli_server.color = On + +[Date] +; Defines the default timezone used by the date functions +; https://php.net/date.timezone +;date.timezone = + +; https://php.net/date.default-latitude +;date.default_latitude = 31.7667 + +; https://php.net/date.default-longitude +;date.default_longitude = 35.2333 + +; https://php.net/date.sunrise-zenith +;date.sunrise_zenith = 90.833333 + +; https://php.net/date.sunset-zenith +;date.sunset_zenith = 90.833333 + +[filter] +; https://php.net/filter.default +;filter.default = unsafe_raw + +; https://php.net/filter.default-flags +;filter.default_flags = + +[iconv] +; Use of this INI entry is deprecated, use global input_encoding instead. +; If empty, default_charset or input_encoding or iconv.input_encoding is used. +; The precedence is: default_charset < input_encoding < iconv.input_encoding +;iconv.input_encoding = + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;iconv.internal_encoding = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; If empty, default_charset or output_encoding or iconv.output_encoding is used. +; The precedence is: default_charset < output_encoding < iconv.output_encoding +; To use an output encoding conversion, iconv's output handler must be set +; otherwise output encoding conversion cannot be performed. +;iconv.output_encoding = + +[imap] +; rsh/ssh logins are disabled by default. Use this INI entry if you want to +; enable them. Note that the IMAP library does not filter mailbox names before +; passing them to rsh/ssh command, thus passing untrusted data to this function +; with rsh/ssh enabled is insecure. +;imap.enable_insecure_rsh=0 + +[intl] +;intl.default_locale = +; This directive allows you to produce PHP errors when some error +; happens within intl functions. The value is the level of the error produced. +; Default is 0, which does not produce any errors. +;intl.error_level = E_WARNING +;intl.use_exceptions = 0 + +[sqlite3] +; Directory pointing to SQLite3 extensions +; https://php.net/sqlite3.extension-dir +;sqlite3.extension_dir = + +; SQLite defensive mode flag (only available from SQLite 3.26+) +; When the defensive flag is enabled, language features that allow ordinary +; SQL to deliberately corrupt the database file are disabled. This forbids +; writing directly to the schema, shadow tables (eg. FTS data tables), or +; the sqlite_dbpage virtual table. +; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html +; (for older SQLite versions, this flag has no use) +;sqlite3.defensive = 1 + +[Pcre] +; PCRE library backtracking limit. +; https://php.net/pcre.backtrack-limit +;pcre.backtrack_limit=100000 + +; PCRE library recursion limit. +; Please note that if you set this value to a high number you may consume all +; the available process stack and eventually crash PHP (due to reaching the +; stack size limit imposed by the Operating System). +; https://php.net/pcre.recursion-limit +;pcre.recursion_limit=100000 + +; Enables or disables JIT compilation of patterns. This requires the PCRE +; library to be compiled with JIT support. +;pcre.jit=1 + +[Pdo] +; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off" +; https://php.net/pdo-odbc.connection-pooling +;pdo_odbc.connection_pooling=strict + +[Pdo_mysql] +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +pdo_mysql.default_socket= + +[Phar] +; https://php.net/phar.readonly +;phar.readonly = On + +; https://php.net/phar.require-hash +;phar.require_hash = On + +;phar.cache_list = + +[mail function] +; For Win32 only. +; https://php.net/smtp +SMTP = localhost +; https://php.net/smtp-port +smtp_port = 25 + +; For Win32 only. +; https://php.net/sendmail-from +;sendmail_from = me@example.com + +; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). +; https://php.net/sendmail-path +;sendmail_path = + +; Force the addition of the specified parameters to be passed as extra parameters +; to the sendmail binary. These parameters will always replace the value of +; the 5th parameter to mail(). +;mail.force_extra_parameters = + +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename +mail.add_x_header = Off + +; The path to a log file that will log all mail() calls. Log entries include +; the full path of the script, line number, To address and headers. +;mail.log = +; Log mail to syslog (Event Log on Windows). +;mail.log = syslog + +[ODBC] +; https://php.net/odbc.default-db +;odbc.default_db = Not yet implemented + +; https://php.net/odbc.default-user +;odbc.default_user = Not yet implemented + +; https://php.net/odbc.default-pw +;odbc.default_pw = Not yet implemented + +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + +; Allow or prevent persistent links. +; https://php.net/odbc.allow-persistent +odbc.allow_persistent = On + +; Check that a connection is still valid before reuse. +; https://php.net/odbc.check-persistent +odbc.check_persistent = On + +; Maximum number of persistent links. -1 means no limit. +; https://php.net/odbc.max-persistent +odbc.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +; https://php.net/odbc.max-links +odbc.max_links = -1 + +; Handling of LONG fields. Returns number of bytes to variables. 0 means +; passthru. +; https://php.net/odbc.defaultlrl +odbc.defaultlrl = 4096 + +; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. +; See the documentation on odbc_binmode and odbc_longreadlen for an explanation +; of odbc.defaultlrl and odbc.defaultbinmode +; https://php.net/odbc.defaultbinmode +odbc.defaultbinmode = 1 + +[MySQLi] + +; Maximum number of persistent links. -1 means no limit. +; https://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; https://php.net/mysqli.allow_local_infile +;mysqli.allow_local_infile = On + +; It allows the user to specify a folder where files that can be sent via LOAD DATA +; LOCAL can exist. It is ignored if mysqli.allow_local_infile is enabled. +;mysqli.local_infile_directory = + +; Allow or prevent persistent links. +; https://php.net/mysqli.allow-persistent +mysqli.allow_persistent = On + +; Maximum number of links. -1 means no limit. +; https://php.net/mysqli.max-links +mysqli.max_links = -1 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +; https://php.net/mysqli.default-port +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; https://php.net/mysqli.default-socket +mysqli.default_socket = + +; Default host for mysqli_connect() (doesn't apply in safe mode). +; https://php.net/mysqli.default-host +mysqli.default_host = + +; Default user for mysqli_connect() (doesn't apply in safe mode). +; https://php.net/mysqli.default-user +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +; https://php.net/mysqli.default-pw +mysqli.default_pw = + +; Allow or prevent reconnect +mysqli.reconnect = Off + +; If this option is enabled, closing a persistent connection will rollback +; any pending transactions of this connection, before it is put back +; into the persistent connection pool. +;mysqli.rollback_on_cached_plink = Off + +[mysqlnd] +; Enable / Disable collection of general statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +mysqlnd.collect_memory_statistics = On + +; Records communication from all extensions using mysqlnd to the specified log +; file. +; https://php.net/mysqlnd.debug +;mysqlnd.debug = + +; Defines which queries will be logged. +;mysqlnd.log_mask = 0 + +; Default size of the mysqlnd memory pool, which is used by result sets. +;mysqlnd.mempool_default_size = 16000 + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +;mysqlnd.net_read_buffer_size = 32768 + +; Timeout for network requests in seconds. +;mysqlnd.net_read_timeout = 31536000 + +; SHA-256 Authentication Plugin related. File with the MySQL server public RSA +; key. +;mysqlnd.sha256_server_public_key = + +[OCI8] + +; Connection: Enables privileged connections using external +; credentials (OCI_SYSOPER, OCI_SYSDBA) +; https://php.net/oci8.privileged-connect +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +; https://php.net/oci8.max-persistent +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +; https://php.net/oci8.persistent-timeout +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +; https://php.net/oci8.ping-interval +;oci8.ping_interval = 60 + +; Connection: Set this to a user chosen connection class to be used +; for all pooled server requests with Oracle 11g Database Resident +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = + +; High Availability: Using On lets PHP receive Fast Application +; Notification (FAN) events generated when a database node fails. The +; database must also be configured to post FAN events. +;oci8.events = Off + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +; https://php.net/oci8.statement-cache-size +;oci8.statement_cache_size = 20 + +; Tuning: Enables statement prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +; https://php.net/oci8.default-prefetch +;oci8.default_prefetch = 100 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +; https://php.net/oci8.old-oci-close-semantics +;oci8.old_oci_close_semantics = Off + +[PostgreSQL] +; Allow or prevent persistent links. +; https://php.net/pgsql.allow-persistent +pgsql.allow_persistent = On + +; Detect broken persistent links always with pg_pconnect(). +; Auto reset feature requires a little overheads. +; https://php.net/pgsql.auto-reset-persistent +pgsql.auto_reset_persistent = Off + +; Maximum number of persistent links. -1 means no limit. +; https://php.net/pgsql.max-persistent +pgsql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +; https://php.net/pgsql.max-links +pgsql.max_links = -1 + +; Ignore PostgreSQL backends Notice message or not. +; Notice message logging require a little overheads. +; https://php.net/pgsql.ignore-notice +pgsql.ignore_notice = 0 + +; Log PostgreSQL backends Notice message or not. +; Unless pgsql.ignore_notice=0, module cannot log notice message. +; https://php.net/pgsql.log-notice +pgsql.log_notice = 0 + +[bcmath] +; Number of decimal digits for all bcmath functions. +; https://php.net/bcmath.scale +bcmath.scale = 0 + +[browscap] +; https://php.net/browscap +;browscap = extra/browscap.ini + +[Session] +; Handler used to store/retrieve data. +; https://php.net/session.save-handler +session.save_handler = files + +; Argument passed to save_handler. In the case of files, this is the path +; where data files are stored. Note: Windows users have to change this +; variable in order to use PHP's session functions. +; +; The path can be defined as: +; +; session.save_path = "N;/path" +; +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is use subdirectories N-levels deep, and +; store the session data in those directories. This is useful if +; your OS has problems with many files in one directory, and is +; a more efficient layout for servers that handle many sessions. +; +; NOTE 1: PHP will not create this directory structure automatically. +; You can use the script in the ext/session dir for that purpose. +; NOTE 2: See the section on garbage collection below if you choose to +; use subdirectories for session storage +; +; The file storage module creates files using mode 600 by default. +; You can change that by using +; +; session.save_path = "N;MODE;/path" +; +; where MODE is the octal representation of the mode. Note that this +; does not overwrite the process's umask. +; https://php.net/session.save-path +;session.save_path = "/tmp" + +; Whether to use strict session mode. +; Strict session mode does not accept an uninitialized session ID, and +; regenerates the session ID if the browser sends an uninitialized session ID. +; Strict mode protects applications from session fixation via a session adoption +; vulnerability. It is disabled by default for maximum compatibility, but +; enabling it is encouraged. +; https://wiki.php.net/rfc/strict_sessions +session.use_strict_mode = 0 + +; Whether to use cookies. +; https://php.net/session.use-cookies +session.use_cookies = 1 + +; https://php.net/session.cookie-secure +;session.cookie_secure = + +; This option forces PHP to fetch and use a cookie for storing and maintaining +; the session id. We encourage this operation as it's very helpful in combating +; session hijacking when not specifying and managing your own session id. It is +; not the be-all and end-all of session hijacking defense, but it's a good start. +; https://php.net/session.use-only-cookies +session.use_only_cookies = 1 + +; Name of the session (used as cookie name). +; https://php.net/session.name +session.name = PHPSESSID + +; Initialize session on request startup. +; https://php.net/session.auto-start +session.auto_start = 0 + +; Lifetime in seconds of cookie or, if 0, until browser is restarted. +; https://php.net/session.cookie-lifetime +session.cookie_lifetime = 0 + +; The path for which the cookie is valid. +; https://php.net/session.cookie-path +session.cookie_path = / + +; The domain for which the cookie is valid. +; https://php.net/session.cookie-domain +session.cookie_domain = + +; Whether or not to add the httpOnly flag to the cookie, which makes it +; inaccessible to browser scripting languages such as JavaScript. +; https://php.net/session.cookie-httponly +session.cookie_httponly = + +; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF) +; Current valid values are "Strict", "Lax" or "None". When using "None", +; make sure to include the quotes, as `none` is interpreted like `false` in ini files. +; https://tools.ietf.org/html/draft-west-first-party-cookies-07 +session.cookie_samesite = + +; Handler used to serialize data. php is the standard serializer of PHP. +; https://php.net/session.serialize-handler +session.serialize_handler = php + +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts on each request. +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; https://php.net/session.gc-probability +session.gc_probability = 1 + +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts on each request. +; For high volume production servers, using a value of 1000 is a more efficient approach. +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 +; https://php.net/session.gc-divisor +session.gc_divisor = 1000 + +; After this number of seconds, stored data will be seen as 'garbage' and +; cleaned up by the garbage collection process. +; https://php.net/session.gc-maxlifetime +session.gc_maxlifetime = 1440 + +; NOTE: If you are using the subdirectory option for storing session files +; (see session.save_path above), then garbage collection does *not* +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. +; For example, the following script is the equivalent of setting +; session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; find /path/to/sessions -cmin +24 -type f | xargs rm + +; Check HTTP Referer to invalidate externally stored URLs containing ids. +; HTTP_REFERER has to contain this substring for the session to be +; considered as valid. +; https://php.net/session.referer-check +session.referer_check = + +; Set to {nocache,private,public,} to determine HTTP caching aspects +; or leave this empty to avoid sending anti-caching headers. +; https://php.net/session.cache-limiter +session.cache_limiter = nocache + +; Document expires after n minutes. +; https://php.net/session.cache-expire +session.cache_expire = 180 + +; trans sid support is disabled by default. +; Use of trans sid may risk your users' security. +; Use this option with caution. +; - User may send URL contains active session ID +; to other person via. email/irc/etc. +; - URL that contains active session ID may be stored +; in publicly accessible computer. +; - User may access your site with the same session ID +; always using URL stored in browser's history or bookmarks. +; https://php.net/session.use-trans-sid +session.use_trans_sid = 0 + +; Set session ID character length. This value could be between 22 to 256. +; Shorter length than default is supported only for compatibility reason. +; Users should use 32 or more chars. +; https://php.net/session.sid-length +; Default Value: 32 +; Development Value: 26 +; Production Value: 26 +session.sid_length = 26 + +; The URL rewriter will look for URLs in a defined set of HTML tags. +;
is special; if you include them here, the rewriter will +; add a hidden field with the info which is otherwise appended +; to URLs. tag's action attribute URL will not be modified +; unless it is specified. +; Note that all valid entries require a "=", even if no value follows. +; Default Value: "a=href,area=href,frame=src,form=" +; Development Value: "a=href,area=href,frame=src,form=" +; Production Value: "a=href,area=href,frame=src,form=" +; https://php.net/url-rewriter.tags +session.trans_sid_tags = "a=href,area=href,frame=src,form=" + +; URL rewriter does not rewrite absolute URLs by default. +; To enable rewrites for absolute paths, target hosts must be specified +; at RUNTIME. i.e. use ini_set() +; tags is special. PHP will check action attribute's URL regardless +; of session.trans_sid_tags setting. +; If no host is defined, HTTP_HOST will be used for allowed host. +; Example value: php.net,www.php.net,wiki.php.net +; Use "," for multiple hosts. No spaces are allowed. +; Default Value: "" +; Development Value: "" +; Production Value: "" +;session.trans_sid_hosts="" + +; Define how many bits are stored in each character when converting +; the binary hash data to something readable. +; Possible values: +; 4 (4 bits: 0-9, a-f) +; 5 (5 bits: 0-9, a-v) +; 6 (6 bits: 0-9, a-z, A-Z, "-", ",") +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 +; https://php.net/session.hash-bits-per-character +session.sid_bits_per_character = 5 + +; Enable upload progress tracking in $_SESSION +; Default Value: On +; Development Value: On +; Production Value: On +; https://php.net/session.upload-progress.enabled +;session.upload_progress.enabled = On + +; Cleanup the progress information as soon as all POST data has been read +; (i.e. upload completed). +; Default Value: On +; Development Value: On +; Production Value: On +; https://php.net/session.upload-progress.cleanup +;session.upload_progress.cleanup = On + +; A prefix used for the upload progress key in $_SESSION +; Default Value: "upload_progress_" +; Development Value: "upload_progress_" +; Production Value: "upload_progress_" +; https://php.net/session.upload-progress.prefix +;session.upload_progress.prefix = "upload_progress_" + +; The index name (concatenated with the prefix) in $_SESSION +; containing the upload progress information +; Default Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Development Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Production Value: "PHP_SESSION_UPLOAD_PROGRESS" +; https://php.net/session.upload-progress.name +;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS" + +; How frequently the upload progress should be updated. +; Given either in percentages (per-file), or in bytes +; Default Value: "1%" +; Development Value: "1%" +; Production Value: "1%" +; https://php.net/session.upload-progress.freq +;session.upload_progress.freq = "1%" + +; The minimum delay between updates, in seconds +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; https://php.net/session.upload-progress.min-freq +;session.upload_progress.min_freq = "1" + +; Only write session data when session data is changed. Enabled by default. +; https://php.net/session.lazy-write +;session.lazy_write = On + +[Assertion] +; Switch whether to compile assertions at all (to have no overhead at run-time) +; -1: Do not compile at all +; 0: Jump over assertion at run-time +; 1: Execute assertions +; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1) +; Default Value: 1 +; Development Value: 1 +; Production Value: -1 +; https://php.net/zend.assertions +zend.assertions = 1 + +; Assert(expr); active by default. +; https://php.net/assert.active +;assert.active = On + +; Throw an AssertionError on failed assertions +; https://php.net/assert.exception +;assert.exception = On + +; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active) +; https://php.net/assert.warning +;assert.warning = On + +; Don't bail out by default. +; https://php.net/assert.bail +;assert.bail = Off + +; User-function to be called if an assertion fails. +; https://php.net/assert.callback +;assert.callback = 0 + +[COM] +; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs +; https://php.net/com.typelib-file +;com.typelib_file = + +; allow Distributed-COM calls +; https://php.net/com.allow-dcom +;com.allow_dcom = true + +; autoregister constants of a component's typelib on com_load() +; https://php.net/com.autoregister-typelib +;com.autoregister_typelib = true + +; register constants casesensitive +; https://php.net/com.autoregister-casesensitive +;com.autoregister_casesensitive = false + +; show warnings on duplicate constant registrations +; https://php.net/com.autoregister-verbose +;com.autoregister_verbose = true + +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + +; The version of the .NET framework to use. The value of the setting are the first three parts +; of the framework's version number, separated by dots, and prefixed with "v", e.g. "v4.0.30319". +;com.dotnet_version= + +[mbstring] +; language for internal character representation. +; This affects mb_send_mail() and mbstring.detect_order. +; https://php.net/mbstring.language +;mbstring.language = Japanese + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; internal/script encoding. +; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;mbstring.internal_encoding = + +; Use of this INI entry is deprecated, use global input_encoding instead. +; http input encoding. +; mbstring.encoding_translation = On is needed to use this setting. +; If empty, default_charset or input_encoding or mbstring.input is used. +; The precedence is: default_charset < input_encoding < mbstring.http_input +; https://php.net/mbstring.http-input +;mbstring.http_input = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; http output encoding. +; mb_output_handler must be registered as output buffer to function. +; If empty, default_charset or output_encoding or mbstring.http_output is used. +; The precedence is: default_charset < output_encoding < mbstring.http_output +; To use an output encoding conversion, mbstring's output handler must be set +; otherwise output encoding conversion cannot be performed. +; https://php.net/mbstring.http-output +;mbstring.http_output = + +; enable automatic encoding translation according to +; mbstring.internal_encoding setting. Input chars are +; converted to internal encoding by setting this to On. +; Note: Do _not_ use automatic encoding translation for +; portable libs/applications. +; https://php.net/mbstring.encoding-translation +;mbstring.encoding_translation = Off + +; automatic encoding detection order. +; "auto" detect order is changed according to mbstring.language +; https://php.net/mbstring.detect-order +;mbstring.detect_order = auto + +; substitute_character used when character cannot be converted +; one from another +; https://php.net/mbstring.substitute-character +;mbstring.substitute_character = none + +; Enable strict encoding detection. +;mbstring.strict_detection = Off + +; This directive specifies the regex pattern of content types for which mb_output_handler() +; is activated. +; Default: mbstring.http_output_conv_mimetypes=^(text/|application/xhtml\+xml) +;mbstring.http_output_conv_mimetypes= + +; This directive specifies maximum stack depth for mbstring regular expressions. It is similar +; to the pcre.recursion_limit for PCRE. +;mbstring.regex_stack_limit=100000 + +; This directive specifies maximum retry count for mbstring regular expressions. It is similar +; to the pcre.backtrack_limit for PCRE. +;mbstring.regex_retry_limit=1000000 + +[gd] +; Tell the jpeg decode to ignore warnings and try to create +; a gd image. The warning will then be displayed as notices +; disabled by default +; https://php.net/gd.jpeg-ignore-warning +;gd.jpeg_ignore_warning = 1 + +[exif] +; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. +; With mbstring support this will automatically be converted into the encoding +; given by corresponding encode setting. When empty mbstring.internal_encoding +; is used. For the decode settings you can distinguish between motorola and +; intel byte order. A decode setting cannot be empty. +; https://php.net/exif.encode-unicode +;exif.encode_unicode = ISO-8859-15 + +; https://php.net/exif.decode-unicode-motorola +;exif.decode_unicode_motorola = UCS-2BE + +; https://php.net/exif.decode-unicode-intel +;exif.decode_unicode_intel = UCS-2LE + +; https://php.net/exif.encode-jis +;exif.encode_jis = + +; https://php.net/exif.decode-jis-motorola +;exif.decode_jis_motorola = JIS + +; https://php.net/exif.decode-jis-intel +;exif.decode_jis_intel = JIS + +[Tidy] +; The path to a default tidy configuration file to use when using tidy +; https://php.net/tidy.default-config +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +; https://php.net/tidy.clean-output +tidy.clean_output = Off + +[soap] +; Enables or disables WSDL caching feature. +; https://php.net/soap.wsdl-cache-enabled +soap.wsdl_cache_enabled=1 + +; Sets the directory name where SOAP extension will put cache files. +; https://php.net/soap.wsdl-cache-dir +soap.wsdl_cache_dir="/tmp" + +; (time to live) Sets the number of second while cached file will be used +; instead of original one. +; https://php.net/soap.wsdl-cache-ttl +soap.wsdl_cache_ttl=86400 + +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + +[sysvshm] +; A default size of the shared memory segment +;sysvshm.init_mem = 10000 + +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + +[dba] +;dba.default_handler= + +[opcache] +; Determines if Zend OPCache is enabled +;opcache.enable=1 + +; Determines if Zend OPCache is enabled for the CLI version of PHP +;opcache.enable_cli=0 + +; The OPcache shared memory storage size. +;opcache.memory_consumption=128 + +; The amount of memory for interned strings in Mbytes. +;opcache.interned_strings_buffer=8 + +; The maximum number of keys (scripts) in the OPcache hash table. +; Only numbers between 200 and 1000000 are allowed. +;opcache.max_accelerated_files=10000 + +; The maximum percentage of "wasted" memory until a restart is scheduled. +;opcache.max_wasted_percentage=5 + +; When this directive is enabled, the OPcache appends the current working +; directory to the script key, thus eliminating possible collisions between +; files with the same name (basename). Disabling the directive improves +; performance, but may break existing applications. +;opcache.use_cwd=1 + +; When disabled, you must reset the OPcache manually or restart the +; webserver for changes to the filesystem to take effect. +;opcache.validate_timestamps=1 + +; How often (in seconds) to check file timestamps for changes to the shared +; memory storage allocation. ("1" means validate once per second, but only +; once per request. "0" means always validate) +;opcache.revalidate_freq=2 + +; Enables or disables file search in include_path optimization +;opcache.revalidate_path=0 + +; If disabled, all PHPDoc comments are dropped from the code to reduce the +; size of the optimized code. +;opcache.save_comments=1 + +; If enabled, compilation warnings (including notices and deprecations) will +; be recorded and replayed each time a file is included. Otherwise, compilation +; warnings will only be emitted when the file is first cached. +;opcache.record_warnings=0 + +; Allow file existence override (file_exists, etc.) performance feature. +;opcache.enable_file_override=0 + +; A bitmask, where each bit enables or disables the appropriate OPcache +; passes +;opcache.optimization_level=0x7FFFBFFF + +;opcache.dups_fix=0 + +; The location of the OPcache blacklist file (wildcards allowed). +; Each OPcache blacklist file is a text file that holds the names of files +; that should not be accelerated. The file format is to add each filename +; to a new line. The filename may be a full path or just a file prefix +; (i.e., /var/www/x blacklists all the files and directories in /var/www +; that start with 'x'). Line starting with a ; are ignored (comments). +;opcache.blacklist_filename= + +; Allows exclusion of large files from being cached. By default all files +; are cached. +;opcache.max_file_size=0 + +; Check the cache checksum each N requests. +; The default value of "0" means that the checks are disabled. +;opcache.consistency_checks=0 + +; How long to wait (in seconds) for a scheduled restart to begin if the cache +; is not being accessed. +;opcache.force_restart_timeout=180 + +; OPcache error_log file name. Empty string assumes "stderr". +;opcache.error_log= + +; All OPcache errors go to the Web server log. +; By default, only fatal errors (level 0) or errors (level 1) are logged. +; You can also enable warnings (level 2), info messages (level 3) or +; debug messages (level 4). +;opcache.log_verbosity_level=1 + +; Preferred Shared Memory back-end. Leave empty and let the system decide. +;opcache.preferred_memory_model= + +; Protect the shared memory from unexpected writing during script execution. +; Useful for internal debugging only. +;opcache.protect_memory=0 + +; Allows calling OPcache API functions only from PHP scripts which path is +; started from specified string. The default "" means no restriction +;opcache.restrict_api= + +; Mapping base of shared memory segments (for Windows only). All the PHP +; processes have to map shared memory into the same address space. This +; directive allows to manually fix the "Unable to reattach to base address" +; errors. +;opcache.mmap_base= + +; Facilitates multiple OPcache instances per user (for Windows only). All PHP +; processes with the same cache ID and user share an OPcache instance. +;opcache.cache_id= + +; Enables and sets the second level cache directory. +; It should improve performance when SHM memory is full, at server restart or +; SHM reset. The default "" disables file based caching. +;opcache.file_cache= + +; Enables or disables opcode caching in shared memory. +;opcache.file_cache_only=0 + +; Enables or disables checksum validation when script loaded from file cache. +;opcache.file_cache_consistency_checks=1 + +; Implies opcache.file_cache_only=1 for a certain process that failed to +; reattach to the shared memory (for Windows only). Explicitly enabled file +; cache is required. +;opcache.file_cache_fallback=1 + +; Enables or disables copying of PHP code (text segment) into HUGE PAGES. +; This should improve performance, but requires appropriate OS configuration. +;opcache.huge_code_pages=0 + +; Validate cached file permissions. +;opcache.validate_permission=0 + +; Prevent name collisions in chroot'ed environment. +;opcache.validate_root=0 + +; If specified, it produces opcode dumps for debugging different stages of +; optimizations. +;opcache.opt_debug_level=0 + +; Specifies a PHP script that is going to be compiled and executed at server +; start-up. +; https://php.net/opcache.preload +;opcache.preload= + +; Preloading code as root is not allowed for security reasons. This directive +; facilitates to let the preloading to be run as another user. +; https://php.net/opcache.preload_user +;opcache.preload_user= + +; Prevents caching files that are less than this number of seconds old. It +; protects from caching of incompletely updated files. In case all file updates +; on your site are atomic, you may increase performance by setting it to "0". +;opcache.file_update_protection=2 + +; Absolute path used to store shared lockfiles (for *nix only). +;opcache.lockfile_path=/tmp + +[curl] +; A default value for the CURLOPT_CAINFO option. This is required to be an +; absolute path. +;curl.cainfo = + +[openssl] +; The location of a Certificate Authority (CA) file on the local filesystem +; to use when verifying the identity of SSL/TLS peers. Most users should +; not specify a value for this directive as PHP will attempt to use the +; OS-managed cert stores in its absence. If specified, this value may still +; be overridden on a per-stream basis via the "cafile" SSL stream context +; option. +;openssl.cafile= + +; If openssl.cafile is not specified or if the CA file is not found, the +; directory pointed to by openssl.capath is searched for a suitable +; certificate. This value must be a correctly hashed certificate directory. +; Most users should not specify a value for this directive as PHP will +; attempt to use the OS-managed cert stores in its absence. If specified, +; this value may still be overridden on a per-stream basis via the "capath" +; SSL stream context option. +;openssl.capath= + +[ffi] +; FFI API restriction. Possible values: +; "preload" - enabled in CLI scripts and preloaded files (default) +; "false" - always disabled +; "true" - always enabled +;ffi.enable=preload + +; List of headers files to preload, wildcard patterns allowed. +;ffi.preload= From 17062bd9d8eda983d1226188deb4520e42f766a3 Mon Sep 17 00:00:00 2001 From: Wuweiming <1052701694@qq.com> Date: Thu, 16 Dec 2021 11:12:21 +0800 Subject: [PATCH 47/97] add xlswriter extension --- .env.example | 3 +++ docker-compose.yml | 3 +++ php-fpm/Dockerfile | 17 +++++++++++++++++ php-worker/Dockerfile | 18 ++++++++++++++++++ workspace/Dockerfile | 17 +++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/.env.example b/.env.example index 168ae649..d7eee296 100644 --- a/.env.example +++ b/.env.example @@ -145,6 +145,7 @@ WORKSPACE_INSTALL_OCI8=false WORKSPACE_INSTALL_V8JS=false WORKSPACE_INSTALL_LARAVEL_ENVOY=false WORKSPACE_INSTALL_LARAVEL_INSTALLER=false +WORKSPACE_INSTALL_XLSWRITER=false WORKSPACE_INSTALL_DEPLOYER=false WORKSPACE_INSTALL_PRESTISSIMO=false WORKSPACE_INSTALL_LINUXBREW=false @@ -260,6 +261,7 @@ PHP_FPM_INSTALL_PING=false PHP_FPM_INSTALL_SSHPASS=false PHP_FPM_INSTALL_MAILPARSE=false PHP_FPM_INSTALL_WKHTMLTOPDF=false +PHP_FPM_INSTALL_XLSWRITER=false PHP_FPM_INSTALL_PHPDECIMAL=false PHP_FPM_INSTALL_ZOOKEEPER=false PHP_FPM_INSTALL_SSDB=false @@ -284,6 +286,7 @@ PHP_FPM_NEW_RELIC_APP_NAME=app_name PHP_WORKER_INSTALL_BZ2=false PHP_WORKER_INSTALL_GD=false +PHP_WORKER_INSTALL_XLSWRITER=false PHP_WORKER_INSTALL_IMAGEMAGICK=false PHP_WORKER_IMAGEMAGICK_VERSION=latest PHP_WORKER_INSTALL_GMP=false diff --git a/docker-compose.yml b/docker-compose.yml index 24035d6b..c901c8e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,6 +115,7 @@ services: - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH} - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY} - INSTALL_LARAVEL_INSTALLER=${WORKSPACE_INSTALL_LARAVEL_INSTALLER} + - INSTALL_XLSWRITER=${WORKSPACE_INSTALL_XLSWRITER} - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER} - INSTALL_PRESTISSIMO=${WORKSPACE_INSTALL_PRESTISSIMO} - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW} @@ -247,6 +248,7 @@ services: - INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS} - INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK} - INSTALL_CALENDAR=${PHP_FPM_INSTALL_CALENDAR} + - INSTALL_XLSWRITER=${PHP_FPM_INSTALL_XLSWRITER} - INSTALL_FAKETIME=${PHP_FPM_INSTALL_FAKETIME} - INSTALL_IONCUBE=${PHP_FPM_INSTALL_IONCUBE} - INSTALL_APCU=${PHP_FPM_INSTALL_APCU} @@ -327,6 +329,7 @@ services: - INSTALL_OCI8=${PHP_WORKER_INSTALL_OCI8} - INSTALL_MSSQL=${PHP_WORKER_INSTALL_MSSQL} - INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON} + - INSTALL_XLSWRITER=${PHP_WORKER_INSTALL_XLSWRITER} - INSTALL_SOAP=${PHP_WORKER_INSTALL_SOAP} - INSTALL_ZIP_ARCHIVE=${PHP_WORKER_INSTALL_ZIP_ARCHIVE} - INSTALL_MYSQL_CLIENT=${PHP_WORKER_INSTALL_MYSQL_CLIENT} diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 80bf946c..ed7d6ab1 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -488,6 +488,23 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \ docker-php-ext-enable gearman \ ;fi + + +########################################################################### +# xlswriter: +########################################################################### + +ARG INSTALL_XLSWRITER=false +RUN set -eux; \ + if [ ${INSTALL_XLSWRITER} = true ]; then \ + # Install Php Swoole Extension \ + pecl install xlswriter; \ + docker-php-ext-enable xlswriter; \ + php -m | grep -q 'xlswriter'; \ + fi + + + ########################################################################### # pcntl ########################################################################### diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index d386f239..6a6013be 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -367,6 +367,24 @@ RUN set -eux; \ php -m | grep -oiE '^swoole$'; \ fi + + + + +########################################################################### +# xlswriter: +########################################################################### + +ARG INSTALL_XLSWRITER=false +RUN set -eux; \ + if [ ${INSTALL_XLSWRITER} = true ]; then \ + # Install Php Swoole Extension \ + pecl install xlswriter; \ + docker-php-ext-enable xlswriter; \ + php -m | grep -q 'xlswriter'; \ + fi + + ########################################################################### # Taint EXTENSION ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 092e7115..fdaecf2b 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -565,6 +565,23 @@ RUN set -eux; \ php -m | grep -q 'swoole'; \ fi + + +########################################################################### +# xlswriter: +########################################################################### + +ARG INSTALL_XLSWRITER=false +RUN set -eux; \ + if [ ${INSTALL_XLSWRITER} = true ]; then \ + # Install Php Swoole Extension + echo '' | pecl -q install xlswriter; \ + echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini; \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \ + php -m | grep -q 'xlswriter'; \ + fi + + ########################################################################### # Taint EXTENSION ########################################################################### From 353ed5afb4386dec6dcbb7b6b1db0be4d286d067 Mon Sep 17 00:00:00 2001 From: Wuweiming <1052701694@qq.com> Date: Thu, 16 Dec 2021 11:49:55 +0800 Subject: [PATCH 48/97] add xlswriter extension --- php-fpm/Dockerfile | 2 +- php-worker/Dockerfile | 2 +- workspace/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index ed7d6ab1..7c4560ed 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -497,7 +497,7 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \ ARG INSTALL_XLSWRITER=false RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ - # Install Php Swoole Extension \ + # Install Php xlswriter Extension \ pecl install xlswriter; \ docker-php-ext-enable xlswriter; \ php -m | grep -q 'xlswriter'; \ diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 6a6013be..48decbd4 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -378,7 +378,7 @@ RUN set -eux; \ ARG INSTALL_XLSWRITER=false RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ - # Install Php Swoole Extension \ + # Install Php xlswriter Extension \ pecl install xlswriter; \ docker-php-ext-enable xlswriter; \ php -m | grep -q 'xlswriter'; \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index fdaecf2b..cb4a10c3 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -574,7 +574,7 @@ RUN set -eux; \ ARG INSTALL_XLSWRITER=false RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ - # Install Php Swoole Extension + # Install Php xlswriter Extension echo '' | pecl -q install xlswriter; \ echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini; \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \ From 9536c2e63f4fd65ea3a89a3a210fbd077283c870 Mon Sep 17 00:00:00 2001 From: Wuweiming <1052701694@qq.com> Date: Thu, 16 Dec 2021 15:17:19 +0800 Subject: [PATCH 49/97] fix:Add php xlswriter extension --- php-fpm/Dockerfile | 14 +++++++------- php-worker/Dockerfile | 16 ++++++++-------- workspace/Dockerfile | 12 ++++++++---- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 7c4560ed..cf0ed15e 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -488,8 +488,6 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \ docker-php-ext-enable gearman \ ;fi - - ########################################################################### # xlswriter: ########################################################################### @@ -498,13 +496,15 @@ ARG INSTALL_XLSWRITER=false RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension \ - pecl install xlswriter; \ - docker-php-ext-enable xlswriter; \ - php -m | grep -q 'xlswriter'; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ + pecl install xlswriter; \ + docker-php-ext-enable xlswriter; \ + php -m | grep -q 'xlswriter'; \ + else \ + echo "PHP Extension for xlswriter is not supported for PHP 5.0"\ + fi; \ fi - - ########################################################################### # pcntl ########################################################################### diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 48decbd4..dd2c58a3 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -367,24 +367,24 @@ RUN set -eux; \ php -m | grep -oiE '^swoole$'; \ fi - - - - ########################################################################### # xlswriter: ########################################################################### ARG INSTALL_XLSWRITER=false + RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension \ - pecl install xlswriter; \ - docker-php-ext-enable xlswriter; \ - php -m | grep -q 'xlswriter'; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ + pecl install xlswriter; \ + docker-php-ext-enable xlswriter; \ + php -m | grep -q 'xlswriter'; \ + else \ + echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \ + fi; \ fi - ########################################################################### # Taint EXTENSION ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index cb4a10c3..ac00287e 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -575,10 +575,14 @@ ARG INSTALL_XLSWRITER=false RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension - echo '' | pecl -q install xlswriter; \ - echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini; \ - ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \ - php -m | grep -q 'xlswriter'; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ + echo '' | pecl -q install xlswriter; \ + echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini; \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \ + php -m | grep -q 'xlswriter'; \ + else \ + echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \ + fi; \ fi From 084fcaaf8b7aec97086dcd968763b271705c6a97 Mon Sep 17 00:00:00 2001 From: Wuweiming <1052701694@qq.com> Date: Mon, 20 Dec 2021 15:19:02 +0800 Subject: [PATCH 50/97] fix:Add php xlswriter extension --- php-fpm/Dockerfile | 4 ++-- php-worker/Dockerfile | 4 ++-- workspace/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index cf0ed15e..e1aebf21 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -502,8 +502,8 @@ RUN set -eux; \ php -m | grep -q 'xlswriter'; \ else \ echo "PHP Extension for xlswriter is not supported for PHP 5.0"\ - fi; \ - fi + fi \ + ;fi ########################################################################### # pcntl diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index dd2c58a3..fe26ad30 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -382,8 +382,8 @@ RUN set -eux; \ php -m | grep -q 'xlswriter'; \ else \ echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \ - fi; \ - fi + fi \ + ;fi ########################################################################### # Taint EXTENSION diff --git a/workspace/Dockerfile b/workspace/Dockerfile index ac00287e..cb3d7a00 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -582,8 +582,8 @@ RUN set -eux; \ php -m | grep -q 'xlswriter'; \ else \ echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \ - fi; \ - fi + fi \ + ;fi ########################################################################### From 9f0657e2b04e3dce88f364010af78e284ca96dcf Mon Sep 17 00:00:00 2001 From: Erik Niebla Date: Mon, 20 Dec 2021 10:24:21 -0500 Subject: [PATCH 51/97] ci(PHP 8.1): add CI processes for PHP 8.1 --- .github/workflows/main-ci.yml | 2 +- .travis.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index f50d1a0e..7d59bf14 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - php_version: [ "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0" ] + php_version: [ "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1" ] service: [ php-fpm, php-worker, workspace ] steps: - uses: actions/checkout@v2 diff --git a/.travis.yml b/.travis.yml index f3290be2..b34ef2ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: - PHP_VERSION=7.3 BUILD_SERVICE=php-worker - PHP_VERSION=7.4 BUILD_SERVICE=php-worker - PHP_VERSION=8.0 BUILD_SERVICE=php-worker + - PHP_VERSION=8.1 BUILD_SERVICE=php-worker - PHP_VERSION=7.0 BUILD_SERVICE=laravel-horizon - PHP_VERSION=7.1 BUILD_SERVICE=laravel-horizon @@ -23,6 +24,7 @@ env: - PHP_VERSION=7.3 BUILD_SERVICE=laravel-horizon - PHP_VERSION=7.4 BUILD_SERVICE=laravel-horizon - PHP_VERSION=8.0 BUILD_SERVICE=laravel-horizon + - PHP_VERSION=8.1 BUILD_SERVICE=laravel-horizon - PHP_VERSION=NA BUILD_SERVICE=solr - PHP_VERSION=NA BUILD_SERVICE="mssql rethinkdb aerospike" From 18bf3a7b205816921faa0acc768fa8f99c8add71 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 21 Dec 2021 10:56:58 +0100 Subject: [PATCH 52/97] Update .env.example --- .env.example | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.env.example b/.env.example index 168ae649..64ee615b 100644 --- a/.env.example +++ b/.env.example @@ -443,6 +443,11 @@ POSTGRES_PASSWORD=secret POSTGRES_PORT=5432 POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d +### POSTGIS ############################################## + +POSTGIS_VERSION=latest +POSTGIS_INSTALL_PGSQL_HTTP_FOR_POSTGIS13=false + ### SQS ############################################## SQS_NODE_HOST_PORT=9324 From ec4216ed187729a71e32032bd3c9712415fa44a6 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 21 Dec 2021 11:41:46 +0100 Subject: [PATCH 53/97] Update Dockerfile --- postgres-postgis/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/postgres-postgis/Dockerfile b/postgres-postgis/Dockerfile index 3b219f48..56ffb31f 100644 --- a/postgres-postgis/Dockerfile +++ b/postgres-postgis/Dockerfile @@ -1,4 +1,5 @@ -FROM postgis/postgis:latest +ARG POSTGRES_VERSION=alpine +FROM postgis/postgis:${POSTGRES_VERSION} LABEL maintainer="Mahmoud Zalt " From 3d2f8074d35768125e9b11f8c34e0babea972603 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 21 Dec 2021 11:43:51 +0100 Subject: [PATCH 54/97] Update docker-compose.yml --- docker-compose.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 24035d6b..d785ccab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -619,7 +619,10 @@ services: ### PostgreSQL PostGis ################################### postgres-postgis: - build: ./postgres-postgis + build: + context: ./postgres-postgis + args: + - POSTGRES_VERSION=${POSTGRES_VERSION} volumes: - ${DATA_PATH_HOST}/postgres:/var/lib/postgresql/data ports: @@ -628,6 +631,7 @@ services: - POSTGRES_DB=${POSTGRES_DB} - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - INSTALL_PGSQL_HTTP_FOR_POSTGIS13=${POSTGIS_INSTALL_PGSQL_HTTP_FOR_POSTGIS13} networks: - backend From c6bc9860956166b4de4ca0f8350e9069f397516c Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 21 Dec 2021 11:50:43 +0100 Subject: [PATCH 55/97] Update Dockerfile --- postgres-postgis/Dockerfile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/postgres-postgis/Dockerfile b/postgres-postgis/Dockerfile index 56ffb31f..99b7573c 100644 --- a/postgres-postgis/Dockerfile +++ b/postgres-postgis/Dockerfile @@ -1,8 +1,25 @@ -ARG POSTGRES_VERSION=alpine +ARG POSTGRES_VERSION=latest FROM postgis/postgis:${POSTGRES_VERSION} LABEL maintainer="Mahmoud Zalt " +RUN if [ ${INSTALL_PGSQL_HTTP_FOR_POSTGIS13} = true ]; then \ + apt-get clean \ + && apt-get update -yqq \ + && apt-get install -y \ + git \ + make \ + gcc \ + libcurl4-openssl-dev \ + postgresql-server-dev-13 \ + postgresql-13-cron \ + && git clone --recursive https://github.com/pramsey/pgsql-http.git \ + && cd pgsql-http/ \ + && make \ + && make install \ + && apt-get clean \ +;fi + CMD ["postgres"] EXPOSE 5432 From 9c6f4e0a06c4e88e67e790edee2c0f8a0c16cac9 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 21 Dec 2021 11:58:32 +0100 Subject: [PATCH 56/97] Update Dockerfile --- postgres-postgis/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres-postgis/Dockerfile b/postgres-postgis/Dockerfile index 99b7573c..7573cc41 100644 --- a/postgres-postgis/Dockerfile +++ b/postgres-postgis/Dockerfile @@ -9,7 +9,7 @@ RUN if [ ${INSTALL_PGSQL_HTTP_FOR_POSTGIS13} = true ]; then \ && apt-get install -y \ git \ make \ - gcc \ + gcc \ libcurl4-openssl-dev \ postgresql-server-dev-13 \ postgresql-13-cron \ From 4885f9ac2dd3476273745f5821c5ab1061a3d798 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 21 Dec 2021 12:02:53 +0100 Subject: [PATCH 57/97] Update .env.example --- .env.example | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.example b/.env.example index 64ee615b..097afa42 100644 --- a/.env.example +++ b/.env.example @@ -445,7 +445,6 @@ POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d ### POSTGIS ############################################## -POSTGIS_VERSION=latest POSTGIS_INSTALL_PGSQL_HTTP_FOR_POSTGIS13=false ### SQS ############################################## From 3d2194301e97fb5dd426fcb110179278dfef22de Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Tue, 21 Dec 2021 12:05:56 +0100 Subject: [PATCH 58/97] Update .env.example --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 097afa42..1116e637 100644 --- a/.env.example +++ b/.env.example @@ -443,7 +443,7 @@ POSTGRES_PASSWORD=secret POSTGRES_PORT=5432 POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d -### POSTGIS ############################################## +### POSTGRES-POSTGIS ############################################## POSTGIS_INSTALL_PGSQL_HTTP_FOR_POSTGIS13=false From cf6e2cd843fb378ffcaa2d3a4a2e9ba8eb8aa0d1 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Wed, 22 Dec 2021 09:17:25 +0100 Subject: [PATCH 59/97] Update Dockerfile --- postgres-postgis/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/postgres-postgis/Dockerfile b/postgres-postgis/Dockerfile index 7573cc41..a25ea780 100644 --- a/postgres-postgis/Dockerfile +++ b/postgres-postgis/Dockerfile @@ -3,6 +3,8 @@ FROM postgis/postgis:${POSTGRES_VERSION} LABEL maintainer="Mahmoud Zalt " +ARG INSTALL_PGSQL_HTTP_FOR_POSTGIS13=false + RUN if [ ${INSTALL_PGSQL_HTTP_FOR_POSTGIS13} = true ]; then \ apt-get clean \ && apt-get update -yqq \ From 3a8ff2c329842f476b60a9282ae72825cc02f52d Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Wed, 22 Dec 2021 09:18:33 +0100 Subject: [PATCH 60/97] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d785ccab..5006f193 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -623,6 +623,7 @@ services: context: ./postgres-postgis args: - POSTGRES_VERSION=${POSTGRES_VERSION} + - INSTALL_PGSQL_HTTP_FOR_POSTGIS13=${POSTGIS_INSTALL_PGSQL_HTTP_FOR_POSTGIS13} volumes: - ${DATA_PATH_HOST}/postgres:/var/lib/postgresql/data ports: @@ -631,7 +632,6 @@ services: - POSTGRES_DB=${POSTGRES_DB} - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - - INSTALL_PGSQL_HTTP_FOR_POSTGIS13=${POSTGIS_INSTALL_PGSQL_HTTP_FOR_POSTGIS13} networks: - backend From c906356f465c6b2719e0e18f504e5517c8f9ea04 Mon Sep 17 00:00:00 2001 From: Wuweiming <1052701694@qq.com> Date: Thu, 30 Dec 2021 18:28:14 +0800 Subject: [PATCH 61/97] fix:Add php xlswriter extension --- php-fpm/Dockerfile | 6 +++--- php-worker/Dockerfile | 4 ++-- workspace/Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index e1aebf21..a08b7b33 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -497,11 +497,11 @@ RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension \ if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ - pecl install xlswriter; \ - docker-php-ext-enable xlswriter; \ + pecl install xlswriter &&\ + docker-php-ext-enable xlswriter &&\ php -m | grep -q 'xlswriter'; \ else \ - echo "PHP Extension for xlswriter is not supported for PHP 5.0"\ + echo "PHP Extension for xlswriter is not supported for PHP 5.0";\ fi \ ;fi diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index fe26ad30..74a2a5f6 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -377,8 +377,8 @@ RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension \ if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ - pecl install xlswriter; \ - docker-php-ext-enable xlswriter; \ + pecl install xlswriter && \ + docker-php-ext-enable xlswriter && \ php -m | grep -q 'xlswriter'; \ else \ echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index cb3d7a00..61403884 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -576,8 +576,8 @@ RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ - echo '' | pecl -q install xlswriter; \ - echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini; \ + echo '' | pecl -q install xlswriter && \ + echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini && \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \ php -m | grep -q 'xlswriter'; \ else \ From 7c2b1c561a72c85803a0ede17176218babf9ce9b Mon Sep 17 00:00:00 2001 From: YenHai Date: Mon, 3 Jan 2022 17:18:49 +0800 Subject: [PATCH 62/97] Change PCRE mirror of Openresty --- openresty/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openresty/Dockerfile b/openresty/Dockerfile index 8a045aba..50198cb1 100644 --- a/openresty/Dockerfile +++ b/openresty/Dockerfile @@ -148,7 +148,7 @@ RUN apk add --no-cache --virtual .build-deps \ && make -j${RESTY_J} \ && make -j${RESTY_J} install_sw \ && cd /tmp \ - && curl -fSL https://ftp.pcre.org/pub/pcre/pcre-${RESTY_PCRE_VERSION}.tar.gz -o pcre-${RESTY_PCRE_VERSION}.tar.gz \ + && curl -fSL https://downloads.sourceforge.net/project/pcre/pcre/${RESTY_PCRE_VERSION}/pcre-${RESTY_PCRE_VERSION}.tar.gz -o pcre-${RESTY_PCRE_VERSION}.tar.gz \ && tar xzf pcre-${RESTY_PCRE_VERSION}.tar.gz \ && cd /tmp/pcre-${RESTY_PCRE_VERSION} \ && ./configure \ @@ -200,7 +200,7 @@ COPY logrotate/nginx /etc/logrotate.d/ # Set upstream conf and remove the default conf RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}; }" > /etc/nginx/conf.d/upstream.conf - + # Copy nginx configuration files COPY nginx.conf /etc/nginx/ From 4171871ab2c776d6a5e057f6b287da950af4c17b Mon Sep 17 00:00:00 2001 From: Erik Niebla Date: Mon, 20 Dec 2021 10:48:36 -0500 Subject: [PATCH 63/97] Fix tests(xdebug, mongodb) --- laravel-horizon/Dockerfile | 6 +----- php-fpm/Dockerfile | 12 ++++-------- php-worker/Dockerfile | 8 ++------ workspace/Dockerfile | 20 ++++++-------------- 4 files changed, 13 insertions(+), 33 deletions(-) diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile index 87c11274..5b7fb1ce 100644 --- a/laravel-horizon/Dockerfile +++ b/laravel-horizon/Dockerfile @@ -64,11 +64,7 @@ ARG INSTALL_GNUPG=false RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \ apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \ apk add --no-cache --no-progress gpgme; \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install gnupg-1.5.0RC2; \ - else \ - pecl install gnupg; \ - fi; \ + pecl install gnupg; \ docker-php-ext-enable gnupg; \ fi diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 80bf946c..a20b4bec 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -117,11 +117,7 @@ ARG INSTALL_GNUPG=false RUN if [ ${INSTALL_GNUPG} = true ]; then \ apt-get -yq install libgpgme-dev; \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install gnupg-1.5.0RC2; \ - else \ - pecl install gnupg; \ - fi; \ + pecl install gnupg; \ docker-php-ext-enable gnupg; \ php -m | grep -q 'gnupg'; \ fi @@ -221,7 +217,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ # Install the xdebug extension # https://xdebug.org/docs/compat if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ - pecl install xdebug-3.1.1; \ + pecl install xdebug-3.1.2; \ else \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl install xdebug-2.5.5; \ @@ -362,7 +358,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ docker-php-ext-enable mongo; \ php -m | grep -oiE '^mongo$'; \ else \ - if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \ pecl install mongodb-1.9.2; \ else \ pecl install mongodb; \ @@ -1090,7 +1086,7 @@ ARG INSTALL_XMLRPC=false RUN if [ ${INSTALL_XMLRPC} = true ]; then \ apt-get -yq install libxml2-dev; \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install xmlrpc-1.0.0RC2; \ + pecl install xmlrpc-1.0.0RC3; \ docker-php-ext-enable xmlrpc; \ else \ docker-php-ext-install xmlrpc; \ diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index d386f239..a361405a 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -65,11 +65,7 @@ ARG INSTALL_GNUPG=false RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \ apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \ apk add --no-cache --no-progress gpgme; \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install gnupg-1.5.0RC2; \ - else \ pecl install gnupg; \ - fi; \ docker-php-ext-enable gnupg; \ fi @@ -147,7 +143,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ docker-php-ext-enable mongo; \ php -m | grep -oiE '^mongo$'; \ else \ - if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \ pecl install mongodb-1.9.2; \ else \ pecl install mongodb; \ @@ -404,7 +400,7 @@ ARG INSTALL_XMLRPC=false RUN if [ ${INSTALL_XMLRPC} = true ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install xmlrpc-1.0.0RC2; \ + pecl install xmlrpc-1.0.0RC3; \ docker-php-ext-enable xmlrpc; \ else \ docker-php-ext-install xmlrpc; \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 092e7115..967aecb0 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -330,25 +330,17 @@ ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \ # Install the xdebug extension - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - pecl install xdebug-3.0.0; \ + # https://xdebug.org/docs/compat + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ + pecl install xdebug-3.1.2; \ else \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl install xdebug-2.5.5; \ else \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ + if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ pecl install xdebug-2.9.0; \ else \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ - pecl install xdebug-2.9.8; \ - else \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ - pecl install xdebug-2.9.8; \ - else \ - #pecl install xdebug; \ - echo "xDebug 3 required, not supported."; \ - fi \ - fi \ + pecl install xdebug-2.9.8; \ fi \ fi \ fi && \ @@ -457,7 +449,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-mongo.ini; \ php -m | grep -oiE '^mongo$'; \ else \ - if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ] ;}; then \ pecl install mongodb-1.9.2; \ else \ pecl install mongodb; \ From 7d91cd334837b7179a3e1b70cd67e5afaa344662 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 13:38:44 +0000 Subject: [PATCH 64/97] Bump axios from 0.21.1 to 0.21.2 in /react Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 14 +++++++------- react/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index dd1402f8..158c29a9 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -2991,17 +2991,17 @@ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, "axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz", + "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==", "requires": { - "follow-redirects": "^1.10.0" + "follow-redirects": "^1.14.0" }, "dependencies": { "follow-redirects": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz", - "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==" + "version": "1.14.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", + "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==" } } }, diff --git a/react/package.json b/react/package.json index f4e153d6..cbb26f42 100644 --- a/react/package.json +++ b/react/package.json @@ -9,7 +9,7 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^7.2.1", - "axios": "^0.21.1", + "axios": "^0.21.2", "bootstrap": "^4.5.3", "jss-rtl": "^0.3.0", "node-sass": "^4.14.1", From 3ef987ba84fd860fa9c43dcea07cbb415f604246 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 13:38:59 +0000 Subject: [PATCH 65/97] Bump tmpl from 1.0.4 to 1.0.5 in /react Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/daaku/nodejs-tmpl/releases) - [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5) --- updated-dependencies: - dependency-name: tmpl dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index dd1402f8..a5d7f535 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -14465,9 +14465,9 @@ } }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==" }, "to-arraybuffer": { "version": "1.0.1", From 6d61cd3d25c3bc982252901bcdd5828dde87c476 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 13:39:02 +0000 Subject: [PATCH 66/97] Bump ws from 5.2.2 to 5.2.3 in /react Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index dd1402f8..5ada81bd 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -8238,9 +8238,9 @@ } }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", "requires": { "async-limiter": "~1.0.0" } @@ -15463,9 +15463,9 @@ } }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", "requires": { "async-limiter": "~1.0.0" } @@ -15866,9 +15866,9 @@ } }, "ws": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", - "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz", + "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==", "requires": { "async-limiter": "~1.0.0" } From 186928fb07c9ec95e3a9438f78665484cd5334ea Mon Sep 17 00:00:00 2001 From: Erik Niebla Date: Wed, 12 Jan 2022 09:05:42 -0500 Subject: [PATCH 67/97] Fix tests on XlsWriter ext --- php-fpm/Dockerfile | 2 +- php-worker/Dockerfile | 2 +- workspace/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 0980f232..eb81748f 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -492,7 +492,7 @@ ARG INSTALL_XLSWRITER=false RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \ pecl install xlswriter &&\ docker-php-ext-enable xlswriter &&\ php -m | grep -q 'xlswriter'; \ diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 39c4429c..7414459d 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -372,7 +372,7 @@ ARG INSTALL_XLSWRITER=false RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension \ - if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \ pecl install xlswriter && \ docker-php-ext-enable xlswriter && \ php -m | grep -q 'xlswriter'; \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 3c09483b..36364021 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -567,7 +567,7 @@ ARG INSTALL_XLSWRITER=false RUN set -eux; \ if [ ${INSTALL_XLSWRITER} = true ]; then \ # Install Php xlswriter Extension - if [ $(php -r "echo PHP_MAJOR_VERSION;") > "5" ]; then \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \ echo '' | pecl -q install xlswriter && \ echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini && \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \ From 2759864e2a1f5052c222e993ba4e5bfceeef145b Mon Sep 17 00:00:00 2001 From: duchymor <42995320+duchymor@users.noreply.github.com> Date: Wed, 12 Jan 2022 15:53:26 +0100 Subject: [PATCH 68/97] fix oci8 --- php-fpm/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 19c45270..93f906cc 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -605,6 +605,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.12; \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \ echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \ + elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ + echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-3.0.1; \ else \ echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \ fi \ From 3d18d92ff2546405335cb6a9f96b42c8af24690b Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Fri, 21 Jan 2022 14:24:24 +0100 Subject: [PATCH 69/97] Add POSTGIS_VERSION variable --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index 26df8c59..d09ac3ba 100644 --- a/.env.example +++ b/.env.example @@ -448,6 +448,7 @@ POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d ### POSTGRES-POSTGIS ############################################## +POSTGIS_VERSION=latest POSTGIS_INSTALL_PGSQL_HTTP_FOR_POSTGIS13=false ### SQS ############################################## From 2efec41e5534827677ab20ae835bde55ec22a310 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Fri, 21 Jan 2022 14:25:55 +0100 Subject: [PATCH 70/97] Add POSTGIS_VERSION argument --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0969ea8b..2314b2aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -625,7 +625,7 @@ services: build: context: ./postgres-postgis args: - - POSTGRES_VERSION=${POSTGRES_VERSION} + - POSTGIS_VERSION=${POSTGIS_VERSION} - INSTALL_PGSQL_HTTP_FOR_POSTGIS13=${POSTGIS_INSTALL_PGSQL_HTTP_FOR_POSTGIS13} volumes: - ${DATA_PATH_HOST}/postgres:/var/lib/postgresql/data From 1fa196de84060eaf68caf6fe93183e96c2e28c36 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Fri, 21 Jan 2022 14:26:39 +0100 Subject: [PATCH 71/97] Use POSTGIS_VERSION argument --- postgres-postgis/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postgres-postgis/Dockerfile b/postgres-postgis/Dockerfile index a25ea780..90f26114 100644 --- a/postgres-postgis/Dockerfile +++ b/postgres-postgis/Dockerfile @@ -1,5 +1,5 @@ -ARG POSTGRES_VERSION=latest -FROM postgis/postgis:${POSTGRES_VERSION} +ARG POSTGIS_VERSION=latest +FROM postgis/postgis:${POSTGIS_VERSION} LABEL maintainer="Mahmoud Zalt " From 63abb6ced88939800ca957dc896a9502fe01741d Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Mon, 31 Jan 2022 16:28:46 +0100 Subject: [PATCH 72/97] Update docker-in-docker tag image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2314b2aa..89447206 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1516,7 +1516,7 @@ services: ### Docker-in-Docker ################################################ docker-in-docker: - image: docker:19.03-dind + image: docker:20.10-dind environment: DOCKER_TLS_SAN: DNS:docker-in-docker privileged: true From 8856efeb3bda64024b44f0836ac96d644dbcba77 Mon Sep 17 00:00:00 2001 From: Ryan van Rensburg Date: Thu, 3 Feb 2022 09:55:51 +0200 Subject: [PATCH 73/97] fix meilisearch volume mount path closes #3138 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2314b2aa..ae9d1d98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -995,7 +995,7 @@ services: meilisearch: image: getmeili/meilisearch:latest volumes: - - ${DATA_PATH_HOST}/meilisearch:/var/lib/meilisearch + - ${DATA_PATH_HOST}/meilisearch:/data.ms ports: - "${MEILISEARCH_HOST_PORT}:7700" networks: From 534b7b405f78bb024950cbf1856006a1c0d7146b Mon Sep 17 00:00:00 2001 From: Abolfazl Sharifi Date: Wed, 9 Feb 2022 10:11:53 +0330 Subject: [PATCH 74/97] try to fix audiowaveform for workspace --- workspace/Dockerfile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 36364021..2a905b7f 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1417,18 +1417,16 @@ USER root ARG INSTALL_AUDIOWAVEFORM=false RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \ - apt-get -y install git wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \ - && git clone https://github.com/bbc/audiowaveform.git \ - && cd audiowaveform \ - && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \ - && tar xzf release-1.10.0.tar.gz \ - && ln -s googletest-release-1.10.0/googletest googletest \ - && ln -s googletest-release-1.10.0/googlemock googlemock \ - && mkdir build \ - && cd build \ - && cmake .. \ - && make \ - && make install \ + apt-get -y install wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \ + && cd /tmp \ + && git clone https://github.com/bbc/audiowaveform.git \ + && cd audiowaveform \ + && git clone --depth=1 https://github.com/google/googletest.git -b release-1.11.0 \ + && mkdir build \ + && cd build \ + && cmake .. \ + && make \ + && make install \ ;fi ##################################### From 189ce1cdff245c48eb3b7524ad58b1d7058bc627 Mon Sep 17 00:00:00 2001 From: tancou Date: Wed, 9 Feb 2022 18:20:34 +0100 Subject: [PATCH 75/97] Do not install tokenizer into php-worker when php version is 8.1 --- php-worker/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 7414459d..8620a593 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -38,7 +38,12 @@ RUN apk --update add wget \ RUN pecl channel-update pecl.php.net; \ - docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl + docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ + php -m | grep -q 'tokenizer'; \ + else \ + docker-php-ext-install tokenizer; \ + fi # Add a non-root user: ARG PUID=1000 From 0c3d3afb30246612e6b89dc9935d5fe31436bbe8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 04:37:23 +0000 Subject: [PATCH 76/97] Bump node-sass from 4.14.1 to 7.0.0 in /react Bumps [node-sass](https://github.com/sass/node-sass) from 4.14.1 to 7.0.0. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.14.1...v7.0.0) --- updated-dependencies: - dependency-name: node-sass dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 708 +++++++++++++++++++++++++++------------- react/package.json | 2 +- 2 files changed, 476 insertions(+), 234 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index 3b587cc9..5075e996 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -2170,11 +2170,21 @@ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, + "@types/minimist": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", + "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" + }, "@types/node": { "version": "14.14.7", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==" }, + "@types/normalize-package-data": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", + "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" + }, "@types/parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", @@ -2772,9 +2782,9 @@ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", + "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -2822,11 +2832,6 @@ "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=" - }, "array-flatten": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", @@ -3503,14 +3508,6 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==" }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "requires": { - "inherits": "~2.0.0" - } - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -3889,17 +3886,18 @@ } }, "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" } }, "caniuse-api": { @@ -4256,6 +4254,11 @@ "simple-swizzle": "^0.2.2" } }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" + }, "colorette": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", @@ -4519,12 +4522,41 @@ } }, "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "dependencies": { + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + } } }, "crypto-browserify": { @@ -4829,14 +4861,6 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.14.tgz", "integrity": "sha512-2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A==" }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "requires": { - "array-find-index": "^1.0.1" - } - }, "cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -4899,6 +4923,22 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "decamelize-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", + "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", + "requires": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "dependencies": { + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" + } + } + }, "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", @@ -5379,6 +5419,11 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==" }, + "env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" + }, "errno": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", @@ -6690,17 +6735,6 @@ "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", "optional": true }, - "fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -6873,9 +6907,9 @@ } }, "globule": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz", - "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz", + "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==", "requires": { "glob": "~7.1.1", "lodash": "~4.17.10", @@ -6927,6 +6961,11 @@ "har-schema": "^2.0.0" } }, + "hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==" + }, "harmony-reflect": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.1.tgz", @@ -7346,11 +7385,6 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, - "in-publish": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", - "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==" - }, "indefinite-observable": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-2.0.1.tgz", @@ -7360,12 +7394,9 @@ } }, "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "requires": { - "repeating": "^2.0.0" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" }, "indexes-of": { "version": "1.0.1", @@ -7694,11 +7725,6 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, - "is-finite": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", - "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==" - }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -7831,11 +7857,6 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -9236,18 +9257,6 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, "loader-fs-cache": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz", @@ -9378,15 +9387,6 @@ "js-tokens": "^3.0.0 || ^4.0.0" } }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, "lower-case": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz", @@ -9403,12 +9403,11 @@ } }, "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "yallist": "^4.0.0" } }, "make-dir": { @@ -9454,9 +9453,9 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==" }, "map-visit": { "version": "1.0.0", @@ -9506,20 +9505,69 @@ } }, "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", + "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize": "^1.2.0", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" + }, + "dependencies": { + "hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "is-core-module": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", + "requires": { + "has": "^1.0.3" + } + }, + "normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "requires": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==" + }, + "yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" + } } }, "merge-deep": { @@ -9683,6 +9731,23 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, + "minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "requires": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + } + } + }, "minipass": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", @@ -9722,6 +9787,15 @@ "minipass": "^3.0.0" } }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + } + }, "mississippi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", @@ -9896,28 +9970,56 @@ "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==" }, "node-gyp": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", - "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", + "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.3", + "nopt": "^5.0.0", + "npmlog": "^4.1.2", + "request": "^2.88.2", + "rimraf": "^3.0.2", + "semver": "^7.3.2", + "tar": "^6.0.2", + "which": "^2.0.2" }, "dependencies": { + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } } } }, @@ -9999,33 +10101,76 @@ "integrity": "sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==" }, "node-sass": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", - "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.0.tgz", + "integrity": "sha512-6yUnsD3L8fVbgMX6nKQqZkjRcG7a/PpmF0pEyeWf+BgbTj2ToJlCYrnUifL2KbjV5gIY22I3oppahBWA3B+jUg==", "requires": { "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", + "chalk": "^4.1.2", + "cross-spawn": "^7.0.3", "gaze": "^1.0.0", "get-stdin": "^4.0.1", "glob": "^7.0.3", - "in-publish": "^2.0.0", "lodash": "^4.17.15", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", + "meow": "^9.0.0", "nan": "^2.13.2", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", + "node-gyp": "^7.1.0", + "npmlog": "^5.0.0", "request": "^2.88.0", "sass-graph": "2.2.5", "stdout-stream": "^1.4.0", "true-case-path": "^1.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } } }, "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", "requires": { "abbrev": "1" } @@ -10074,14 +10219,84 @@ } }, "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + } + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "requires": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + } } }, "nth-check": { @@ -10351,11 +10566,6 @@ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, "os-locale": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", @@ -10371,15 +10581,6 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, "p-defer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", @@ -10595,16 +10796,6 @@ } } }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, "pbkdf2": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz", @@ -11811,11 +12002,6 @@ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -11910,6 +12096,11 @@ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" }, + "quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==" + }, "raf": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", @@ -12452,22 +12643,74 @@ } }, "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==" + } } }, "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + } } }, "readable-stream": { @@ -12509,12 +12752,12 @@ } }, "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" } }, "redux": { @@ -12680,14 +12923,6 @@ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "requires": { - "is-finite": "^1.0.0" - } - }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", @@ -14001,14 +14236,6 @@ "ansi-regex": "^2.0.0" } }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "requires": { - "is-utf8": "^0.2.0" - } - }, "strip-comments": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz", @@ -14024,11 +14251,11 @@ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", "requires": { - "get-stdin": "^4.0.1" + "min-indent": "^1.0.0" } }, "strip-json-comments": { @@ -14194,13 +14421,28 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, "tar": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", - "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", "requires": { - "block-stream": "*", - "fstream": "^1.0.12", - "inherits": "2" + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "dependencies": { + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + } } }, "terser": { @@ -14530,9 +14772,9 @@ } }, "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==" }, "true-case-path": { "version": "1.0.3", @@ -15605,11 +15847,11 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "^1.0.2 || 2 || 3 || 4" } }, "word-wrap": { @@ -15902,9 +16144,9 @@ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yaml": { "version": "1.10.0", diff --git a/react/package.json b/react/package.json index cbb26f42..2e5bc0f9 100644 --- a/react/package.json +++ b/react/package.json @@ -12,7 +12,7 @@ "axios": "^0.21.2", "bootstrap": "^4.5.3", "jss-rtl": "^0.3.0", - "node-sass": "^4.14.1", + "node-sass": "^7.0.0", "prop-types": "^15.7.2", "react": "^17.0.1", "react-bootstrap": "^1.4.0", From 4b774583b46c08fee3166fb8c680a0162b973a7f Mon Sep 17 00:00:00 2001 From: NPM Mirror Bot Date: Sat, 12 Feb 2022 03:59:23 +0000 Subject: [PATCH 77/97] update https://registry.npm.taobao.org to https://registry.npmmirror.com --- DOCUMENTATION/content/help/index.md | 2 +- README-zh.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DOCUMENTATION/content/help/index.md b/DOCUMENTATION/content/help/index.md index 519d129a..c10bb00a 100644 --- a/DOCUMENTATION/content/help/index.md +++ b/DOCUMENTATION/content/help/index.md @@ -97,7 +97,7 @@ In China, the origin source of composer and npm is very slow. You can add `WORKS Example: ```bash -WORKSPACE_NPM_REGISTRY=https://registry.npm.taobao.org +WORKSPACE_NPM_REGISTRY=https://registry.npmmirror.com WORKSPACE_COMPOSER_REPO_PACKAGIST=https://packagist.phpcomposer.com ``` diff --git a/README-zh.md b/README-zh.md index d05a7dbf..c80e530b 100644 --- a/README-zh.md +++ b/README-zh.md @@ -81,9 +81,9 @@ CHANGE_SOURCE=true # composer镜像源 WORKSPACE_COMPOSER_REPO_PACKAGIST=https://mirrors.aliyun.com/composer/ # nvm镜像源 -WORKSPACE_NVM_NODEJS_ORG_MIRROR=https://npm.taobao.org/mirrors/node +WORKSPACE_NVM_NODEJS_ORG_MIRROR=https://npmmirror.com/mirrors/node # npm镜像源 -WORKSPACE_NPM_REGISTRY=https://registry.npm.taobao.org +WORKSPACE_NPM_REGISTRY=https://registry.npmmirror.com ``` 3. 运行这些容器。 From 349ba1ea5021464aebc8472b4bd608467ca46f36 Mon Sep 17 00:00:00 2001 From: tancou Date: Sun, 13 Feb 2022 16:38:47 +0100 Subject: [PATCH 78/97] fix amqp installation --- php-worker/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 8620a593..ee6d1890 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -262,15 +262,16 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \ ARG INSTALL_AMQP=false RUN if [ ${INSTALL_AMQP} = true ]; then \ + docker-php-ext-install sockets; \ apk --update add -q rabbitmq-c rabbitmq-c-dev && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - printf "\n" | pecl install amqp-1.11.0beta; \ + printf "\n" | pecl install amqp-1.11.0; \ else \ - printf "\n" | pecl install amqp; \ + printf "\n" | pecl install amqp; \ fi && \ - docker-php-ext-enable amqp && \ - apk del -q rabbitmq-c-dev && \ - docker-php-ext-install sockets \ + docker-php-ext-enable amqp && \ + apk del -q rabbitmq-c-dev; \ + php -m | grep -oiE '^amqp$' \ ;fi # Install Gearman: From b713651a53fd7d89778ff47404229e7ca682eae0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 05:45:44 +0000 Subject: [PATCH 79/97] Bump follow-redirects from 1.5.10 to 1.14.8 in /react Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.5.10 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.5.10...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index 3b587cc9..cd98c4e1 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -2996,13 +2996,6 @@ "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==", "requires": { "follow-redirects": "^1.14.0" - }, - "dependencies": { - "follow-redirects": { - "version": "1.14.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", - "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==" - } } }, "axobject-query": { @@ -4886,14 +4879,6 @@ } } }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", @@ -6545,12 +6530,9 @@ } }, "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - } + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" }, "for-in": { "version": "1.0.2", From 4001890c7d563c7c564ef11ec58e373a7ab813b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:50:32 +0000 Subject: [PATCH 80/97] Bump ssri from 6.0.1 to 6.0.2 in /react Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) --- updated-dependencies: - dependency-name: ssri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index cd98c4e1..99d40714 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -13738,9 +13738,9 @@ } }, "ssri": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz", - "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.1.tgz", + "integrity": "sha512-w+daCzXN89PseTL99MkA+fxJEcU3wfaE/ah0i0lnOlpG1CYLJ2ZjzEry68YBKfLs4JfoTShrTEsJkAZuNZ/stw==", "requires": { "figgy-pudding": "^3.5.1", "minipass": "^3.1.1" @@ -15145,9 +15145,9 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", + "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==", "requires": { "figgy-pudding": "^3.5.1" } From 96efc244b80bb764fee600e563d13b85393eff32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:50:33 +0000 Subject: [PATCH 81/97] Bump lodash from 4.17.20 to 4.17.21 in /react Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index cd98c4e1..446b991e 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -9301,9 +9301,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash-es": { "version": "4.17.15", From 2597989cbdb62c99050c9fc5f35f4036505bee8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Feb 2022 14:36:16 +0000 Subject: [PATCH 82/97] Bump url-parse from 1.4.7 to 1.5.7 in /react Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.7. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.7) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index 44c6b393..f9efdbab 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -15030,9 +15030,9 @@ } }, "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", + "version": "1.5.7", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz", + "integrity": "sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" From 02d9ed066d34d2c5885d90b5a8ff8c451786b0bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 04:46:27 +0000 Subject: [PATCH 83/97] Bump url-parse from 1.5.7 to 1.5.10 in /react Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index f9efdbab..2fee6f6f 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -15030,9 +15030,9 @@ } }, "url-parse": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz", - "integrity": "sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" From 905a99efba8a4acd0d68ba684295bdcacb358beb Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Fri, 4 Mar 2022 17:38:49 +0100 Subject: [PATCH 84/97] Update to work with PHP8 and PHP8.1 --- laravel-horizon/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile index 5b7fb1ce..0401b38a 100644 --- a/laravel-horizon/Dockerfile +++ b/laravel-horizon/Dockerfile @@ -5,7 +5,7 @@ # ARG LARADOCK_PHP_VERSION -FROM php:${LARADOCK_PHP_VERSION}-alpine3.13 +FROM php:${LARADOCK_PHP_VERSION}-alpine3.15 LABEL maintainer="Mahmoud Zalt " From f5cb352e9f3f8a306ba7461af5f7df12a6f02bbd Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Fri, 4 Mar 2022 17:40:46 +0100 Subject: [PATCH 85/97] Fix php alpine tag --- php-worker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index ee6d1890..8397681e 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -5,7 +5,7 @@ # ARG LARADOCK_PHP_VERSION -FROM php:${LARADOCK_PHP_VERSION}-alpine +FROM php:${LARADOCK_PHP_VERSION}-alpine3.15 LABEL maintainer="Mahmoud Zalt " From fb22fbf0d7be9c3a71053cebbb1673e616e14df2 Mon Sep 17 00:00:00 2001 From: Marcelo Camargo Date: Mon, 7 Mar 2022 01:10:38 -0300 Subject: [PATCH 86/97] Add extension zmq --- .env.example | 2 ++ docker-compose.yml | 2 ++ php-fpm/Dockerfile | 21 +++++++++++++++++++++ workspace/Dockerfile | 24 ++++++++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/.env.example b/.env.example index d09ac3ba..0c27f7cf 100644 --- a/.env.example +++ b/.env.example @@ -134,6 +134,7 @@ WORKSPACE_INSTALL_IMAP=false WORKSPACE_INSTALL_MONGO=false WORKSPACE_INSTALL_AMQP=false WORKSPACE_INSTALL_CASSANDRA=false +WORKSPACE_INSTALL_ZMQ=false WORKSPACE_INSTALL_GEARMAN=false WORKSPACE_INSTALL_MSSQL=false WORKSPACE_INSTALL_DRUSH=false @@ -228,6 +229,7 @@ PHP_FPM_INSTALL_IMAP=false PHP_FPM_INSTALL_MONGO=false PHP_FPM_INSTALL_AMQP=false PHP_FPM_INSTALL_CASSANDRA=false +PHP_FPM_INSTALL_ZMQ=false PHP_FPM_INSTALL_GEARMAN=false PHP_FPM_INSTALL_MSSQL=false PHP_FPM_INSTALL_SSH2=false diff --git a/docker-compose.yml b/docker-compose.yml index 4820ab40..696884d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,6 +86,7 @@ services: - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO} - INSTALL_AMQP=${WORKSPACE_INSTALL_AMQP} - INSTALL_CASSANDRA=${WORKSPACE_INSTALL_CASSANDRA} + - INSTALL_ZMQ=${WORKSPACE_INSTALL_ZMQ} - INSTALL_GEARMAN=${WORKSPACE_INSTALL_GEARMAN} - INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS} - INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL} @@ -226,6 +227,7 @@ services: - INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO} - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP} - INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA} + - INSTALL_ZMQ=${PHP_FPM_INSTALL_ZMQ} - INSTALL_GEARMAN=${PHP_FPM_INSTALL_GEARMAN} - INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL} - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH} diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 206dfa77..d6eff7e8 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1215,6 +1215,27 @@ RUN if [ ${DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL} = true ]; then \ sed -i 's,^\(CipherString[ ]*=\).*,\1'DEFAULT@SECLEVEL=1',g' /etc/ssl/openssl.cnf\ ;fi +########################################################################### +# zmq +########################################################################### + +USER root + +ARG INSTALL_ZMQ=false + +RUN if [ ${INSTALL_ZMQ} = true ]; then \ + apt-get install --yes git libzmq3-dev \ + && git clone git://github.com/mkoppanen/php-zmq.git \ + && cd php-zmq \ + && phpize \ + && ./configure \ + && make \ + && make install \ + && cd .. \ + && rm -fr php-zmq \ + && echo "extension=zmq.so" > /usr/local/etc/php/conf.d/zmq.ini \ +;fi + ########################################################################### # Check PHP version: ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 36364021..417069bd 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1707,6 +1707,30 @@ RUN if [ ${INSTALL_TRADER} = true ]; then \ && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/trader.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-trader.ini \ ;fi +# +#-------------------------------------------------------------------------- +# zmq +#-------------------------------------------------------------------------- +# + +USER root + +ARG INSTALL_ZMQ=false + +RUN if [ ${INSTALL_ZMQ} = true ]; then \ + apt-get install --yes git libzmq3-dev \ + && git clone git://github.com/mkoppanen/php-zmq.git \ + && cd php-zmq \ + && phpize \ + && ./configure \ + && make \ + && make install \ + && cd .. \ + && rm -fr php-zmq \ + && echo "extension=zmq.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/zmq.ini \ + && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/zmq.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-zmq.ini \ +;fi + # #-------------------------------------------------------------------------- # Final Touch From 11b93562c25a6bc53d41c9b406990fa15d0c1a58 Mon Sep 17 00:00:00 2001 From: YenHai Date: Tue, 8 Mar 2022 18:12:19 +0800 Subject: [PATCH 87/97] Fix sqlsrv latest not support PHP 7.3 --- workspace/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 36364021..08855abc 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1081,6 +1081,8 @@ RUN set -eux; \ pecl install pdo_sqlsrv-5.6.1 sqlsrv-5.6.1 \ ;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70200" ]; then \ pecl install pdo_sqlsrv-5.8.1 sqlsrv-5.8.1 \ + ;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70300" ]; then \ + pecl install pdo_sqlsrv-5.9.0 sqlsrv-5.9.0 \ ;else \ pecl install pdo_sqlsrv sqlsrv \ ;fi && \ From a28b5bfbe661efa865653f96a6b9be0bf7873300 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:52:46 +0000 Subject: [PATCH 88/97] Bump lodash-es from 4.17.15 to 4.17.21 in /react Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index 2fee6f6f..946dcb26 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -9315,9 +9315,9 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash-es": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz", - "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, "lodash._reinterpolate": { "version": "3.0.0", From ddd06fecfd75cfc34d8e1e1189da5e4baba49944 Mon Sep 17 00:00:00 2001 From: Tom Robertshaw Date: Sat, 19 Mar 2022 16:58:35 +0000 Subject: [PATCH 89/97] Do not install tokenizer into laravel-worker when php version is 8.1 --- laravel-horizon/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile index 0401b38a..49311f60 100644 --- a/laravel-horizon/Dockerfile +++ b/laravel-horizon/Dockerfile @@ -37,7 +37,12 @@ RUN apk --update add wget \ procps RUN pecl channel-update pecl.php.net; \ - docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl + docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ + php -m | grep -q 'tokenizer'; \ + else \ + docker-php-ext-install tokenizer; \ + fi # Add a non-root user to help install ffmpeg: ARG PUID=1000 From e8ea58a8ad50ad18c9fd2a01a085c6f8867db423 Mon Sep 17 00:00:00 2001 From: Kair Date: Fri, 25 Mar 2022 17:22:38 +0800 Subject: [PATCH 90/97] fix mongo description style wrong. --- DOCUMENTATION/content/documentation/index.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 5d5e6c59..83ddacd3 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -915,11 +915,7 @@ run from any cli:
`curl -X PURGE https://yourwebsite.com/`. // ... ], - - // ... - -], -``` + ``` 5 - Open your Laravel's `.env` file and update the following variables: From ae4e2319884877f0599ce09436b1211151cb1f78 Mon Sep 17 00:00:00 2001 From: Erik Niebla Date: Mon, 28 Mar 2022 11:41:36 -0500 Subject: [PATCH 91/97] Fix php-zmq link --- php-fpm/Dockerfile | 2 +- php-worker/Dockerfile | 2 +- workspace/Dockerfile | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index d6eff7e8..57578ebf 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -1225,7 +1225,7 @@ ARG INSTALL_ZMQ=false RUN if [ ${INSTALL_ZMQ} = true ]; then \ apt-get install --yes git libzmq3-dev \ - && git clone git://github.com/mkoppanen/php-zmq.git \ + && git clone https://github.com/zeromq/php-zmq.git \ && cd php-zmq \ && phpize \ && ./configure \ diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 8397681e..ee6d1890 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -5,7 +5,7 @@ # ARG LARADOCK_PHP_VERSION -FROM php:${LARADOCK_PHP_VERSION}-alpine3.15 +FROM php:${LARADOCK_PHP_VERSION}-alpine LABEL maintainer="Mahmoud Zalt " diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 6a243d5d..90893592 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -331,6 +331,7 @@ ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \ # Install the xdebug extension # https://xdebug.org/docs/compat + apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \ pecl install xdebug-3.1.2; \ else \ @@ -443,6 +444,7 @@ ARG INSTALL_MONGO=false RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension + apt-get install -yqq pkg-config && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ pecl install mongo; \ echo "extension=mongo.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/mongo.ini; \ @@ -543,11 +545,11 @@ ARG INSTALL_SWOOLE=false RUN set -eux; \ if [ ${INSTALL_SWOOLE} = true ]; then \ # Install Php Swoole Extension - if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ echo '' | pecl -q install swoole-2.0.10; \ - elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \ + elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ echo '' | pecl -q install swoole-4.3.5; \ - elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ + elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ echo '' | pecl -q install swoole-4.5.11; \ else \ echo '' | pecl -q install swoole; \ @@ -570,7 +572,7 @@ RUN set -eux; \ if [ $(php -r "echo PHP_MAJOR_VERSION;") != "5" ]; then \ echo '' | pecl -q install xlswriter && \ echo "extension=xlswriter.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini && \ - ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini; \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/xlswriter.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xlswriter.ini && \ php -m | grep -q 'xlswriter'; \ else \ echo "PHP Extension for xlswriter is not supported for PHP 5.0"; \ @@ -1721,7 +1723,7 @@ ARG INSTALL_ZMQ=false RUN if [ ${INSTALL_ZMQ} = true ]; then \ apt-get install --yes git libzmq3-dev \ - && git clone git://github.com/mkoppanen/php-zmq.git \ + && git clone https://github.com/zeromq/php-zmq.git \ && cd php-zmq \ && phpize \ && ./configure \ From cb77808a9413b10473e697578df9e00d0c0ccc69 Mon Sep 17 00:00:00 2001 From: Erik Niebla Date: Tue, 12 Apr 2022 16:42:36 -0500 Subject: [PATCH 92/97] Fix tests --- .env.example | 2 +- docker-compose.yml | 2 +- workspace/Dockerfile | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 0c27f7cf..1b396ce9 100644 --- a/.env.example +++ b/.env.example @@ -99,7 +99,7 @@ SHELL_OH_MY_ZSH_ALIASES=false WORKSPACE_BASE_IMAGE_TAG_PREFIX=latest WORKSPACE_COMPOSER_GLOBAL_INSTALL=true WORKSPACE_COMPOSER_VERSION=2 -WORKSPACE_COMPOSER_AUTH=false +WORKSPACE_COMPOSER_AUTH_JSON=false WORKSPACE_COMPOSER_REPO_PACKAGIST= WORKSPACE_NVM_NODEJS_ORG_MIRROR= WORKSPACE_INSTALL_NODE=true diff --git a/docker-compose.yml b/docker-compose.yml index 696884d7..70cef48e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -111,7 +111,7 @@ services: - INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS} - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL} - COMPOSER_VERSION=${WORKSPACE_COMPOSER_VERSION} - - COMPOSER_AUTH=${WORKSPACE_COMPOSER_AUTH} + - COMPOSER_AUTH_JSON=${WORKSPACE_COMPOSER_AUTH_JSON} - COMPOSER_REPO_PACKAGIST=${WORKSPACE_COMPOSER_REPO_PACKAGIST} - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH} - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY} diff --git a/workspace/Dockerfile b/workspace/Dockerfile index afc94950..a67bc201 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -159,10 +159,10 @@ RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \ ;fi # Check if auth file is disabled -ARG COMPOSER_AUTH=false -ENV COMPOSER_AUTH ${COMPOSER_AUTH} +ARG COMPOSER_AUTH_JSON=false +ENV COMPOSER_AUTH_JSON ${COMPOSER_AUTH_JSON} -RUN if [ ${COMPOSER_AUTH} = false ]; then \ +RUN if [ ${COMPOSER_AUTH_JSON} = false ]; then \ # remove the file rm /home/laradock/.composer/auth.json \ ;fi @@ -305,7 +305,7 @@ RUN set -eux; \ # SMB: ########################################################################### if [ ${INSTALL_SMB} = true ]; then \ - apt-get install -yqq smbclient php-smbclient coreutils; \ + apt-get install -yqq smbclient php${LARADOCK_PHP_VERSION}-smbclient coreutils; \ fi; \ ########################################################################### # IMAP: From c7eba246c91b0d4fbb64a491b5b15eae1b93583b Mon Sep 17 00:00:00 2001 From: PaolaRuby <79208489+PaolaRuby@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:16:52 -0500 Subject: [PATCH 93/97] Let choose alpine correct version --- laravel-horizon/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile index 49311f60..e35f8b06 100644 --- a/laravel-horizon/Dockerfile +++ b/laravel-horizon/Dockerfile @@ -5,7 +5,7 @@ # ARG LARADOCK_PHP_VERSION -FROM php:${LARADOCK_PHP_VERSION}-alpine3.15 +FROM php:${LARADOCK_PHP_VERSION}-alpine LABEL maintainer="Mahmoud Zalt " From 10b3906da4fc7a6c51adebb8328f042badaed004 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Apr 2022 15:53:50 +0000 Subject: [PATCH 94/97] Bump minimist from 1.2.5 to 1.2.6 in /react Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index 946dcb26..29edcd7e 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -9709,9 +9709,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "minimist-options": { "version": "4.1.0", From fe885ea1309cf32755b08b84e21b8face1bf4598 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 14:36:49 +0000 Subject: [PATCH 95/97] Bump async from 2.6.3 to 2.6.4 in /react Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] --- react/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react/package-lock.json b/react/package-lock.json index 29edcd7e..8b0f6391 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -2939,9 +2939,9 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==" }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "requires": { "lodash": "^4.17.14" } From bf0887c6751467ee0dc011db43cb9941e425f34b Mon Sep 17 00:00:00 2001 From: Afshin Tavakolian Date: Tue, 26 Apr 2022 15:07:08 +0430 Subject: [PATCH 96/97] Update .env.example 8.1 PHP-FPM was added to the samples --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 1b396ce9..3adafe94 100644 --- a/.env.example +++ b/.env.example @@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock ### PHP Version ########################################### # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). -# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 +# Accepted values: 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6 PHP_VERSION=7.4 ### Phalcon Version ########################################### From 4263de43fd43e3e816fb98908ac8179af222ecc5 Mon Sep 17 00:00:00 2001 From: Afshin Tavakolian Date: Tue, 26 Apr 2022 15:18:18 +0430 Subject: [PATCH 97/97] Update index.md 8.1 PHP-FPM was added to the samples --- DOCUMENTATION/content/introduction/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md index 689ab442..d1997b36 100644 --- a/DOCUMENTATION/content/introduction/index.md +++ b/DOCUMENTATION/content/introduction/index.md @@ -17,7 +17,7 @@ It supports a variety of common services, all pre-configured to provide a ready ## Features -- Easy switch between PHP versions: 8.0, 7.4, 7.3, 7.2, 7.1, 5.6... +- Easy switch between PHP versions: 8.1, 8.0, 7.4, 7.3, 7.2, 7.1, 5.6... - Choose your favorite database engine: MySQL, Postgres, MariaDB... - Run your own stack: Memcached, HHVM, RabbitMQ... - Each software runs on its own container: PHP-FPM, NGINX, PHP-CLI...