Move the 2.x branch to the master

Author: StaffNowa

.env.dist

@@ -139,8 +139,8 @@ XDEBUG_FILE_LINK_FORMAT="phpstorm://open?file=%f&line=%l"
 # Xdebug IDE configuration.
 PHP_IDE_CONFIG=serverName=symfony-docker
 
-# Node JS available versions: 4.x, 5.x, 6.x, 7.x, 8.x, 9.x, 10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x, 18.x, 19.x
-NODE_JS_VERSION=16.x
+# Node JS available versions: 4.x, 5.x, 6.x, 7.x, 8.x, 9.x, 10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x, 18.x, 19.x, 20.x
+NODE_JS_VERSION=20.x
 
 CLEAN_NGINX_LOGS=no
 CLEAN_SF_logs=no
@@ -169,11 +169,11 @@ IONCUBE=no
 
 EXTERNAL_NETWORK=no
 
-RABBITMQ_VERSION=3.11.13
-ELASTICSEARCH_VERSION=6.8.3
+RABBITMQ_VERSION=3.11.15
+ELASTICSEARCH_VERSION=6.8.23
 ELK_VERSION=7.16.0
-# MongoDB available versions: 4.2.24, 4.4.18, 5.0.15, 6.0.4
-MONGODB_VERSION=6.0.4
+# MongoDB available versions: 4.2.24, 4.4.21, 5.0.17, 6.0.5
+MONGODB_VERSION=6.0.5
 # wkhtmltopdf available versions: 0.12.3, 0.12.4, 0.12.5, 0.12.6
 WKHTMLTOPDF_VERSION=0.12.3
 

.github/workflows/releaser.yaml

@@ -46,15 +46,15 @@ jobs:
         run: go test -v ./...
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v3
         with:
           version: latest
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
       -
         name: Archive binaries
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           retention-days: 5
           path: dist

README.md

@@ -25,16 +25,6 @@ If you are running on Linux:
 sudo curl -L "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && sudo chmod +x /usr/local/bin/docker-compose
 ```
 
-## Install PWGen
-### Debian / Ubuntu
-```
-sudo apt-get install pwgen
-``` 
-### CentOS
-```
-wget http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/p/pwgen-2.08-1.el7.x86_64.rpm && rpm -ivh pwgen-2.08-1.el7.x86_64.rpm
-```
-
 # Configuration
 1. Create a `.env` from the `.env.dist` file. Adapt it according to your symfony application
 

commands/start.go

@@ -202,7 +202,7 @@ func doNginxBuild() {
 func doPhpBuild() {
 	util.Copy("config/php/Dockerfile.build", "config/php/Dockerfile")
 
-	packageList := []string{"gnupg1", "openssl", "git", "unzip", "libzip-dev", "nano", "libpng-dev", "libmagickwand-dev", "curl", "openssh-client", "less", "inkscape", "cron", "exiftool", "libicu-dev", "libmcrypt-dev", "libc-client-dev", "libkrb5-dev", "libssl-dev", "libxslt1-dev", "bash-completion"}
+	packageList := []string{"gnupg2", "openssl", "git", "unzip", "libzip-dev", "nano", "libpng-dev", "libmagickwand-dev", "curl", "openssh-client", "less", "inkscape", "cron", "exiftool", "libicu-dev", "libmcrypt-dev", "libc-client-dev", "libkrb5-dev", "libssl-dev", "libxslt1-dev", "bash-completion"}
 	peclInstall := []string{}
 	phpExtInstall := []string{"pdo", "pdo_mysql", "opcache", "zip", "gd", "mysqli", "exif", "bcmath", "calendar", "intl", "soap", "imap", "sockets", "xsl"}
 	phpExtEnable := []string{"mysqli", "calendar", "exif", "bcmath"}

config/nginx/Dockerfile.build

@@ -17,7 +17,7 @@ ARG PORT_PHP
 MAINTAINER Vasilij Dusko <support@d4d.lt>
 
 RUN apt-get update \
-	&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 \
+	&& apt-get install --no-install-recommends --no-install-suggests -y gnupg2 \
 	&& \
 	NGINX_GPGKEY=ABF5BD827BD9BF62; \
 	found=''; \
@@ -31,7 +31,7 @@ RUN apt-get update \
 		apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
 	done; \
 	test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
-	apt-get remove --purge -y gnupg1 && apt-get -y --purge autoremove && rm -rf /var/lib/apt/lists/* \
+	apt-get remove --purge -y gnupg2 && apt-get -y --purge autoremove && rm -rf /var/lib/apt/lists/* \
 	&& echo "deb http://nginx.org/packages/mainline/debian/ __DEBIAN_VERSION__ nginx" >> /etc/apt/sources.list \
 	&& apt-get update \
 	&& apt-get install --no-install-recommends --no-install-suggests -y \

config/php/Dockerfile.build

@@ -75,9 +75,9 @@ RUN docker-php-ext-configure zip --with-libzip && docker-php-ext-configure gd --
     && curl -L __CURL_INSECURE__ https://cs.symfony.com/download/php-cs-fixer-v3.phar -o /usr/bin/php-cs-fixer && chmod a+x /usr/bin/php-cs-fixer \
     && curl -L __CURL_INSECURE__ https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.3/local-php-security-checker_2.0.3_linux_amd64 -o /usr/bin/local-php-security-checker && chmod a+x /usr/bin/local-php-security-checker \
     && curl -L __CURL_INSECURE__ https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar -o /usr/local/bin/phpstan && chmod a+x /usr/local/bin/phpstan \
-    && curl -L __CURL_INSECURE__ https://deployer.org/deployer.phar -o /usr/local/bin/dep && chmod a+x /usr/local/bin/dep \
+    && curl -L __CURL_INSECURE__ https://github.com/deployphp/deployer/releases/latest/download/deployer.phar -o /usr/local/bin/dep && chmod a+x /usr/local/bin/dep \
 
-    && apt-get remove --purge -y gnupg1 \
+    && apt-get remove --purge -y gnupg2 \
     && apt-get -y --purge autoremove \
     __CLEANUP__