added support localhost and arch linux(pacman)

Author: damalis

README.md

@@ -23,7 +23,7 @@ Plus, manage docker containers with Portainer.
 <p align="left"> arm64/aarch64, x86-64 </p>
 
 #### Supported Linux Package Manage Systems:
-<p align="left"> apk, dnf, yum, apt/apt-get, zypper </p>
+<p align="left"> apk, dnf, yum, apt/apt-get, zypper, pacman </p>
 
 #### Supported Linux Operation Systems:
 <p align="left"> <a href="https://alpinelinux.org/" target="_blank" rel="noreferrer"> <img src="https://avatars.githubusercontent.com/u/7600810?s=200&v=4" alt="alpine linux" height="40" width="40"/> </a>&nbsp;&nbsp;&nbsp; 
@@ -33,7 +33,8 @@ Plus, manage docker containers with Portainer.
 <a href="https://ubuntu.com/" target="_blank" rel="noreferrer"> <img src="https://avatars.githubusercontent.com/u/4604537?s=200&v=4" alt="ubuntu" height="40" width="40"/> </a>&nbsp;&nbsp;&nbsp; 
 <a href="https://www.raspberrypi.com/" target="_blank" rel="noreferrer"> <img src="https://avatars.githubusercontent.com/u/1294177?s=200&v=4" alt="ubuntu" height="40" width="40"/> </a>&nbsp;&nbsp;&nbsp; 
 <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux" target="_blank" rel="noreferrer"> <img src="https://avatars.githubusercontent.com/u/33972111?s=200&v=4" alt="redhat on s390x (IBM Z)" height="40" width="40"/> </a>&nbsp;&nbsp;&nbsp; 
-<a href="https://www.suse.com/products/server/" target="_blank" rel="noreferrer"> <img src="https://avatars.githubusercontent.com/u/623819?s=200&v=4" alt="opensuse on s390x (IBM Z)" height="40" width="40"/> </a> </p>
+<a href="https://www.suse.com/products/server/" target="_blank" rel="noreferrer"> <img src="https://avatars.githubusercontent.com/u/623819?s=200&v=4" alt="opensuse on s390x (IBM Z)" height="40" width="40"/> </a>
+<a href="https://archlinux.org/" target="_blank" rel="noreferrer"> <img src="https://gitlab.archlinux.org/uploads/-/system/group/avatar/23/iconfinder_archlinux_386451.png?width=48" alt="arch linux" height="40" width="40"/> </a> </p>
 
 ##### Note: Fedora 37, 39 and alpine linux x86-64 compatible, could not try sles IBM Z s390x, rhel IBM Z s390x and raspberrypi.
 
@@ -132,9 +133,9 @@ DIRECTORY_PATH=```pwd``` at command line\
 DATABASE_IMAGE_NAME=```mariadb``` or ```mysql```\
 DATABASE_CONT_NAME=```mariadb```, ```mysql``` or ```custom name```\
 DATABASE_PACKAGE_MANAGER=```apt-get update && apt-get install -y gettext-base``` for mariadb, ```microdnf install -y gettext``` for mysql\
-DATABASE_AUTHENTICATION_PLUGIN=```mysql_native_password``` for mariadb, ```caching_sha2_password``` for mysql\
 DATABASE_ADMIN_COMMANDLINE=```mariadb-admin``` for mariadb, ```mysqladmin``` for mysql\
-VARNISH_VERSION=```latest``` for centos version 9+ and fedora, ```stable``` for the others
+SSL_SNIPPET=```echo 'Generated Self-signed SSL Certificate for localhost'``` for localhost\
+SSL_SNIPPET=```certbot certonly --webroot --webroot-path /tmp/acme-challenge --rsa-key-size 4096 --non-interactive --agree-tos --no-eff-email --force-renewal --email ${LETSENCRYPT_EMAIL} -d ${DOMAIN_NAME} -d www.${DOMAIN_NAME}``` for remotehost
 
 and
 
