diff --git a/.env b/.env new file mode 100644 index 0000000..7ef8a90 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +groupid=90 diff --git a/docker-compose.yml b/docker-compose.yml index dc36ca4..dbb74b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,21 +7,23 @@ services: dockerfile: Dockerfile networks: backend: - ipv4_address: 10.5.0.5 + ipv4_address: 10.${groupid}.0.5 app: + env_file: + - .env build: context: ./src dockerfile: Dockerfile ports: - - "8080:8080" - - "443:443" + - "80${groupid}:8080" + - "4${groupid}:443" depends_on: - db networks: backend: - ipv4_address: 10.5.0.6 + ipv4_address: 10.${groupid}.0.6 networks: @@ -29,5 +31,5 @@ networks: driver: bridge ipam: config: - - subnet: 10.5.0.0/16 + - subnet: 10.${groupid}.0.0/16 diff --git a/src/app/models/database.py b/src/app/models/database.py index 48b824a..3dd6dc8 100644 --- a/src/app/models/database.py +++ b/src/app/models/database.py @@ -1,4 +1,8 @@ import mysql.connector +from dotenv import load_dotenv +import os + +groupid = os.getenv("groupid") """ Connect the webserver to the database using the python mysql connecter. @@ -8,8 +12,8 @@ preconfigured docker container address use the Docker address. The default port db = mysql.connector.connect( user='root', password='root', - host='10.5.0.5', # Docker address + host='10.' + groupid + '.0.5', # Docker address #host='0.0.0.0', # Local address database='db' ) - \ No newline at end of file + diff --git a/src/app/requirements.txt b/src/app/requirements.txt index c8ba3f5..1feffef 100644 --- a/src/app/requirements.txt +++ b/src/app/requirements.txt @@ -1,2 +1,3 @@ web.py==0.40 mysql-connector==2.2.9 +python-dotenv