bravo68web
/
docker-mirror
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Integration/Improvements' (#1) from impv into main 

Reviewed-on: #1
This commit is contained in:
Jyotirmoy Bandyopadhayaya 2023-01-15 07:19:46 +00:00
parent 52bf440b58 6b3406ccb9
commit 6e30be1352
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
run
View File

@ -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" 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 fi
elif [ ! -e "./data/cloudflared/home/.cloudflared/cert.pem" ]; then 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 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 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 --origincert /root/.cloudflared/cert.pem tunnel route dns $DOMAIN_NAME $DOMAIN_NAME
fi fi
if [ ! -e ./http-root/chaotic-aur ]; then if [ ! -e ./http-root/chaotic-aur ]; then
@ -70,7 +70,7 @@ gawk -i inplace '/<folder id="jhcrt-m2dra"/ {
1' ./data/syncthing/config.xml 1' ./data/syncthing/config.xml
if [ "$USE_TUNNELS" != "true" ]; then if [ "$USE_TUNNELS" != "true" ]; then
docker-compose -f docker-compose.yml up ${COMPOSEFLAGS-"-d"} docker compose -f docker-compose.yml up ${COMPOSEFLAGS-"-d"}
else else
docker-compose -f docker-compose-tunnels.yml up ${COMPOSEFLAGS-"-d"} docker compose -f docker-compose-tunnels.yml up ${COMPOSEFLAGS-"-d"}
fi fi

8
stop
View File

@ -8,9 +8,9 @@ if [[ $EUID -ne 0 ]]; then
fi fi
if [ -e "./data/cloudflared/home/.cloudflared/cert.pem" ]; then if [ -e "./data/cloudflared/home/.cloudflared/cert.pem" ]; then
docker-compose -f docker-compose-tunnels.yml down docker compose -f docker-compose-tunnels.yml down
docker-compose -f docker-compose.yml down docker compose -f docker-compose.yml down
else else
docker-compose -f docker-compose.yml down docker compose -f docker-compose.yml down
docker-compose -f docker-compose-tunnels.yml down docker compose -f docker-compose-tunnels.yml down
fi fi

4
update
View File

@ -33,9 +33,9 @@ fi
source .env source .env
if [ "$USE_TUNNELS" != "true" ]; then if [ "$USE_TUNNELS" != "true" ]; then
docker-compose -f docker-compose.yml pull docker compose -f docker-compose.yml pull
else else
docker-compose -f docker-compose-tunnels.yml pull docker compose -f docker-compose-tunnels.yml pull
fi fi
./run ./run