@@ -146,7 +147,7 @@ change example.com to your domain name in ```./phpmyadmin/apache2/sites-availabl
 ```
 cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmyadmin/sql/create_tables.sql.template
 ```
-change pma_controluser, db_authentication_plugin and db_authentication_password in ```./database/phpmyadmin/sql/create_tables.sql.template``` file.
+change pma_controluser and db_authentication_password in ```./database/phpmyadmin/sql/create_tables.sql.template``` file.
 
 ### Installation
 
@@ -156,6 +157,8 @@ Firstly: will create external volume
 docker volume create --driver local --opt type=none --opt device=${PWD}/certbot --opt o=bind certbot-etc
 ```
 
+localhost ssl: Generate Self-signed SSL Certificate with guide [mkcert repository](https://github.com/FiloSottile/mkcert).
+
 ```
 docker compose up -d
 ```

database/phpmyadmin/sql/create_tables.sql.template.example

@@ -26,7 +26,7 @@ USE phpmyadmin;
 --
 -- CREATE USER IF NOT EXISTS for phpmyadmin database
 --
-CREATE USER IF NOT EXISTS 'pma_controluser'@'%' IDENTIFIED WITH db_authentication_plugin db_authentication_password;
+CREATE USER IF NOT EXISTS 'pma_controluser'@'%' IDENTIFIED BY 'db_authentication_password';
 
 --
 -- Privileges

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
 
     symfony:
@@ -32,13 +30,13 @@ services:
             test: ["CMD-SHELL", "/bin/pidof php-fpm > /dev/null || exit 1"]
             interval: 5s
             timeout: 5s
-            retries: 50
+            retries: 100
         environment:
             TZ: '${LOCAL_TIMEZONE}'
         labels:
             - 'docker-volume-backup.stop-during-backup=true'
         command: >
-            bash -c "apt-get update && sh /tmp/packagecheck.sh 'zip unzip' && curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - | sh -s intl pdo_mysql && if pecl install -p -- redis; then pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis; fi; curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer && 
+            bash -c "apt-get update && sh /tmp/packagecheck.sh 'zip unzip' && curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - | sh -s intl pdo_mysql redis && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer && 
             if [ -f \"${WEBSERVER_DOC_ROOT}/.env\" ]; then composer update --working-dir=${WEBSERVER_DOC_ROOT}; else rm -f ${WEBSERVER_DOC_ROOT}/README.md && composer create-project symfony/skeleton . --working-dir=${WEBSERVER_DOC_ROOT} && composer require --working-dir=${WEBSERVER_DOC_ROOT} ${SKELETON_WEBAPP}; fi; 
             grep -qe 'date.timezone = ${LOCAL_TIMEZONE}' ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini || echo 'date.timezone = ${LOCAL_TIMEZONE}' >> ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini; php-fpm"
 
@@ -94,8 +92,7 @@ services:
             retries: 20
         environment:
             TZ: '${LOCAL_TIMEZONE}'
-        entrypoint: /bin/sh -c "certbot certonly --webroot --webroot-path /tmp/acme-challenge --rsa-key-size 4096 --non-interactive --agree-tos --no-eff-email --force-renewal --email ${LETSENCRYPT_EMAIL} -d ${DOMAIN_NAME} -d www.${DOMAIN_NAME}; 
-            trap exit TERM; while :; do certbot renew --dry-run; sleep 12h & wait $${!}; done;"
+        entrypoint: /bin/sh -c "${SSL_SNIPPET}; trap exit TERM; while :; do certbot renew --dry-run; sleep 12h & wait $${!}; done;"
 
     phpmyadmin:
         depends_on:
@@ -178,7 +175,7 @@ services:
             - "docker-volume-backup.stop-during-backup=true"
             - "docker-volume-backup.archive-pre=/bin/sh -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --all-databases > /tmp/backup/db_backup_data.sql'"
             - "docker-volume-backup.exec-label=database"
-        command: bash -c "${DATABASE_PACKAGE_MANAGER} && export PMA_CONTROLUSER=${PMA_CONTROLUSER} export PMA_CONTROLPASS=${PMA_CONTROLPASS} && envsubst '$$PMA_CONTROLUSER,$$PMA_CONTROLPASS' < /docker-entrypoint-initdb.d/create_tables.sql.template > /docker-entrypoint-initdb.d/create_tables.sql && docker-entrypoint.sh --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=${DATABASE_AUTHENTICATION_PLUGIN}"
+        command: bash -c "${DATABASE_PACKAGE_MANAGER} && export PMA_CONTROLUSER=${PMA_CONTROLUSER} export PMA_CONTROLPASS=${PMA_CONTROLPASS} && envsubst '$$PMA_CONTROLUSER,$$PMA_CONTROLPASS' < /docker-entrypoint-initdb.d/create_tables.sql.template > /docker-entrypoint-initdb.d/create_tables.sql && docker-entrypoint.sh --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci"
 
     redis:
         image: redis:latest

env.example

@@ -6,6 +6,7 @@ DIRECTORY_PATH=directory_path
 
 LETSENCRYPT_EMAIL=email@domain.com
 LETSENCRYPT_CONF_PREFIX=/etc/letsencrypt
+SSL_SNIPPET=ssl_snippet
 
 PHP_IMAGE_NAME=php:fpm
 PHP_INI_DIR_PREFIX=/usr/local/etc
@@ -21,7 +22,6 @@ DATABASE_IMAGE_NAME=which_db
 DATABASE_CONT_NAME=which_db
 DATABASE_VERSION=latest
 DATABASE_PACKAGE_MANAGER=db_package_manager
-DATABASE_AUTHENTICATION_PLUGIN=db_authentication_plugin
 DATABASE_ADMIN_COMMANDLINE=db_admin_commandline
 
 PMA_CONTROLUSER=pma_username
@@ -35,4 +35,4 @@ APACHE_CONFDIR_PREFIX=/etc/apache2
 
 REDIS_CONF_PREFIX=/usr/local/etc
 
-SKELETON_WEBAPP=symfony/webapp-pack
+SKELETON_WEBAPP=webapp

install.sh

@@ -12,12 +12,13 @@ sleep 2
 
 # the "lpms" is an abbreviation of Linux Package Management System
 lpms=""
-for i in apk dnf yum apt zypper
+for i in apk dnf yum apt zypper pacman
 do
 	if [ -x "$(command -v $i)" ]; then
 		if [ "$i" == "apk" ]
 		then
 			lpms=$i
+			sudo apk add --no-cache --upgrade grep
 			break
 		elif [ "$i" == "dnf" ] && ([[ $(grep -Pow 'ID=\K[^;]*' /etc/os-release | tr -d '"') == "fedora" ]] || (([[ $(grep -Pow 'ID=\K[^;]*' /etc/os-release | tr -d '"') != "centos" ]] && [[ $(grep -Pow 'ID_LIKE=\K[^;]*' /etc/os-release | tr -d '"') == *"fedora"* ]]) || ([[ $(grep -Pow 'ID_LIKE=\K[^;]*' /etc/os-release | tr -d '"') == *"rhel"* ]] && [ $(sudo uname -m) == "s390x" ])))
 		then
@@ -32,6 +33,10 @@ do
 			lpms=$i
 			break
 		elif [[ $(grep -Pow 'ID_LIKE=\K[^;]*' /etc/os-release) == *"suse"* ]]
+		then
+			lpms=$i
+			break
+		elif [ "$i" == "pacman" ]
 		then
 			lpms=$i
 			break
@@ -77,6 +82,9 @@ then
 	then
 		sudo zypper remove docker docker-client docker-client-latest docker-common docker-latest docker-latest-logrotate docker-logrotate docker-engine runc
 	fi
+elif [ "$lpms" == "pacman" ]
+then
+	sudo pacman -Rssn podman-docker podman-compose
 else
 	echo ""
 	echo "could not be detected package management system"
@@ -165,6 +173,10 @@ then
 
 	#Installed=`sudo apt-cache policy docker-ce | sed -n '2p' | cut -c 14-`
 	#Candidate=`sudo apt-cache policy docker-ce | sed -n '3p' | cut -c 14-`
+elif [ "$lpms" == "pacman" ]
+then
+	sudo pacman -Syu --noconfirm
+	sudo pacman -Ss docker docker-buildx
 else
 	echo ""
 	echo "could not be detected package management system"
@@ -221,13 +233,13 @@ echo "======================================================================="
 echo ""
 echo ""
 echo "======================================================================="
-echo "| Installing Docker Compose v2.23.3..."
+echo "| Installing Docker Compose v2.32.4..."
 echo "======================================================================="
 echo ""
 sleep 2
 
 sudo mkdir -p /usr/local/lib/docker/cli-plugins
-sudo curl -SL "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/lib/docker/cli-plugins/docker-compose
+sudo curl -SL "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/lib/docker/cli-plugins/docker-compose
 sudo chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
 
 echo ""
@@ -251,31 +263,102 @@ echo ""
 echo "Done ✓"
 echo "======================================================================="
 
+clear
 ##########
 # Setup project variables
 ##########
 echo ""
-echo ""
 echo "======================================================================="
 echo "| Please enter project related variables..."
 echo "======================================================================="
 echo ""
 sleep 2
 
+# set the host
+which_h=""
+items=("localhost" "remotehost")
+PS3="which computer command line are you on? Select the host: "
+select h in "${items[@]}"
+do
+	case $REPLY in
+		1)
+			which_h=$h
+			break;;
+		2)
+			which_h=$h
+			break;;
+		*)
+			echo "Invalid choice $REPLY";;
+	esac
+done
+echo "Ok."
+
 # set your domain name
