| @@ -1,11 +1,13 @@ | |||||
| version: "2" | version: "2" | ||||
| services: | services: | ||||
| db: | db: | ||||
| build: | build: | ||||
| context: ./mysql | context: ./mysql | ||||
| dockerfile: Dockerfile | dockerfile: Dockerfile | ||||
| networks: | |||||
| backend: | |||||
| ipv4_address: 10.5.0.5 | |||||
| app: | app: | ||||
| @@ -18,4 +20,14 @@ services: | |||||
| ports: | ports: | ||||
| - "8080:8080" | - "8080:8080" | ||||
| - "443:443" | - "443:443" | ||||
| networks: | |||||
| backend: | |||||
| ipv4_address: 10.5.0.6 | |||||
| networks: | |||||
| backend: | |||||
| driver: bridge | |||||
| ipam: | |||||
| config: | |||||
| - subnet: 10.5.0.0/16 | |||||
| @@ -1,5 +1,4 @@ | |||||
| CREATE TABLE `db`.`users` ( | CREATE TABLE `db`.`users` ( | ||||
| `userid` INT NOT NULL, | `userid` INT NOT NULL, | ||||
| `username` VARCHAR(45) NULL, | `username` VARCHAR(45) NULL, | ||||
| @@ -10,4 +9,3 @@ insert into users values (0, "admin", "password"); | |||||
| insert into users values (1, "bernt", "inge"); | insert into users values (1, "bernt", "inge"); | ||||
| GRANT ALL PRIVILEGES ON db.* TO 'root'@'%'; | |||||
| @@ -9,7 +9,7 @@ urls = ( | |||||
| # Connect to database | # Connect to database | ||||
| db = web.database( | db = web.database( | ||||
| dbn="mysql", | dbn="mysql", | ||||
| host='172.18.0.22', | |||||
| host='10.5.0.5', | |||||
| port=3306, | port=3306, | ||||
| user='root', | user='root', | ||||
| pw='root', | pw='root', | ||||