diff --git a/Caddyfile b/Caddyfile
index 8367583..7ecc55b 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,13 +1,13 @@
# Caddyfile
-wekan.localhost {
+flask.gesthub {
+ reverse_proxy flask:5000
+}
+
+wekan.gesthub {
reverse_proxy wekan:8080
}
-chat.localhost {
- reverse_proxy rocketchat:3000
-}
-
-flask.localhost {
- reverse_proxy flask:5000
+chat.gesthub {
+ reverse_proxy mattermost:8065
}
diff --git a/docker-compose.yml b/docker-compose.yml
index 291ef0c..05e0ea8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,5 @@
+version: '3.8'
+
services:
caddy:
image: caddy:latest
@@ -11,10 +13,10 @@ services:
depends_on:
- flask
- wekan
- - rocketchat
+ - mattermost
flask:
- build: ./flask-app
+ build: ./web
environment:
- DB_HOST=mariadb
- DB_USER=flaskuser
@@ -23,7 +25,7 @@ services:
depends_on:
- mariadb
volumes:
- - ./flask-app:/app
+ - ./web:/app
mariadb:
image: mariadb:latest
@@ -39,7 +41,7 @@ services:
image: wekanteam/wekan
environment:
- MONGO_URL=mongodb://mongo:27017/wekan
- - ROOT_URL=https://wekan.localhost
+ - ROOT_URL=https://wekan.gesthub
depends_on:
- mongo
@@ -48,23 +50,32 @@ services:
volumes:
- mongo_data:/data/db
- rocketchat:
- image: rocketchat/rocket.chat:latest
- environment:
- - MONGO_URL=mongodb://mongo:27017/rocketchat
- - ROOT_URL=https://chat.localhost
- - PORT=3000
+ mattermost:
+ image: mattermost/mattermost-team-edition:latest
ports:
- - "3000:3000"
+ - "8065:8065"
+ environment:
+ - MM_SQLSETTINGS_DRIVERNAME=postgres
+ - MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mmuserpass@db:5432/mattermost?sslmode=disable
+ - MM_SERVICESETTINGS_SITEURL=http://chat.gesthub
depends_on:
- - mongo
- - redis
+ - db
+ volumes:
+ - mattermost_data:/mattermost/data
- redis:
- image: redis:latest
+ db:
+ image: postgres:13
+ environment:
+ - POSTGRES_DB=mattermost
+ - POSTGRES_USER=mmuser
+ - POSTGRES_PASSWORD=mmuserpass
+ volumes:
+ - postgres_data:/var/lib/postgresql/data
volumes:
caddy_data:
caddy_config:
mariadb_data:
mongo_data:
+ mattermost_data:
+ postgres_data:
\ No newline at end of file
diff --git a/flask-app/Dockerfile b/web/Dockerfile
similarity index 78%
rename from flask-app/Dockerfile
rename to web/Dockerfile
index 0b5c45c..cce4b4c 100644
--- a/flask-app/Dockerfile
+++ b/web/Dockerfile
@@ -1,7 +1,7 @@
FROM python:3.11
-WORKDIR /app
-COPY . /app
+WORKDIR /web
+COPY . /web
RUN pip install flask flask_sqlalchemy pymysql
diff --git a/flask-app/app.py b/web/app.py
similarity index 72%
rename from flask-app/app.py
rename to web/app.py
index d4e71a7..ebbb992 100644
--- a/flask-app/app.py
+++ b/web/app.py
@@ -1,6 +1,7 @@
# flask-app/app.py
from flask import Flask
from flask_sqlalchemy import SQLAlchemy
+from flask import render_template
app = Flask(__name__)
app.config['SQLALCHEMY_DATABASE_URI'] = 'mysql+pymysql://flaskuser:flaskpass@mariadb/flaskdb'
@@ -8,9 +9,9 @@ app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
db = SQLAlchemy(app)
-@app.route('/')
-def index():
- return 'Bienvenue sur l’intranet !'
-
+ @app.route('/')
+ def index():
+ return render_template('index.html')
+
if __name__ == '__main__':
app.run(host='0.0.0.0')
diff --git a/web/view/index.html b/web/view/index.html
new file mode 100644
index 0000000..5b7436e
--- /dev/null
+++ b/web/view/index.html
@@ -0,0 +1,12 @@
+
+
+
+
+
+ Document
+
+
+ Hello World!
+ Welcome to the GestHub Web Interface
+
+
\ No newline at end of file