-domain_name=""
-read -p 'Enter Domain Name(e.g. : example.com): ' domain_name
+if [ "$which_h" == "localhost" ]
+then
+	read -p 'Enter Domain Name(default : localhost or e.g. : example.com): ' domain_name
+	: ${domain_name:=localhost}
+	[ "$domain_name" != "localhost" ] && sudo -- sh -c -e "grep -Eq '$domain_name' /etc/hosts || echo '127.0.0.1  $domain_name' >> /etc/hosts"
+else
+	domain_name=""
+	read -p 'Enter Domain Name(e.g. : example.com): ' domain_name
+	#[ "$domain_name" != "localhost" ] && sudo -- sh -c -e "sed -i '/$domain_name/d' /etc/hosts"
+fi
 [ -z $domain_name ] && domain_name="NULL"
 host -N 0 $domain_name 2>&1 > /dev/null
 while [ $? -ne 0 ]
 do
 	echo "Try again"
-	read -p 'Enter Domain Name(e.g. : example.com): ' domain_name
+	sudo -- sh -c -e "sed -i '/$domain_name/d' /etc/hosts"
+	if [ "$which_h" == "localhost" ]
+	then
+		read -p 'Enter Domain Name(default : localhost or e.g. : example.com): ' domain_name
+		: ${domain_name:=localhost}
+		[ "$domain_name" != "localhost" ] && sudo -- sh -c -e "grep -Eq '$domain_name' /etc/hosts || echo '127.0.0.1  $domain_name' >> /etc/hosts"
+	else
+		read -p 'Enter Domain Name(e.g. : example.com): ' domain_name
+		#[ "$domain_name" != "localhost" ] && sudo -- sh -c -e "sed -i '/$domain_name/d' /etc/hosts"
+	fi
 	[ -z $domain_name ] && domain_name="NULL"
 	host -N 0 $domain_name 2>&1 > /dev/null
 done
 echo "Ok."
 
