Bläddra i källkod

Set ip and ports from groupid environment variable

https
jakobsn 6 år sedan
förälder
incheckning
8cedf0d58f
4 ändrade filer med 15 tillägg och 7 borttagningar
  1. +1
    -0
      .env
  2. +7
    -5
      docker-compose.yml
  3. +6
    -2
      src/app/models/database.py
  4. +1
    -0
      src/app/requirements.txt

+ 1
- 0
.env Visa fil

@@ -0,0 +1 @@
groupid=90

+ 7
- 5
docker-compose.yml Visa fil

@@ -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

+ 6
- 2
src/app/models/database.py Visa fil

@@ -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'
)

+ 1
- 0
src/app/requirements.txt Visa fil

@@ -1,2 +1,3 @@
web.py==0.40
mysql-connector==2.2.9
python-dotenv

Laddar…
Avbryt
Spara