From 24c772019f3fd9b9b39b60e7129555929b8869ef Mon Sep 17 00:00:00 2001 From: jwansek Date: Thu, 4 Aug 2022 11:24:05 +0100 Subject: Improved docker-compose, fixed #2 --- docker-compose.yml | 28 +++++++++++++++++----------- example.conf | 5 ++--- static/index.md | 3 ++- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 27e48f2..c6762fc 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,20 @@ version: '3' services: - edaweb: - build: - context: . - dockerfile: Dockerfile - image: jwansek/edaweb - volumes: - - /media/ISOs/:/media/ISOs/ - - ./static/:/app/static/ - - ./edaweb.conf:/app/edaweb.conf - ports: - - "6969:6969" + edaweb: + build: + context: . + dockerfile: Dockerfile + image: jwansek/edaweb + volumes: + - /media/ISOs/:/media/ISOs/ + - ./static/:/app/static/ + - ./edaweb.conf:/app/edaweb.conf + ports: + - "6969:6969" + networks: + - db-network +networks: + db-network: + name: mariadb + external: true diff --git a/example.conf b/example.conf index 1cec18f..4110f3d 100755 --- a/example.conf +++ b/example.conf @@ -1,6 +1,5 @@ [mysql] -host = 192.168.0.40 -; port = 3306 ; ConfigParser will parse this as a string (not int) which will cause pymysql to moan +host = mariadb user = webro passwd = *********** db = edaweb @@ -32,4 +31,4 @@ passwd = *********** username = @jwnskanzkwk#9757 [github] -access_code = ******************************************* \ No newline at end of file +access_code = ******************************************* diff --git a/static/index.md b/static/index.md index a57680a..d82a2ed 100755 --- a/static/index.md +++ b/static/index.md @@ -23,4 +23,5 @@ i'll post my thoughts on here sometimes, and use this site to link to other stuf - [boymoder.network](https://boymoder.network/) - website for boymoder awareness - [4chan.org/lgbt/](https://boards.4channel.org/lgbt/) - but dont blame me if u catch brainworms - [https://www.math.uni-bielefeld.de/~sillke/Twister/fun/elevator-fun90.html](https://www.math.uni-bielefeld.de/~sillke/Twister/fun/elevator-fun90.html) any website with a URL like this is gonna be good -- https://boymoder.moe/ +- [boymoder.moe/](https://nyaomidev.github.io/boymoder.moe/) + -- cgit v1.2.3