From d0edc91213ec71e74076084cf9d166b98667496a Mon Sep 17 00:00:00 2001 From: emrahbickingc Date: Sun, 10 Oct 2021 14:40:30 +0300 Subject: [PATCH 1/6] Added requirements.txt --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..89b3ba3 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +flask +mysqlclient \ No newline at end of file From fe9aa2d952ee1c2c1c51c3e5b1c9478b90ecd3bd Mon Sep 17 00:00:00 2001 From: emrahbickingc Date: Sun, 10 Oct 2021 14:57:59 +0300 Subject: [PATCH 2/6] Modifyied the Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a0cb896..d484803 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.6.1-alpine -WORKDIR /project -ADD . /project +WORKDIR /app +ADD . /app RUN pip install -r requirements.txt CMD ["python","app.py"] \ No newline at end of file From ccac6f59a0745f0a6611688152ab01573760b4be Mon Sep 17 00:00:00 2001 From: emrahbickingc Date: Sun, 10 Oct 2021 20:12:20 +0300 Subject: [PATCH 3/6] Updated environment variables --- .vscode/extensions.json | 5 +++++ Dockerfile | 11 ++++++----- app.py | 10 +++++----- 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..e389642 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "formulahendry.vscode-mysql" + ] +} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d484803..510fcb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ -FROM python:3.6.1-alpine -WORKDIR /app -ADD . /app -RUN pip install -r requirements.txt -CMD ["python","app.py"] \ No newline at end of file +FROM alpine +FROM python:3.7 +COPY requirements.txt /tmp +WORKDIR /tmp +RUN pip install --upgrade pip && \ + pip install -r requirements.txt \ No newline at end of file diff --git a/app.py b/app.py index eeb17e1..ee10d9b 100644 --- a/app.py +++ b/app.py @@ -15,11 +15,11 @@ def hello_world(): class Storage(): def __init__(self): self.db = MySQLdb.connect( - user = os.getenv('MYSQL_USERNAME'), - passwd = os.getenv('MYSQL_PASSWORD'), - db = os.getenv('MYSQL_INSTANCE_NAME'), - host = os.getenv('MYSQL_PORT_3306_TCP_ADDR'), - port = int(os.getenv('MYSQL_PORT_3306_TCP_PORT')) + user = os.getenv('db_user'), + passwd = os.getenv('Mytest123**'), + db = os.getenv('test_db'), + host = os.getenv('localhost'), + port = int(os.getenv('3306')) ) cur = self.db.cursor() From 00196a5b448748ea1d10a83fd1bb5043b8c90ffc Mon Sep 17 00:00:00 2001 From: emrahbickingc Date: Sun, 10 Oct 2021 20:51:58 +0300 Subject: [PATCH 4/6] last update --- Dockerfile | 7 ++++++- app.py | 28 +--------------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 510fcb3..f190c45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,4 +3,9 @@ FROM python:3.7 COPY requirements.txt /tmp WORKDIR /tmp RUN pip install --upgrade pip && \ - pip install -r requirements.txt \ No newline at end of file + pip install -r requirements.txt +RUN mkdir /app +WORKDIR /app +COPY app.py . +ENTRYPOINT [ "python" ] +CMD [ "app.py" ] \ No newline at end of file diff --git a/app.py b/app.py index ee10d9b..dd38666 100644 --- a/app.py +++ b/app.py @@ -7,33 +7,7 @@ @application.route('/') def hello_world(): - storage = Storage() - storage.populate() - score = storage.score() - return "Hello Devops 123, %d!" % score - -class Storage(): - def __init__(self): - self.db = MySQLdb.connect( - user = os.getenv('db_user'), - passwd = os.getenv('Mytest123**'), - db = os.getenv('test_db'), - host = os.getenv('localhost'), - port = int(os.getenv('3306')) - ) - - cur = self.db.cursor() - cur.execute("CREATE TABLE IF NOT EXISTS scores(score INT)") - - def populate(self): - cur = self.db.cursor() - cur.execute("INSERT INTO scores(score) VALUES(1234)") - - def score(self): - cur = self.db.cursor() - cur.execute("SELECT * FROM scores") - row = cur.fetchone() - return row[0] + return "Hello Devops 123" if __name__ == "__main__": application.run(host='0.0.0.0', port=3000) From 375d9965a9b78d5898ed6448b6222f34c6b6c4ff Mon Sep 17 00:00:00 2001 From: emrahbickingc Date: Sun, 10 Oct 2021 21:05:29 +0300 Subject: [PATCH 5/6] app get from master --- app.py | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index dd38666..eeb17e1 100644 --- a/app.py +++ b/app.py @@ -7,7 +7,33 @@ @application.route('/') def hello_world(): - return "Hello Devops 123" + storage = Storage() + storage.populate() + score = storage.score() + return "Hello Devops 123, %d!" % score + +class Storage(): + def __init__(self): + self.db = MySQLdb.connect( + user = os.getenv('MYSQL_USERNAME'), + passwd = os.getenv('MYSQL_PASSWORD'), + db = os.getenv('MYSQL_INSTANCE_NAME'), + host = os.getenv('MYSQL_PORT_3306_TCP_ADDR'), + port = int(os.getenv('MYSQL_PORT_3306_TCP_PORT')) + ) + + cur = self.db.cursor() + cur.execute("CREATE TABLE IF NOT EXISTS scores(score INT)") + + def populate(self): + cur = self.db.cursor() + cur.execute("INSERT INTO scores(score) VALUES(1234)") + + def score(self): + cur = self.db.cursor() + cur.execute("SELECT * FROM scores") + row = cur.fetchone() + return row[0] if __name__ == "__main__": application.run(host='0.0.0.0', port=3000) From 11ae84e5053ccccdfaec090daa4bd4eabed17d6d Mon Sep 17 00:00:00 2001 From: emrahbickingc Date: Sun, 10 Oct 2021 22:49:38 +0300 Subject: [PATCH 6/6] Updated Dockerfile --- Dockerfile | 4 ++-- app.py | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index f190c45..9e14766 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM alpine -FROM python:3.7 +FROM python:3.8-alpine +RUN apk add gcc musl-dev mariadb-connector-c-dev COPY requirements.txt /tmp WORKDIR /tmp RUN pip install --upgrade pip && \ diff --git a/app.py b/app.py index eeb17e1..7ffb32b 100644 --- a/app.py +++ b/app.py @@ -14,13 +14,7 @@ def hello_world(): class Storage(): def __init__(self): - self.db = MySQLdb.connect( - user = os.getenv('MYSQL_USERNAME'), - passwd = os.getenv('MYSQL_PASSWORD'), - db = os.getenv('MYSQL_INSTANCE_NAME'), - host = os.getenv('MYSQL_PORT_3306_TCP_ADDR'), - port = int(os.getenv('MYSQL_PORT_3306_TCP_PORT')) - ) + self.db = MySQLdb.connect("192.168.2.106","db_user","Mytest123**","test_db" ) cur = self.db.cursor() cur.execute("CREATE TABLE IF NOT EXISTS scores(score INT)")