+ssl_snippet=""
+if [ "$which_h" == "localhost" ]
+then
+	ssl_snippet="echo 'Generated Self-signed SSL Certificate for localhost'"
+	if [ "$lpms" == "apk" ]
+	then
+		sudo apk add --no-cache nss-tools go git
+	elif [ "$lpms" == "dnf" ]
+	then
+		sudo dnf install nss-tools go git
+	elif [ "$lpms" == "yum" ]
+	then
+		sudo yum install nss-tools go git
+	elif [ "$lpms" == "zypper" ]
+	then
+		sudo zypper install mozilla-nss-tools go git
+	elif [ "$lpms" == "apt" ]
+	then
+		sudo apt install libnss3-tools go git
+	elif [ "$lpms" == "pacman" ]
+	then
+		sudo pacman -S nss go git
+	else
+		echo ""
+		echo "could not be detected package management system"
+		echo ""
+		exit 0
+	fi
+	sudo rm -Rf mkcert && git clone https://github.com/FiloSottile/mkcert && cd mkcert && go build -ldflags "-X main.Version=$(git describe --tags)"
+	sudo mkcert -uninstall && mkcert -install && mkcert -key-file privkey.pem -cert-file chain.pem $domain_name *.$domain_name && sudo cat privkey.pem chain.pem > fullchain.pem && sudo mkdir -p ../certbot/live/$domain_name && sudo mv *.pem ../certbot/live/$domain_name && cd ..
+	echo "Ok."
+else
+	ssl_snippet="certbot certonly --webroot --webroot-path \/tmp\/acme-challenge --rsa-key-size 4096 --non-interactive --agree-tos --no-eff-email --force-renewal --email \$\{LETSENCRYPT_EMAIL\} -d \$\{DOMAIN_NAME\} -d www.\$\{DOMAIN_NAME\}"
+fi
+
 # set parameters in env.example file
 email=""
 regex="^[a-zA-Z0-9\._-]+\@[a-zA-Z0-9._-]+\.[a-zA-Z]+\$"
