From 1ad67df25172182ea6a3dacb0518d186f99add1d Mon Sep 17 00:00:00 2001 From: Diego Lopes Date: Wed, 20 Oct 2021 16:51:48 -0300 Subject: [PATCH 1/6] Change version PHP 7 --- .env.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.default b/.env.default index 7740de2..310d66d 100644 --- a/.env.default +++ b/.env.default @@ -1,7 +1,7 @@ ###### > DEFAULT ########## SHELL=/bin/bash ELK_VERSION=6.2.4 -PHP_VERSION=7.4.20 +PHP_VERSION=7.4.24 PHP5_VERSION=5.6 ALPINE_VERSION=3.12 JEKYLL_VERSION=3.8 From 2229c213b8771de5a93d36a359a72c4aded4dc40 Mon Sep 17 00:00:00 2001 From: Diego Lopes Date: Wed, 20 Oct 2021 16:52:55 -0300 Subject: [PATCH 2/6] Change version ALPINE to 3.14.2 --- .env.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.default b/.env.default index 310d66d..d1b9778 100644 --- a/.env.default +++ b/.env.default @@ -3,7 +3,7 @@ SHELL=/bin/bash ELK_VERSION=6.2.4 PHP_VERSION=7.4.24 PHP5_VERSION=5.6 -ALPINE_VERSION=3.12 +ALPINE_VERSION=3.14.2 JEKYLL_VERSION=3.8 VOLUMES_DRIVER=local NETWORKS_DRIVER=bridge From 2bc283c4d20524376772e72b237480b6ae89578d Mon Sep 17 00:00:00 2001 From: Diego Lopes Date: Wed, 20 Oct 2021 16:58:56 -0300 Subject: [PATCH 3/6] Change script run.sh to alter parameters in apt command --- src/images/php/php-fpm/co-configure/run.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/images/php/php-fpm/co-configure/run.sh b/src/images/php/php-fpm/co-configure/run.sh index 9dad04b..d5ae016 100755 --- a/src/images/php/php-fpm/co-configure/run.sh +++ b/src/images/php/php-fpm/co-configure/run.sh @@ -4,16 +4,16 @@ source /usr/local/bin/co-configure/functions.sh function_print_banner "TOOLS"; cat /etc/os-release && \ - set -e; apt -qq update; apt install -qq -y --no-install-recommends apt-utils iputils-ping procps && \ - apt install -qq -y git unzip zlib1g-dev libpng-dev libjpeg-dev gettext-base libxml2-dev libzip-dev && \ - apt install -qq -y curl wget libmcrypt-dev default-mysql-client libicu-dev libpq-dev; + set -e; apt -q update; apt install -q -y --no-install-recommends apt-utils iputils-ping procps && \ + apt install -q -y git unzip zlib1g-dev libpng-dev libjpeg-dev gettext-base libxml2-dev libzip-dev && \ + apt install -q -y curl wget libmcrypt-dev default-mysql-client libicu-dev libpq-dev; function_print_banner "GIT CONFIG"; git config --global user.email "php-fpm@docker.noreply.internal" git config --global user.name "PHP FPM Docker Instance" function_print_banner "LIBS"; -apt install -qq -y libcurl4-openssl-dev pkg-config libssl-dev telnet vim netcat libonig-dev librabbitmq-dev; +apt install -q -y libcurl4-openssl-dev pkg-config libssl-dev telnet vim netcat libonig-dev librabbitmq-dev; function_print_banner "Pickle"; wget -q https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar && chmod +x pickle.phar && mv pickle.phar /usr/local/bin/pickle; From e6f3fcde935b8584523cd5dafc7fd4bbe78f5363 Mon Sep 17 00:00:00 2001 From: Diego Lopes Date: Wed, 20 Oct 2021 16:59:39 -0300 Subject: [PATCH 4/6] Change script run-dev.sh to alter parameters in apt command --- src/images/php/php-dev/co-configure/run-dev.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/images/php/php-dev/co-configure/run-dev.sh b/src/images/php/php-dev/co-configure/run-dev.sh index 6fb6555..cef6977 100755 --- a/src/images/php/php-dev/co-configure/run-dev.sh +++ b/src/images/php/php-dev/co-configure/run-dev.sh @@ -6,7 +6,7 @@ function_print_banner "xdebug"; function_pecl_install xdebug-2.7.2 && \ function_docker-php-ext-enable xdebug; -apt-get install -qq -y gcc g++ make gnupg2 libxslt-dev && \ +apt-get install -q -y gcc g++ make gnupg2 libxslt-dev && \ function_docker-php-ext-install xsl && \ function_docker-php-ext-install xmlrpc @@ -47,6 +47,6 @@ curl --compressed -o- -L https://yarnpkg.com/install.sh | bash && \ echo 'export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"' >> /root/.bashrc; #Extra Tools -apt-get install -qq -y rsync bash-completion +apt-get install -q -y rsync bash-completion function_end_build From d67cb3427575cba8e460ae52952c693536f21cb2 Mon Sep 17 00:00:00 2001 From: Diego Lopes Date: Wed, 20 Oct 2021 17:01:58 -0300 Subject: [PATCH 5/6] Change hash version PHP Composer --- src/images/php/php-fpm/co-configure/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/images/php/php-fpm/co-configure/run.sh b/src/images/php/php-fpm/co-configure/run.sh index d5ae016..9a51d7f 100755 --- a/src/images/php/php-fpm/co-configure/run.sh +++ b/src/images/php/php-fpm/co-configure/run.sh @@ -52,7 +52,7 @@ usermod --shell /bin/bash www-data && \ function_print_banner "Prepare Composer"; # https://getcomposer.org/download/ php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -php -r "if (hash_file('sha384', 'composer-setup.php') === '756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" +php -r "if (hash_file('sha384', 'composer-setup.php') === '906a84df04cea2aa72f40b5f787e49f22d4c2f19492ac310e8cba5b96ac8b64115ac402c8cd292b8a03482574915d1a8') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" php composer-setup.php php -r "unlink('composer-setup.php');" mv -v composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer; From cf329de91e00c6ece6b0486bcba66ce9faa6c648 Mon Sep 17 00:00:00 2001 From: Diego Lopes Date: Wed, 20 Oct 2021 17:06:48 -0300 Subject: [PATCH 6/6] Change script run-supervisor.sh to alter parameters in apt command --- src/images/php/php-supervisor/co-configure/run-supervisor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/images/php/php-supervisor/co-configure/run-supervisor.sh b/src/images/php/php-supervisor/co-configure/run-supervisor.sh index 0bfae70..2f7279f 100755 --- a/src/images/php/php-supervisor/co-configure/run-supervisor.sh +++ b/src/images/php/php-supervisor/co-configure/run-supervisor.sh @@ -3,6 +3,6 @@ source /usr/local/bin/co-configure/functions.sh function_print_banner "supervisor"; -apt-get install -qq -y supervisor +apt-get install -q -y supervisor function_end_build