From 2bd3d78fc96783a88e798e525285a25cc2e71e35 Mon Sep 17 00:00:00 2001 From: Jyotirmoy Bandyopadhayaya Date: Sun, 15 Jan 2023 07:15:43 +0000 Subject: [PATCH 1/3] Update 'run' --- run | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/run b/run index fde60e2..7e53c0f 100755 --- a/run +++ b/run @@ -30,9 +30,9 @@ if [ "$USE_TUNNELS" != "true" ]; then docker run -p 80:80 -p 443:443 --rm -v "$PWD/data/letsencrypt/etc:/etc/letsencrypt" -v "$PWD/data/letsencrypt/var:/var/lib/letsencrypt" certbot/certbot:${LETSENCRYPT_TAG:-latest} certonly --standalone --non-interactive --agree-tos --cert-name chaotic -n -m "$EMAIL" -d "$DOMAIN_NAME" fi elif [ ! -e "./data/cloudflared/home/.cloudflared/cert.pem" ]; then - docker-compose -f docker-compose-tunnels.yml run --rm cloudflared login - docker-compose -f docker-compose-tunnels.yml run --rm cloudflared --origincert /root/.cloudflared/cert.pem tunnel create $DOMAIN_NAME - docker-compose -f docker-compose-tunnels.yml run --rm cloudflared --origincert /root/.cloudflared/cert.pem tunnel route dns $DOMAIN_NAME $DOMAIN_NAME + docker compose -f docker-compose-tunnels.yml run --rm cloudflared login + docker compose -f docker-compose-tunnels.yml run --rm cloudflared --origincert /root/.cloudflared/cert.pem tunnel create $DOMAIN_NAME + docker compose -f docker-compose-tunnels.yml run --rm cloudflared --origincert /root/.cloudflared/cert.pem tunnel route dns $DOMAIN_NAME $DOMAIN_NAME fi if [ ! -e ./http-root/chaotic-aur ]; then @@ -70,7 +70,7 @@ gawk -i inplace '/ Date: Sun, 15 Jan 2023 07:16:18 +0000 Subject: [PATCH 2/3] Update 'stop' --- stop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stop b/stop index dd3fb82..c0ceadd 100755 --- a/stop +++ b/stop @@ -8,9 +8,9 @@ if [[ $EUID -ne 0 ]]; then fi if [ -e "./data/cloudflared/home/.cloudflared/cert.pem" ]; then - docker-compose -f docker-compose-tunnels.yml down - docker-compose -f docker-compose.yml down + docker compose -f docker-compose-tunnels.yml down + docker compose -f docker-compose.yml down else - docker-compose -f docker-compose.yml down - docker-compose -f docker-compose-tunnels.yml down + docker compose -f docker-compose.yml down + docker compose -f docker-compose-tunnels.yml down fi From 6b3406ccb9170ea8c301b97b6d5cf1feacb2c950 Mon Sep 17 00:00:00 2001 From: Jyotirmoy Bandyopadhayaya Date: Sun, 15 Jan 2023 07:16:59 +0000 Subject: [PATCH 3/3] Update 'update' --- update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update b/update index 136de4b..fb42093 100755 --- a/update +++ b/update @@ -33,9 +33,9 @@ fi source .env if [ "$USE_TUNNELS" != "true" ]; then - docker-compose -f docker-compose.yml pull + docker compose -f docker-compose.yml pull else - docker-compose -f docker-compose-tunnels.yml pull + docker compose -f docker-compose-tunnels.yml pull fi ./run