diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..1146cd92a441b7f588a3f87a5e92021b33c5dc35 --- /dev/null +++ b/Makefile @@ -0,0 +1,42 @@ +#barebones makefile + +clean: cleanmovieservice cleanstservice cleannetwork + +all: movieservice stservice network + +movieservice: buildmovieservice runmovieservice + +buildmovieservice: + docker build -t movies-img -f movieservice/Dockerfile . + +runmovieservice: + docker run --name movieservice -p 5001:5001 -itd movies-img + +cleanmovieservice: + -docker stop movieservice + -docker rm movieservice + -docker rmi movies-img + + +stservice: buildstservice runstservice + +buildstservice: + docker build -t stservice-img -f stservice/Dockerfile . + +runstservice: + docker run --name stservice -p 5002:5002 -itd stservice-img + +cleanstservice: cleannetwork + -docker stop stservice + -docker rm stservice + -docker rmi stservice-img + +network: + docker network create microservices-net + docker network connect microservices-net stservice + docker network connect microservices-net movieservice + +cleannetwork: + -docker network disconnect microservices-net stservice + -docker network disconnect microservices-net movieservice + -docker network rm microservices-net diff --git a/showtimes.py b/showtimes.py index 559f85c7d88515d6e133d30e1e771e99cb406fdb..bfdad724fab06016757db7d1505a274733e407a5 100644 --- a/showtimes.py +++ b/showtimes.py @@ -4,9 +4,8 @@ import json import requests import os - app = Flask(__name__) -movies_service = "http://127.0.0.1:5001/movies/{}" +movies_service = "http://movieservice:5001/movies/{}" showtimes_db = f"{os.getcwd()}/database/showtimes.json" with open(showtimes_db, "r") as f: