From 832a5250656bfe0bf6baacfc77cc1947ab73ba15 Mon Sep 17 00:00:00 2001 From: lunardunno <126363523+lunardunno@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:40:05 +0400 Subject: [PATCH] improved code readability --- client/server_scripts/build_container.sh | 25 ++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/client/server_scripts/build_container.sh b/client/server_scripts/build_container.sh index 7b64e7e0..2d911758 100644 --- a/client/server_scripts/build_container.sh +++ b/client/server_scripts/build_container.sh @@ -1,7 +1,24 @@ if [ -n "$(docker --version 2>/dev/null | grep 'podman')" ]; then \ - sudo sh -c "if [ ! -d '/var/cache/containers' ]; then mkdir -m 700 -p /var/cache/containers; fi";\ - sudo sh -c "if [ ! -f '/var/cache/containers/short-name-aliases.conf' ]; then touch /var/cache/containers/short-name-aliases.conf; chmod 600 /var/cache/containers/short-name-aliases.conf; fi";\ - sudo sh -c "if ! grep -q '[aliases]' /var/cache/containers/short-name-aliases.conf; then echo '[aliases]' >> /var/cache/containers/short-name-aliases.conf; fi";\ - sudo sh -c "if ! grep -q ' # Amnezia start' /var/cache/containers/short-name-aliases.conf; then echo ' # Amnezia start\n \"3proxy/3proxy\" = \"docker.io/3proxy/3proxy\"\n \"amneziavpn/amnezia-wg\" = \"docker.io/amneziavpn/amnezia-wg\"\n \"amneziavpn/amneziawg-go\" = \"docker.io/amneziavpn/amneziawg-go\"\n \"amneziavpn/ipsec-server\" = \"docker.io/amneziavpn/ipsec-server\"\n \"amneziavpn/torpress\" = \"docker.io/amneziavpn/torpress\"\n \"atmoz/sftp\" = \"docker.io/atmoz/sftp\"\n \"mvance/unbound\" = \"docker.io/mvance/unbound\"\n \"alpine\" = \"docker.io/library/alpine\"\n # Amnezia finish' >> /var/cache/containers/short-name-aliases.conf; fi";\ + sudo sh -c "if [ ! -d '/var/cache/containers' ]; then \ + mkdir -m 700 -p /var/cache/containers; fi";\ + sudo sh -c "if [ ! -f '/var/cache/containers/short-name-aliases.conf' ]; then \ + touch /var/cache/containers/short-name-aliases.conf;\ + chmod 600 /var/cache/containers/short-name-aliases.conf; fi";\ + sudo sh -c "if ! grep -q '\[aliases\]' /var/cache/containers/short-name-aliases.conf; then \ + echo '[aliases]' >> /var/cache/containers/short-name-aliases.conf; fi";\ + sudo sh -c "if ! grep -q ' \# Amnezia start' /var/cache/containers/short-name-aliases.conf; then \ + cat >> /var/cache/containers/short-name-aliases.conf << EOF + # Amnezia start + \"3proxy/3proxy\" = \"docker.io/3proxy/3proxy\" + \"amneziavpn/amnezia-wg\" = \"docker.io/amneziavpn/amnezia-wg\" + \"amneziavpn/amneziawg-go\" = \"docker.io/amneziavpn/amneziawg-go\" + \"amneziavpn/ipsec-server\" = \"docker.io/amneziavpn/ipsec-server\" + \"amneziavpn/torpress\" = \"docker.io/amneziavpn/torpress\" + \"atmoz/sftp\" = \"docker.io/atmoz/sftp\" + \"mvance/unbound\" = \"docker.io/mvance/unbound\" + \"alpine\" = \"docker.io/library/alpine\" + # Amnezia finish +EOF + fi";\ fi;\ sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER