From 73be5f3815b8a94255d4fad0effcc3b406aa8ab6 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 17 Jul 2019 12:39:41 +0000 Subject: [PATCH 1/7] generators working but incomplete --- Dockerfile | 0 num_gen/Dockerfile | 4 ++++ num_gen/num_gen.py | 11 +++++++++++ num_gen/num_gen.py.save | 10 ++++++++++ prize_gen/Dockerfile | 5 +++++ prize_gen/prize_gen.py | 18 ++++++++++++++++++ server/Dockerfile | 0 text_gen/Dockerfile | 4 ++++ text_gen/text_gen.py | 13 +++++++++++++ 9 files changed, 65 insertions(+) create mode 100644 Dockerfile create mode 100644 num_gen/Dockerfile create mode 100644 num_gen/num_gen.py create mode 100644 num_gen/num_gen.py.save create mode 100644 prize_gen/Dockerfile create mode 100644 prize_gen/prize_gen.py create mode 100644 server/Dockerfile create mode 100644 text_gen/Dockerfile create mode 100644 text_gen/text_gen.py diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/num_gen/Dockerfile b/num_gen/Dockerfile new file mode 100644 index 0000000..672e3ea --- /dev/null +++ b/num_gen/Dockerfile @@ -0,0 +1,4 @@ +FROM python +COPY . . +RUN pip install flask +ENTRYPOINT ["python", "num_gen.py"] diff --git a/num_gen/num_gen.py b/num_gen/num_gen.py new file mode 100644 index 0000000..8df791b --- /dev/null +++ b/num_gen/num_gen.py @@ -0,0 +1,11 @@ +from flask import Flask, jsonify, make_response +from random import randint +num_gen = Flask(__name__) + +@num_gen.route('/num_gen/', methods=['GET']) +def num_gen_method(): + rand = randint(100000,999999) + return jsonify({"Random Number":rand}) + +if __name__ == '__main__': + num_gen.run(host='0.0.0.0', port=9017) diff --git a/num_gen/num_gen.py.save b/num_gen/num_gen.py.save new file mode 100644 index 0000000..371181d --- /dev/null +++ b/num_gen/num_gen.py.save @@ -0,0 +1,10 @@ +from flask import Flask, jsonify, make_response +from random import randint +num_gen = Flask(__name__) + +@num_gen.route('/num_gen/', methods=['GET']) +def num_gen_method(999999): + rand = randint(100000,999999) + return jsonify({"Random Number":rand}) + + diff --git a/prize_gen/Dockerfile b/prize_gen/Dockerfile new file mode 100644 index 0000000..96e8787 --- /dev/null +++ b/prize_gen/Dockerfile @@ -0,0 +1,5 @@ +FROM python:latest +COPY . . +RUN pip install flask +RUN pip install requests +ENTRYPOINT ["python", "prize_gen.py"] diff --git a/prize_gen/prize_gen.py b/prize_gen/prize_gen.py new file mode 100644 index 0000000..4a491c2 --- /dev/null +++ b/prize_gen/prize_gen.py @@ -0,0 +1,18 @@ +from flask import Flask, jsonify, make_response +import random +from random import randrange +prize_gen = Flask(__name__) + + +@prize_gen.route('/prize_gen/', methods=['GET']) +def reset(prob=25): + prize=50 + percent = random.randrange(100) + if prob > percent: + return jsonify({"User has won":prize}) + else: + return "No prize for you" + + +if __name__ == '__main__': + prize_gen.run(host='0.0.0.0', port=5000) diff --git a/server/Dockerfile b/server/Dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/text_gen/Dockerfile b/text_gen/Dockerfile new file mode 100644 index 0000000..179d0c9 --- /dev/null +++ b/text_gen/Dockerfile @@ -0,0 +1,4 @@ +FROM python +COPY . . +RUN pip install flask +ENTRYPOINT ["python", "text_gen.py"] diff --git a/text_gen/text_gen.py b/text_gen/text_gen.py new file mode 100644 index 0000000..8a39c52 --- /dev/null +++ b/text_gen/text_gen.py @@ -0,0 +1,13 @@ +from flask import Flask, jsonify, make_response +import random +import string +text_gen = Flask(__name__) + + +@text_gen.route('/text_gen/', methods=['GET']) +def text_gen_method(): + rand = random.choice(string.ascii_lowercase) + return jsonify({"Random string":rand}) + +if __name__ == '__main__': + text_gen.run(host='0.0.0.0', port=9017) From 1737e2e98d09d3b44db96af1ebdc4cf8152354f9 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 17 Jul 2019 13:21:59 +0000 Subject: [PATCH 2/7] all implementations built --- num_gen/{num_gen.py => num_gen1.py} | 0 num_gen/{num_gen.py.save => num_gen2.py} | 7 ++++--- prize_gen/Dockerfile | 3 ++- prize_gen/{prize_gen.py => prize_gen1.py} | 0 prize_gen/prize_gen2.py | 18 ++++++++++++++++++ text_gen/{text_gen.py => text_gen1.py} | 3 ++- text_gen/text_gen2.py | 14 ++++++++++++++ 7 files changed, 40 insertions(+), 5 deletions(-) rename num_gen/{num_gen.py => num_gen1.py} (100%) rename num_gen/{num_gen.py.save => num_gen2.py} (59%) rename prize_gen/{prize_gen.py => prize_gen1.py} (100%) create mode 100644 prize_gen/prize_gen2.py rename text_gen/{text_gen.py => text_gen1.py} (78%) create mode 100644 text_gen/text_gen2.py diff --git a/num_gen/num_gen.py b/num_gen/num_gen1.py similarity index 100% rename from num_gen/num_gen.py rename to num_gen/num_gen1.py diff --git a/num_gen/num_gen.py.save b/num_gen/num_gen2.py similarity index 59% rename from num_gen/num_gen.py.save rename to num_gen/num_gen2.py index 371181d..42cf595 100644 --- a/num_gen/num_gen.py.save +++ b/num_gen/num_gen2.py @@ -3,8 +3,9 @@ num_gen = Flask(__name__) @num_gen.route('/num_gen/', methods=['GET']) -def num_gen_method(999999): - rand = randint(100000,999999) +def num_gen_method(): + rand = randint(10000000,99999999) return jsonify({"Random Number":rand}) - +if __name__ == '__main__': + num_gen.run(host='0.0.0.0', port=9017) diff --git a/prize_gen/Dockerfile b/prize_gen/Dockerfile index 96e8787..a5ceb27 100644 --- a/prize_gen/Dockerfile +++ b/prize_gen/Dockerfile @@ -1,5 +1,6 @@ +ARG FILE_VERSION=prize_gen1.py FROM python:latest COPY . . RUN pip install flask RUN pip install requests -ENTRYPOINT ["python", "prize_gen.py"] +ENTRYPOINT ["python", "${FILE_VERSION}"] diff --git a/prize_gen/prize_gen.py b/prize_gen/prize_gen1.py similarity index 100% rename from prize_gen/prize_gen.py rename to prize_gen/prize_gen1.py diff --git a/prize_gen/prize_gen2.py b/prize_gen/prize_gen2.py new file mode 100644 index 0000000..cdcfe9c --- /dev/null +++ b/prize_gen/prize_gen2.py @@ -0,0 +1,18 @@ +from flask import Flask, jsonify, make_response +import random +from random import randrange +prize_gen = Flask(__name__) + + +@prize_gen.route('/prize_gen/', methods=['GET']) +def reset(prob=25): + prize=100 + percent = random.randrange(100) + if prob > percent: + return jsonify({"User has won":prize}) + else: + return "No prize for you" + + +if __name__ == '__main__': + prize_gen.run(host='0.0.0.0', port=5000) diff --git a/text_gen/text_gen.py b/text_gen/text_gen1.py similarity index 78% rename from text_gen/text_gen.py rename to text_gen/text_gen1.py index 8a39c52..39bb4b4 100644 --- a/text_gen/text_gen.py +++ b/text_gen/text_gen1.py @@ -1,12 +1,13 @@ from flask import Flask, jsonify, make_response import random import string + text_gen = Flask(__name__) @text_gen.route('/text_gen/', methods=['GET']) def text_gen_method(): - rand = random.choice(string.ascii_lowercase) + rand = (''.join(random.choice(string.ascii_lowercase) for i in range(3))) return jsonify({"Random string":rand}) if __name__ == '__main__': diff --git a/text_gen/text_gen2.py b/text_gen/text_gen2.py new file mode 100644 index 0000000..1accd2a --- /dev/null +++ b/text_gen/text_gen2.py @@ -0,0 +1,14 @@ +from flask import Flask, jsonify, make_response +import random +import string + +text_gen = Flask(__name__) + + +@text_gen.route('/text_gen/', methods=['GET']) +def text_gen_method(): + rand = (''.join(random.choice(string.ascii_uppercase) for i in range(2))) + return jsonify({"Random string":rand}) + +if __name__ == '__main__': + text_gen.run(host='0.0.0.0', port=9017) From e70f58b487558206a86e8d152c524a656b4c5183 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 17 Jul 2019 14:46:47 +0000 Subject: [PATCH 3/7] args working for version implementation --- db_connector/Dockerfile | 3 +++ db_connector/config/keys.js | 2 +- docker-compose.yaml | 6 ++++++ num_gen/Dockerfile | 4 +++- num_gen/num_gen1.py | 2 +- num_gen/num_gen2.py | 2 +- prize_gen/Dockerfile | 7 ++++--- prize_gen/prize_gen1.py | 1 + text_gen/Dockerfile | 4 +++- 9 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 db_connector/Dockerfile create mode 100644 docker-compose.yaml diff --git a/db_connector/Dockerfile b/db_connector/Dockerfile new file mode 100644 index 0000000..28a03a8 --- /dev/null +++ b/db_connector/Dockerfile @@ -0,0 +1,3 @@ +FROM mongo:latest +COPY . . +ENTRYPOINT [] diff --git a/db_connector/config/keys.js b/db_connector/config/keys.js index e61b6ed..e95be00 100755 --- a/db_connector/config/keys.js +++ b/db_connector/config/keys.js @@ -1,4 +1,4 @@ module.exports = { - mongoURI: "mongodb://lafb:lafb123@ds165632.mlab.com:63835/accounts" + mongoURI: "mongodb://23b18f2e852d:63835/accounts" }; diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..ff5a580 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,6 @@ +version: '3.7' +services: + mongo: + image: mongo + ports: + - "27017:27017" diff --git a/num_gen/Dockerfile b/num_gen/Dockerfile index 672e3ea..d19a2de 100644 --- a/num_gen/Dockerfile +++ b/num_gen/Dockerfile @@ -1,4 +1,6 @@ FROM python +ARG FILE_VERSION=1 COPY . . +COPY num_gen${FILE_VERSION}.py app.py RUN pip install flask -ENTRYPOINT ["python", "num_gen.py"] +ENTRYPOINT ["python", "app.py"] diff --git a/num_gen/num_gen1.py b/num_gen/num_gen1.py index 8df791b..6c23b98 100644 --- a/num_gen/num_gen1.py +++ b/num_gen/num_gen1.py @@ -8,4 +8,4 @@ def num_gen_method(): return jsonify({"Random Number":rand}) if __name__ == '__main__': - num_gen.run(host='0.0.0.0', port=9017) + num_gen.run(host='0.0.0.0', port=9018) diff --git a/num_gen/num_gen2.py b/num_gen/num_gen2.py index 42cf595..f885bed 100644 --- a/num_gen/num_gen2.py +++ b/num_gen/num_gen2.py @@ -8,4 +8,4 @@ def num_gen_method(): return jsonify({"Random Number":rand}) if __name__ == '__main__': - num_gen.run(host='0.0.0.0', port=9017) + num_gen.run(host='0.0.0.0', port=9018) diff --git a/prize_gen/Dockerfile b/prize_gen/Dockerfile index a5ceb27..40a7f9a 100644 --- a/prize_gen/Dockerfile +++ b/prize_gen/Dockerfile @@ -1,6 +1,7 @@ -ARG FILE_VERSION=prize_gen1.py -FROM python:latest +FROM python +ARG FILE_VERSION=1 COPY . . +COPY prize_gen${FILE_VERSION}.py app.py RUN pip install flask RUN pip install requests -ENTRYPOINT ["python", "${FILE_VERSION}"] +ENTRYPOINT ["python", "app.py"] diff --git a/prize_gen/prize_gen1.py b/prize_gen/prize_gen1.py index 4a491c2..a256247 100644 --- a/prize_gen/prize_gen1.py +++ b/prize_gen/prize_gen1.py @@ -9,6 +9,7 @@ def reset(prob=25): prize=50 percent = random.randrange(100) if prob > percent: + return jsonify({"User has won":prize}) else: return "No prize for you" diff --git a/text_gen/Dockerfile b/text_gen/Dockerfile index 179d0c9..da32481 100644 --- a/text_gen/Dockerfile +++ b/text_gen/Dockerfile @@ -1,4 +1,6 @@ FROM python +ARG FILE_VERSION=1 COPY . . +COPY text_gen${FILE_VERSION}.py app.py RUN pip install flask -ENTRYPOINT ["python", "text_gen.py"] +ENTRYPOINT ["python", "app.py"] From c37449102c564b99e16adae6b5cfd7bd43cfc3eb Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 17 Jul 2019 15:06:55 +0000 Subject: [PATCH 4/7] get request workingggg --- prize_gen/prize_gen1.py | 3 ++- prize_gen/prize_gen2.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/prize_gen/prize_gen1.py b/prize_gen/prize_gen1.py index a256247..5f72422 100644 --- a/prize_gen/prize_gen1.py +++ b/prize_gen/prize_gen1.py @@ -1,5 +1,6 @@ from flask import Flask, jsonify, make_response import random +import requests from random import randrange prize_gen = Flask(__name__) @@ -9,7 +10,7 @@ def reset(prob=25): prize=50 percent = random.randrange(100) if prob > percent: - + request.get('http://52.142.204.121:9000/notify') return jsonify({"User has won":prize}) else: return "No prize for you" diff --git a/prize_gen/prize_gen2.py b/prize_gen/prize_gen2.py index cdcfe9c..49fd39d 100644 --- a/prize_gen/prize_gen2.py +++ b/prize_gen/prize_gen2.py @@ -1,5 +1,6 @@ from flask import Flask, jsonify, make_response import random +import requests from random import randrange prize_gen = Flask(__name__) @@ -9,6 +10,7 @@ def reset(prob=25): prize=100 percent = random.randrange(100) if prob > percent: + request.get('http://52.142.204.121:9000/notify') return jsonify({"User has won":prize}) else: return "No prize for you" From 3368e012cee93f310552d119d10fa6157db99d9a Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 17 Jul 2019 16:04:27 +0000 Subject: [PATCH 5/7] working on connector image --- db_connector/Dockerfile | 7 +++++-- db_connector/config/keys.js | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/db_connector/Dockerfile b/db_connector/Dockerfile index 28a03a8..cebeb4e 100644 --- a/db_connector/Dockerfile +++ b/db_connector/Dockerfile @@ -1,3 +1,6 @@ -FROM mongo:latest + +FROM node:10 as node-build +WORKDIR /build COPY . . -ENTRYPOINT [] +RUN npm install +ENTRYPOINT ["server.js", "-l", "5001"] diff --git a/db_connector/config/keys.js b/db_connector/config/keys.js index e95be00..c333c2a 100755 --- a/db_connector/config/keys.js +++ b/db_connector/config/keys.js @@ -1,4 +1,3 @@ module.exports = { - mongoURI: "mongodb://23b18f2e852d:63835/accounts" + mongoURI: "mongodb://mongo:27017/account" }; - From b9e199e95ef170e77040fbba7628d30c6e2d4946 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 18 Jul 2019 08:18:41 +0000 Subject: [PATCH 6/7] db connect and static website containers up --- db_connector/Dockerfile | 7 +++---- prize_gen/prize_gen1.py | 2 +- prize_gen/prize_gen2.py | 2 +- static_website/Dockerfile | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 static_website/Dockerfile diff --git a/db_connector/Dockerfile b/db_connector/Dockerfile index cebeb4e..aa341f2 100644 --- a/db_connector/Dockerfile +++ b/db_connector/Dockerfile @@ -1,6 +1,5 @@ - -FROM node:10 as node-build -WORKDIR /build +FROM node:10 COPY . . RUN npm install -ENTRYPOINT ["server.js", "-l", "5001"] +EXPOSE 5001 +ENTRYPOINT ["node", "server.js"] diff --git a/prize_gen/prize_gen1.py b/prize_gen/prize_gen1.py index 5f72422..143a618 100644 --- a/prize_gen/prize_gen1.py +++ b/prize_gen/prize_gen1.py @@ -10,7 +10,7 @@ def reset(prob=25): prize=50 percent = random.randrange(100) if prob > percent: - request.get('http://52.142.204.121:9000/notify') + request.get('http://localhost:9000/notify') return jsonify({"User has won":prize}) else: return "No prize for you" diff --git a/prize_gen/prize_gen2.py b/prize_gen/prize_gen2.py index 49fd39d..eeb849a 100644 --- a/prize_gen/prize_gen2.py +++ b/prize_gen/prize_gen2.py @@ -10,7 +10,7 @@ def reset(prob=25): prize=100 percent = random.randrange(100) if prob > percent: - request.get('http://52.142.204.121:9000/notify') + request.get('http://localhost:9000/notify') return jsonify({"User has won":prize}) else: return "No prize for you" diff --git a/static_website/Dockerfile b/static_website/Dockerfile new file mode 100644 index 0000000..2621877 --- /dev/null +++ b/static_website/Dockerfile @@ -0,0 +1,5 @@ +FROM node:10 +COPY . . +RUN npm install +EXPOSE 8089 +ENTRYPOINT ["node", "server.js"] From 818254119ac8f1d7ad73d5a28ae3fb2adb6d5c35 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 18 Jul 2019 09:24:52 +0000 Subject: [PATCH 7/7] dockerised server on own container --- Dockerfile | 0 docker-compose.yaml | 32 ++++++++++++++++++++++++++++++++ nginx.conf | 12 ++++++++++++ notification_server/Dockerfile | 4 ++++ server/Dockerfile | 8 ++++++++ 5 files changed, 56 insertions(+) delete mode 100644 Dockerfile create mode 100644 nginx.conf create mode 100644 notification_server/Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e69de29..0000000 diff --git a/docker-compose.yaml b/docker-compose.yaml index ff5a580..ae8f8c3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,37 @@ version: '3.7' services: + nginx: + image: nginx + depends_on: + - client + - server + volumes: + - type: bind + source: ./nginx.conf + target: /etc/nginx/nginx.conf + ports: + - target: 80 + protocol: tcp + published: 80 + container_name: nginx + + server: + image: keepkarm/server:latest + build: + context: ./server + dockerfile: Dockerfile + ports: + - "8082:8084" + + client: + image: kryan1622/kube/my/client:latest + build: + context: ./client + dockerfile: Dockerfile + ports: + - "3001:3000" + + mongo: image: mongo ports: diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..98c89e8 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,12 @@ +events {} +http { + server { + listen 80; + location / { + proxy_pass http://client:8089/; + } + location /server/ { + proxy_pass http://server:8084/; + } + } +} diff --git a/notification_server/Dockerfile b/notification_server/Dockerfile new file mode 100644 index 0000000..9b28a84 --- /dev/null +++ b/notification_server/Dockerfile @@ -0,0 +1,4 @@ +FROM python +COPY . . +RUN pip install flask +ENTRYPOINT ["python", "app.py"] diff --git a/server/Dockerfile b/server/Dockerfile index e69de29..d93626e 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -0,0 +1,8 @@ +FROM maven:latest as maven-build +WORKDIR /build +COPY . . +RUN mvn clean package +FROM java:8 +WORKDIR /opt/website +COPY --from=maven-build /build/target/Spring_Day_Two-0.0.1-SNAPSHOT.jar app.jar +ENTRYPOINT ["/usr/bin/java", "-jar", "app.jar"]