From b4ebbd52fa6c600aa99f47dcdf29ffca709772b8 Mon Sep 17 00:00:00 2001
From: "Prof. Nishanth Sastry" <n.sastry@surrey.ac.uk>
Date: Thu, 11 Mar 2021 21:22:20 +0000
Subject: [PATCH] fully dockerize and add network
---
Makefile | 42 ++++++++++++++++++++++++++++++++++++++++++
showtimes.py | 3 +--
2 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 Makefile
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1146cd9
--- /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 559f85c..bfdad72 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:
--
GitLab