Consistency fix

SloCompTech · SloCompTech · commit 625777a40e12 · 2019-03-20T22:56:56.000+01:00
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@
 
 IMAGE_NAME=slocomptech/openvpn
 DATA_DIR=$(shell pwd)/data
-CONTAINER=ovpn
+CONTAINER_NAME=ovpn
 
 
 default: build
@@ -37,29 +37,29 @@ config:
 #
 setup:
 	@echo "Running temporary container"
-	docker run -it --cap-add NET_ADMIN -p 1194:1194/udp -v ${DATA_DIR}:/config --name ${CONTAINER} ${IMAGE_NAME}:latest 
+	docker run -it --cap-add NET_ADMIN -p 1194:1194/udp -v ${DATA_DIR}:/config --name ${CONTAINER_NAME} ${IMAGE_NAME}:latest 
 
 #
 #	Starts container
 #
 start:
-	docker start ${CONTAINER}
+	docker start ${CONTAINER_NAME}
 
 #
 #	Stops container
 #
 stop:
-	docker stop ${CONTAINER}
+	docker stop ${CONTAINER_NAME}
 
 #
 #	Restart container
 #
 restart:
-	docker restart ${CONTAINER}
+	docker restart ${CONTAINER_NAME}
 
 #
 #	Open terminal inside container
 #	Only when container is running
 #
 term:
-	docker exec -it ${CONTAINER} bash
+	docker exec -it ${CONTAINER_NAME} bash

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`IMAGE_NAME=slocomptech/openvpn`
`7`	`7`	`DATA_DIR=$(shell pwd)/data`
`8`		`-CONTAINER=ovpn`
	`8`	`+CONTAINER_NAME=ovpn`
`9`	`9`
`10`	`10`
`11`	`11`	`default: build`
`@@ -37,29 +37,29 @@ config:`
`37`	`37`	`#`
`38`	`38`	`setup:`
`39`	`39`	`@echo "Running temporary container"`
`40`		`- docker run -it --cap-add NET_ADMIN -p 1194:1194/udp -v ${DATA_DIR}:/config --name ${CONTAINER} ${IMAGE_NAME}:latest`
	`40`	`+ docker run -it --cap-add NET_ADMIN -p 1194:1194/udp -v ${DATA_DIR}:/config --name ${CONTAINER_NAME} ${IMAGE_NAME}:latest`
`41`	`41`
`42`	`42`	`#`
`43`	`43`	`# Starts container`
`44`	`44`	`#`
`45`	`45`	`start:`
`46`		`- docker start ${CONTAINER}`
	`46`	`+ docker start ${CONTAINER_NAME}`
`47`	`47`
`48`	`48`	`#`
`49`	`49`	`# Stops container`
`50`	`50`	`#`
`51`	`51`	`stop:`
`52`		`- docker stop ${CONTAINER}`
	`52`	`+ docker stop ${CONTAINER_NAME}`
`53`	`53`
`54`	`54`	`#`
`55`	`55`	`# Restart container`
`56`	`56`	`#`
`57`	`57`	`restart:`
`58`		`- docker restart ${CONTAINER}`
	`58`	`+ docker restart ${CONTAINER_NAME}`
`59`	`59`
`60`	`60`	`#`
`61`	`61`	`# Open terminal inside container`
`62`	`62`	`# Only when container is running`
`63`	`63`	`#`
`64`	`64`	`term:`
`65`		`- docker exec -it ${CONTAINER} bash`
	`65`	`+ docker exec -it ${CONTAINER_NAME} bash`