cleanup and review suggestions - makefile and links
Signed-off-by: Grant Birkinbine <grant.birkinbine@gmail.com>
This commit is contained in:
		| @@ -1,7 +0,0 @@ | |||||||
| make build: |  | ||||||
|  |  | ||||||
| 	echo "[#] Killing old docker processes" |  | ||||||
| 	docker-compose rm -fs |  | ||||||
|  |  | ||||||
| 	echo "[#] Building docker containers" |  | ||||||
| 	docker-compose up --build -d |  | ||||||
| @@ -37,11 +37,7 @@ The compose file defines an application with two services `nginx-proxy` and `fla | |||||||
| When deploying the application, docker-compose maps port 80 of the web service container to port 80 of the host as specified in the file. | When deploying the application, docker-compose maps port 80 of the web service container to port 80 of the host as specified in the file. | ||||||
| Make sure port 80 on the host is not being used by another container, otherwise the port should be changed. | Make sure port 80 on the host is not being used by another container, otherwise the port should be changed. | ||||||
|  |  | ||||||
| ## Build with Makefile (easy) | ## Deploy with docker-compose | ||||||
|  |  | ||||||
| Simply run `make build` to create the NGINX and Flask containers with `docker-compose`. You may also follow the steps below to use `docker-compose` natively. |  | ||||||
|  |  | ||||||
| ## Deploy with docker-compose (still easy) |  | ||||||
|  |  | ||||||
| ```bash | ```bash | ||||||
| $ docker-compose up -d | $ docker-compose up -d | ||||||
|   | |||||||
| @@ -9,8 +9,6 @@ services: | |||||||
|       - FLASK_SERVER_ADDR=flask-app:8000 |       - FLASK_SERVER_ADDR=flask-app:8000 | ||||||
|     ports: |     ports: | ||||||
|       - "80:80" |       - "80:80" | ||||||
|     links:  |  | ||||||
|       - flask-app |  | ||||||
|     depends_on: |     depends_on: | ||||||
|       - flask-app |       - flask-app | ||||||
|     healthcheck: |     healthcheck: | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user