Skip to content

Commit

Permalink
change docker-compose to compose
Browse files Browse the repository at this point in the history
  • Loading branch information
edgd1er committed Nov 21, 2024
1 parent 4a74724 commit 7e8be1c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ buildnc: ## build container with no cache

down: ## stop and delete container
@echo "stop and delete container"
docker compose -f docker-compose.yml down -v
docker compose -f compose.yml down -v

up: ## start container
@echo "start container"
docker compose -f docker-compose.yml up
docker compose -f compose.yml up

nordvpnt1: ##test nordvpn api calls
@echo "test nordvpn api: when no walues, then defaulting is your country +tcp"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ The container is expecting three parameters to select the vpn server:

# How to run the container

* Just copy/paste the grey text block starting with version 3.8. to a file named docker-compose.yml
* Just copy/paste the grey text block starting with version 3.8. to a file named compose.yml
* Set values for NORDVPN_TECHNOLOGY, NORDVPN_PROTOCOL, NORDVPN_COUNTRY
* adapt if needed LOCAL_NETWORK, TZ
* create file nordvpn_creds containing your login in the first line and your password in the second line.
Expand Down
12 changes: 6 additions & 6 deletions tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

set -uo pipefail
#var
HTTP_PORT=88$(grep -oP '(?<=\- "88)[^:]+' docker-compose.yml)
SOCK_PORT=10$(grep -oP '(?<=\- "10)[^:]+' docker-compose.yml)
HTTP_PORT=88$(grep -oP '(?<=\- "88)[^:]+' compose.yml)
SOCK_PORT=10$(grep -oP '(?<=\- "10)[^:]+' compose.yml)
PROXY_HOST="localhost"
FAILED=0
INTERVAL=4
CONTAINER=$(grep -A1 services docker-compose.yml | grep -oP "(?<= )[a-zA-Z]+")
CONTAINER=$(grep -A1 services compose.yml | grep -oP "(?<= )[a-zA-Z]+")
CURLOPTS="-4s"

#Functions
buildAndWait() {
echo "Stopping and removing running containers"
docker compose down -v
echo "Building and starting image"
docker compose -f docker-compose.yml up -d --build
docker compose -f compose.yml up -d --build
echo "Waiting for the container to be up.(every ${INTERVAL} sec)"
logs=""
n=0
Expand Down Expand Up @@ -54,8 +54,8 @@ testProxies() {
TCREDS="${usertiny}:${passtiny}@"
DCREDS=${TCREDS}
else
usertiny=$(grep -oP "(?<=- TINYUSER=)[^ ]+" docker-compose.yml)
passtiny=$(grep -oP "(?<=- TINYPASS=)[^ ]+" docker-compose.yml)
usertiny=$(grep -oP "(?<=- TINYUSER=)[^ ]+" compose.yml)
passtiny=$(grep -oP "(?<=- TINYPASS=)[^ ]+" compose.yml)
echo "Getting tinyCreds from compose: ${usertiny}:${passtiny}"
TCREDS="${usertiny}:${passtiny}@"
DCREDS=${TCREDS}
Expand Down

0 comments on commit 7e8be1c

Please sign in to comment.