@@ -351,8 +434,7 @@ done
 echo "Ok."
 
 which_db=""
-db_authentication_plugin="mysql_native_password"
-db_authentication_password="USING PASSWORD('"$pma_password"')"
+db_authentication_password=$pma_password
 db_package_manager="apt-get update \&\& apt-get install -y gettext-base"
 db_admin_commandline="mariadb-admin"
 PS3="Select the database: "
@@ -361,8 +443,6 @@ do
 	which_db=$db
 	if [ $REPLY -eq 2 ]
 	then
-		db_authentication_plugin="caching_sha2_password"
-		db_authentication_password="BY '"$pma_password"'"
 		db_package_manager="microdnf install -y gettext"
 		db_admin_commandline="mysqladmin"
 	fi
@@ -390,24 +470,23 @@ echo "Ok."
 
 read -p "Apply changes (y/n)? " choice
 case "$choice" in
-  y|Y ) echo "Yes! Proceeding now...";;
+  y|Y ) clear; echo ""; echo "Yes! Proceeding now...";;
   n|N ) echo "No! Aborting now..."; exit 0;;
   * ) echo "Invalid input! Aborting now..."; exit 0;;
 esac
 
-cp ./phpmyadmin/apache2/sites-available/default-ssl.sample.conf ./phpmyadmin/apache2/sites-available/default-ssl.conf
-cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmyadmin/sql/create_tables.sql.template
+\cp ./phpmyadmin/apache2/sites-available/default-ssl.sample.conf ./phpmyadmin/apache2/sites-available/default-ssl.conf
+\cp ./database/phpmyadmin/sql/create_tables.sql.template.example ./database/phpmyadmin/sql/create_tables.sql.template
 
-cp env.example .env
+\cp env.example .env
 
-sed -i 's/db_authentication_plugin/'$db_authentication_plugin'/' ./database/phpmyadmin/sql/create_tables.sql.template
 sed -i "s/db_authentication_password/${db_authentication_password}/" ./database/phpmyadmin/sql/create_tables.sql.template
-sed -i 's/db_authentication_plugin/'$db_authentication_plugin'/' .env
 sed -i "s|db_package_manager|${db_package_manager}|" .env
 sed -i 's/db_admin_commandline/'$db_admin_commandline'/' .env
 sed -i 's/example.com/'$domain_name'/' .env
 sed -i 's/example.com/'$domain_name'/g' ./phpmyadmin/apache2/sites-available/default-ssl.conf
 sed -i 's/email@domain.com/'$email'/' .env
+sed -i "s/ssl_snippet/$ssl_snippet/" .env
 sed -i 's/which_db/'$which_db'/g' .env
 sed -i 's/db_username/'$db_username'/g' .env
 sed -i 's/db_password/'$db_password'/g' .env

phpmyadmin/apache2/sites-available/default-ssl.sample.conf

@@ -33,7 +33,7 @@
                 #   /usr/share/doc/apache2/README.Debian.gz for more info.
                 #   If both key and certificate are stored in the same file, only the
                 #   SSLCertificateFile directive is needed.
-                SSLCertificateFile	/etc/letsencrypt/live/example.com/cert.pem
+                SSLCertificateFile	/etc/letsencrypt/live/example.com/fullchain.pem
                 SSLCertificateKeyFile /etc/letsencrypt/live/example.com/privkey.pem
 
                 #   Server Certificate Chain:

portainer-docker-compose.yml

@@ -1,8 +1,6 @@
-version: '3.7'
- 
 services:
     portainer:
-        image: portainer/portainer-ce
+        image: portainer/portainer-ce:latest
         container_name: portainer
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock