Improved consistency of enviromental variables and starting methods

README.md

@@ -16,4 +16,4 @@ WINDSCRIBE_COUNTRY is completely optional and LOCAL_PORT will need to be changed
 
 You can start docker with [`localproxy.sh`](https://github.com/jay-to-the-dee/Windscribe-HTTPproxy-dockerized/blob/master/localproxy.sh) script for the correct parameters to be passed to Docker.
 
-Or if you have Docker Compose installed you can just do `docker-compose up -d`.
+Or if you have Docker Compose installed you can just do `docker-compose up -d` (this is the preferred way).

docker-compose.yml

@@ -7,10 +7,10 @@ services:
       cap_add:
         - NET_ADMIN
       environment:
-        - WINDSCRIBE_COUNTRY=${WINDSCRIBE_COUNTRY}
         - WINDSCRIBE_USERNAME=${WINDSCRIBE_USERNAME}
         - WINDSCRIBE_PASSWORD=${WINDSCRIBE_PASSWORD}
         - HOST_PORT=${HOST_PORT:-8888} #Pass for echo purposes
+        - WINDSCRIBE_COUNTRY=${WINDSCRIBE_COUNTRY}
       dns:
         - 1.1.1.1
         - 1.0.0.1

env.sample

@@ -2,5 +2,5 @@ WINDSCRIBE_USERNAME=        # Insert Windscribe account username here
 WINDSCRIBE_PASSWORD=        # Corresponding account password
 
 #Optional
-LOCAL_PORT=                 # Local port number to run HTTP proxy on (8888 is default)
+LOCAL_PORT=                 # Local port number to run HTTP proxy on (8888 is default with docker-compose)
 WINDSCRIBE_COUNTRY=         # Change VPN server country (Current location as determined by Windscribe is default)

localproxy.sh

@@ -8,9 +8,10 @@ DNS2="1.0.0.1"
 
 docker run --rm -d \
 --cap-add=NET_ADMIN \
---env WINDSCRIBE_COUNTRY="$WINDSCRIBE_COUNTRY" \
 --env WINDSCRIBE_USERNAME \
 --env WINDSCRIBE_PASSWORD \
+--env HOST_PORT="$HOST_PORT" \
+--env WINDSCRIBE_COUNTRY="$WINDSCRIBE_COUNTRY" \
 -p $HOST_PORT:8888 \
 --dns "${DNS1}" \
 --dns "${DNS2}" \