Merge pull request #20 from aiordache/master

Set different networks for db-backend and backend-proxy
This commit is contained in:
Anca Iordache 2020-03-19 22:39:00 +01:00 committed by GitHub
commit dcac9e0722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 22 deletions

View File

@ -1,5 +1,4 @@
FROM python:3.8-alpine
ENV PYTHONUNBUFFERED 1
WORKDIR /code
COPY requirements.txt /code/
RUN pip install -r requirements.txt

View File

@ -6,7 +6,8 @@ import mysql.connector
passfile = open('/run/secrets/db-password', 'r')
#give db some time to start
time.sleep(3)
time.sleep(5)
#connect to db
conn = mysql.connector.connect(
user='root',
@ -15,12 +16,19 @@ conn = mysql.connector.connect(
database='example',
auth_plugin='mysql_native_password'
)
passfile.close()
# populate db
cursor = conn.cursor()
def prepare_db():
cursor.execute('DROP TABLE IF EXISTS blog')
cursor.execute('CREATE TABLE blog (id INT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255))')
cursor.executemany('INSERT INTO blog (id, title) VALUES (%s, %s);', [(i, 'Blog post #%d'% i) for i in range (1,5)])
conn.commit()
prepare_db()
# server
app = Flask(__name__)
@app.route('/')
def listBlog():
cursor.execute('SELECT title FROM blog')
@ -29,13 +37,6 @@ def listBlog():
response = response + '<div>' + c[0] + '</div>'
return response
def prepare_db():
cursor.execute('DROP TABLE IF EXISTS blog')
cursor.execute('CREATE TABLE blog (id INT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255))')
cursor.executemany('INSERT INTO blog (id, title) VALUES (%s, %s);', [(i, 'Blog post #%d'% i) for i in range (1,5)])
conn.commit()
if __name__ == '__main__':
prepare_db()
app.run()

View File

@ -1,27 +1,40 @@
version: "3.7"
services:
backend:
build: backend
secrets:
- db-password
ports:
- 5000:5000
db:
environment:
MYSQL_DATABASE: example
MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db-password
image: mysql:8.0.19
command: '--default-authentication-plugin=mysql_native_password'
restart: always
secrets:
- db-password
volumes:
- db-data:/var/lib/mysql
networks:
- backnet
environment:
- MYSQL_DATABASE=example
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db-password
backend:
build: backend
restart: always
secrets:
- db-password
ports:
- 5000:5000
networks:
- backnet
- frontnet
proxy:
build: proxy
restart: always
ports:
- 8080:80
- 80:80
networks:
- frontnet
volumes:
db-data: {}
db-data:
secrets:
db-password:
file: db/password.txt
networks:
backnet:
frontnet: