V1.x merge

.env.default

@@ -1,9 +1,9 @@
 ###### > 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
+ALPINE_VERSION=3.14.2
 JEKYLL_VERSION=3.8
 VOLUMES_DRIVER=local
 NETWORKS_DRIVER=bridge

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

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;
@@ -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;

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