diff --git a/.gitignore b/.gitignore index 82f9275..0609160 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Custom +docker/vpn + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/docker/docker-compose-vpn.yaml b/docker/docker-compose-vpn.yaml index b5454d8..2d37303 100644 --- a/docker/docker-compose-vpn.yaml +++ b/docker/docker-compose-vpn.yaml @@ -53,6 +53,6 @@ services: - /tmp - /var/cache/nginx volumes: - - ../nginx.conf:/etc/nginx/nginx.conf + - ./nginx.conf:/etc/nginx/nginx.conf restart: always logging: *default-logging diff --git a/scripts/start-docker-vpn.sh b/scripts/start-docker-vpn.sh index 9482eb6..e8f66db 100755 --- a/scripts/start-docker-vpn.sh +++ b/scripts/start-docker-vpn.sh @@ -3,4 +3,5 @@ cd $(dirname $0)/.. source env.sh cd docker -docker compose up -f docker-compose-vpn.yaml --build $@ +export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}-vpn +docker compose -f docker-compose-vpn.yaml up --build -d diff --git a/scripts/start-docker.sh b/scripts/start-docker.sh index 9234ced..e777e56 100755 --- a/scripts/start-docker.sh +++ b/scripts/start-docker.sh @@ -3,4 +3,4 @@ cd $(dirname $0)/.. source env.sh cd docker -docker compose up --build $@ +docker compose up --build -d diff --git a/scripts/stop-docker-vpn.sh b/scripts/stop-docker-vpn.sh new file mode 100755 index 0000000..20fe928 --- /dev/null +++ b/scripts/stop-docker-vpn.sh @@ -0,0 +1,7 @@ +#!/bin/bash +cd $(dirname $0)/.. +source env.sh +cd docker + +export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}-vpn +docker compose -f docker-compose-vpn.yaml down --remove-orphans diff --git a/scripts/stop-docker.sh b/scripts/stop-docker.sh new file mode 100755 index 0000000..cf6186a --- /dev/null +++ b/scripts/stop-docker.sh @@ -0,0 +1,6 @@ +#!/bin/bash +cd $(dirname $0)/.. +source env.sh +cd docker + +docker compose down --remove-orphans