add base web + change a container

2025-04-14 10:48:11 +02:00
parent 7a7ad1e59d
commit 17c91e5fa4
5 changed files with 52 additions and 28 deletions
--- a/14
+++ b/14
@@ -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
 }
--- 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:
--- a/flask-app/Dockerfile
+++ b/flask-app/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.11

-WORKDIR /app
-COPY . /app
+WORKDIR /web
+COPY . /web

 RUN pip install flask flask_sqlalchemy pymysql

--- a/flask-app/app.py
+++ b/flask-app/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'
@@ -10,7 +11,7 @@ db = SQLAlchemy(app)

    @app.route('/')
    def index():
-    return 'Bienvenue sur l’intranet !'
+        return render_template('index.html')
        
 if __name__ == '__main__':
    app.run(host='0.0.0.0')
--- a/web/view/index.html
+++ b/web/view/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    Hello World!
+    <h1>Welcome to the GestHub Web Interface</h1>
+</body>
+</html>