Improve infra

2026-09-02 15:33:42 +02:00 · 2026-08-29 22:59:11 +02:00
parent 0f3d0b7f49
commit 23b05aa4d5
138 changed files with 738 additions and 546 deletions
@@ -26,8 +26,6 @@ jobs:
        with:
          submodules: "recursive"
          fetch-depth: 0
-      - name: "Check compose"
-        run: make check
      - name: "Update server image"
        run: make pull
      - name: "Build server"
@@ -1,31 +0,0 @@
-name: submodule-update
-
-on:
-  schedule:
-    - cron: '0 */8 * * *'
-  workflow_dispatch:
-
-jobs:
-  image:
-    name: submodule-update
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout Code"
-        uses: actions/checkout@v5
-        with:
-          token: ${{ secrets.CI_TOKEN }}
-          repository: ${{ github.repository }}
-          submodules: 'recursive'
-          fetch-depth: 1
-      # Update references
-      - name: Git Sumbodule Update
-        run: |
-          git pull --recurse-submodules
-          git submodule update --remote --recursive
-      # Commit and push
-      - name: Commit update
-        run: |
-          git config --global user.name 'Bensuperpc'
-          git config --global user.email 'bensuperpc@gmail.com'
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git commit -am "Auto updated submodule references" && git push || echo "No changes to commit"
@@ -1,2 +1,7 @@

 /*.tar.gz
+
+infrastructure/services/**/env/*.env
+infrastructure/services/**/config/*.env
+!infrastructure/services/**/env/*.env.example
+!infrastructure/services/**/config/*.env.example
@@ -24,8 +24,8 @@

 PROJECT_DIRECTORY := infrastructure
 CONFIG_DIRECTORY := presets
-# 7dtd minecraft satisfactory torrent
-CONFIGS := ia torrent tools
+# 7dtd minecraft satisfactory torrent ia torrent tools
+CONFIGS := 7dtd
 #DOCKER_PROFILES := 

 include DockerCompose.mk
@@ -151,165 +151,69 @@ And then, caddy will generate the certificate for you and renew it automatically

 ### Configure the infrastructure

-You need to configure the infrastructure with your own configuration.
-
-You can generate a password with 32 characters:
+Every service ships a `*.env.example` file, real `*.env` files are gitignored and never committed, you can generate them locally with:

 ```sh
-openssl rand -base64 32
+python3 tools/init_secrets.py
 ```

-Or online: [passwordsgenerator.net](https://passwordsgenerator.net/)
-
 #### Caddy

-For [caddy_backup.env](infrastructure/services/caddy/env/caddy_backup.env) file, you need to change the password(s) for the restic backup.
-
-```sh
-RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-```
-
-On [caddy.env](infrastructure/services/caddy/env/caddy.env) file, you need to update some variables, like the main domain, mail domain and scheme (http or https).
+Edit [caddy.env](infrastructure/services/caddy/env/caddy.env.example) to set your domain and mail address:

 ```sh
 MAIN_DOMAIN=bensuperpc.org
 MAIL_DOMAIN=bensuperpc@gmail.com
-# Scheme
 SCHEME=https
-# ignore_loaded_certs off
 AUTO_HTTPS_OPTIONS=ignore_loaded_certs
 ```

-#### Authelia
+#### Authelia - user database

-For [authelia.env](infrastructure/services/authelia/env/authelia.env) file, you need to change the password(s) and secret key:
-
-```sh
-AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=ht87MVnXkXhBpDkMUHqKDqdg8UGBJt+Fx5jNIqXnN2k=
-AUTHELIA_SESSION_SECRET=nsvbXKGRXVZUCUkOapntlq/Zh+d75WacTK5Jgyh8zYk=
-AUTHELIA_STORAGE_ENCRYPTION_KEY=aWeIT74xIhGVd9nUOr4YTToTl5rpBEbzc/fv4jemuos=
-AUTHELIA_STORAGE_POSTGRES_HOST=authelia-postgres
-AUTHELIA_STORAGE_POSTGRES_PORT=5432
-AUTHELIA_STORAGE_POSTGRES_DATABASE=authelia_db
-AUTHELIA_STORAGE_POSTGRES_USERNAME=authelia
-AUTHELIA_STORAGE_POSTGRES_PASSWORD=sAdkxFW6k3GiMOrlBpl6OV76eb9cQz/uk95jmA2UpI8=
-```
-
-Same for [authelia_postgres.env](infrastructure/services/authelia/env/authelia_postgres.env) file, you need to change the password(s) and user for the database.
-
-```sh
-POSTGRES_USER=authelia
-POSTGRES_PASSWORD=sAdkxFW6k3GiMOrlBpl6OV76eb9cQz/uk95jmA2UpI8=
-POSTGRES_DB=authelia_db
-```
-
-You also need to update [users_database.yml](infrastructure/services/authelia/config/users_database.yml)
+`make init` generates all Authelia secrets automatically. [users_database.yml](infrastructure/services/authelia/config/users_database.yml) ships with a **placeholder example user** (`bensuperpc`) - replace it with your own before starting the stack, don't just add a user next to it. Generate an argon2 hash for your password:

 ```sh
 docker run --rm authelia/authelia:latest authelia crypto hash generate argon2 --password 'MyPassword'
 ```

-#### Dozzle
+Then edit the `username`, `displayname`, `password` hash and `email` fields to match.

-To generate a new user for dozzle, you can use the following command [users.yml](infrastructure/services/dozzle/config/users.yml):
+#### Dozzle - user account
+
+Generate a user entry for [users.yml](infrastructure/services/dozzle/config/users.yml):

 ```sh
 docker run -it --rm amir20/dozzle generate bensuperpc --password mypassword --email bensuperpc@gmail.com --name "bensuperpc"
 ```

-#### PsiTransfer
+#### OpenSSH - public key

-For [psitransfer.env](infrastructure/services/psitransfer/env/psitransfer.env) file, you need to change the secret key.
+Replace [id_ed25519.pub](infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub) with your own public SSH key.

-```sh
-PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
-```
+#### Open-WebUI - Ollama model

-For [projectsend_db.env](infrastructure/services/projectsend/env/projectsend_db.env) file, you need to change the password(s) and user for the database.
-
-```sh
-MARIADB_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
-```
-
-#### Picoshare
-
-For [picoshare.env](infrastructure/services/picoshare/env/picoshare.env) file, you need to change the secret key.
-
-```sh
-PS_SHARED_SECRET=CBuS4DJLqIe93xF1KGYRrnhxUFBqLD2n
-```
-
-#### Dufs
-
-For [dufs.env](infrastructure/services/dufs/env/dufs.env) file, you need to change the secret key and if you want the user name.
-
-```sh
-DUFS_AUTH="admin:heqihlOfBmJDESGFlpbPi7P7Mi6F7RkV@/:rw|@/:ro"
-```
-
-#### Stirling PDF
-
-For [stirlingpdf.env](infrastructure/services/stirlingpdf/env/stirlingpdf.env) file, it's **completly optional**, you can change the password(s) and user.
-
-```sh
-# Enable security, optional
-DOCKER_ENABLE_SECURITY=true
-SECURITY_ENABLE_LOGIN=true
-# Can be disabled after initial login, optional,
-# default it admin:stirling
-SECURITY_INITIALLOGIN_USERNAME=admin
-SECURITY_INITIALLOGIN_PASSWORD=Jw9U039f5xc2mFcacvGvPD9RjwIh4DzO
-```
-
-#### OpenSSH
-
-You can need to add/change the public ssh key [id_ed25519.pub](infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub) (its my public key), also change the config/password in [openssh.env](infrastructure/services/openssh/env/openssh.env):
-
-```sh
-SUDO_ACCESS=true
-#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
-PUBLIC_KEY_DIR=/authorized_ssh_keys
-USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
-
-#PUBLIC_KEY=yourpublickey
-#PUBLIC_KEY_FILE=/path/to/file
-#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
-#USER_PASSWORD_FILE=/path/to/file
-```
-
-#### Open-WebUI
-
-For [open-webui.env](infrastructure/services/open-webui/env/openwebui.env) file, you must change the secret key for the webui and configure its PostgreSQL backend.
-
-```sh
-WEBUI_SECRET_KEY=7d83b15a417d090ba5c6b899270a05dd215c60848354c0c7574226d6ff02f39e
-DATABASE_URL=postgresql://postgres:securepassword123@openwebui-postgres:5432/openwebui
-REDIS_URL=redis://:valkey_password@valkey:6379/0
-```
-
-Also update [openwebui-postgres.env](infrastructure/services/open-webui/env/openwebui-postgres.env) and [openwebui-valkey.env](infrastructure/services/open-webui/env/openwebui-valkey.env) with your own credentials.
-
-To download the model, through open-webui GUI or you can use the following command:
+After starting the stack, pull a model via the Open-WebUI GUI or with:

 ```sh
 docker exec -it ollama ollama run deepseek-r1:8b
 ```

-#### Dependency-Track
+#### Team Fortress 2 - Steam GSLT

-For [dependency-track.env](infrastructure/services/dependency-track/env/dependency-track.env) file, you need to set the database credentials and the API server URL.
+`make init` will remind you: set `SRCDS_TOKEN` in [teamfortress2.env](infrastructure/services/teamfortress2-server/teamfortress2/env/teamfortress2.env) with your token from [steamcommunity.com/dev/managegameservers](https://steamcommunity.com/dev/managegameservers).
+
+#### Dependency-Track - first login
+
+Default credentials are `admin` / `admin` - **change them on first login**.
+
+#### Forgejo - installation lock
+
+After the first-run installation wizard completes, set in [forgejo.env](infrastructure/services/forgejo/env/forgejo.env.example):

 ```sh
-POSTGRES_USER=dtrack
-POSTGRES_PASSWORD=<your_password>
-POSTGRES_DB=dtrack_db
-ALPINE_DATA_DIRECTORY=/data
+FORGEJO__security__INSTALL_LOCK=true
 ```

-The frontend is available at `https://dependency-track.bensuperpc.org` and the API server at `/api/*`. Default credentials are `admin` / `admin`, **change them on first login**.
-
 ### Homepage

 You can change the homepage config in these files:
@@ -319,16 +223,6 @@ You can change the homepage config in these files:
 - [settings.yaml](infrastructure/services/homepage/config/settings.yaml)
 - [widgets.yaml](infrastructure/services/homepage/config/widgets.yaml)

-### Forgejo
-
-For Forgejo installation, you must change the password(s) and user in [forgejo_db.env](infrastructure/services/forgejo/env/forgejo_db.env) file and [forgejo.env](infrastructure/services/forgejo/env/forgejo.env) file.
-
-Once the installation is complete, you need to set the installation lock:
-
-```sh
-FORGEJO__security__INSTALL_LOCK=true
-```
-
 ### Forgejo Runner (Out of date)

 ```sh
@@ -436,29 +330,6 @@ AUTO_HTTPS_OPTIONS=ignore_loaded_certs

 And remove all the `import authelia_middleware` in the caddyfiles, authelia need https to work.

-#### Wordpress
-
-For the [wordpress.env](infrastructure/services/wordpress/env/wordpress.env) file, you need to change the password and user for the database.
-
-```sh
-WORDPRESS_DB_USER=bensuperpc
-WORDPRESS_DB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
-```
-
-For [wordpress_db.env](infrastructure/services/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database.
-
-```sh
-MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
-```
-
-For [wordpress_backup.env](infrastructure/services/wordpress/env/wordpress_backup.env) file, you need to change the password(s) for the restic backup.
-
-```sh
-RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-```
-
 ## Sources

 - [Wordpress](https://wordpress.org/)
@@ -53,15 +53,17 @@ include:
  - services/authelia/docker-compose.authelia.yml
 # Dozzle
  - services/dozzle/docker-compose.dozzle.yml
-# Minecraft
-  - services/minecraft-server/docker-compose.yml
-# 7daystodie
-  - services/7daystodie-server/docker-compose.yml
-# Satisfactory
-  - services/satisfactory-server/docker-compose.yml
-# Team Fortress 2
-  - services/teamfortress2-server/docker-compose.yml
 # LocalAI
  - services/localai/docker-compose.localai.yml
 # Bentopdf
  - services/bentopdf/docker-compose.bentopdf.yml
+# Code-server
+  - services/code-server/docker-compose.vscode-server.yml
+# Minecraft
+  - games/minecraft-server/docker-compose.yml
+# 7daystodie
+  - games/7daystodie-server/docker-compose.yml
+# Satisfactory
+  - games/satisfactory-server/docker-compose.yml
+# Team Fortress 2
+  - games/teamfortress2-server/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
  # 7 days to die server
  7daystodie_server:
-    image: vinanrra/7dtd-server:latest
+    image: vinanrra/7dtd-server:${SEVENDAYSTODIE_DOCKER_TAG:-latest}
    container_name: 7daystodie_server
    profiles:
      - 7daystodie_server
@@ -4,4 +4,4 @@ TimeZone=Europe/Paris
 BACKUP=NO
 BACKUP_HOUR=2
 BACKUP_MAX=7
-MONITOR=NO
+MONITOR=NO
@@ -0,0 +1,7 @@
+START_MODE=3
+VERSION=stable
+TimeZone=Europe/Paris
+BACKUP=NO
+BACKUP_HOUR=2
+BACKUP_MAX=7
+MONITOR=NO
@@ -1,19 +1,19 @@
 services:
  7daystodie_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
    container_name: 7daystodie_backup
    profiles:
      - 7daystodie_backup
    depends_on:
      - 7daystodie_server
-    restart: on-failure:7
+    extends:
+      file: ../../../common.yml
+      service: service-base
    env_file:
      - ./env/7daystodie_backup.env
    volumes:
      - 7daystodie_backup:/mnt/restic
      - 7daystodie_server_save:/data:ro
-    security_opt:
-      - no-new-privileges:true
    network_mode: none
    cap_drop:
      - NET_ADMIN
@@ -11,4 +11,4 @@ RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
 #RESTIC_CHECK_ARGS=--read-data-subset=40%
 # Prune (exuclusive with Check and Prune)
 #PRUNE_CRON=*/15 * * * *
-#RESTIC_PRUNE_ARGS=
+#RESTIC_PRUNE_ARGS=
@@ -1,7 +1,7 @@
 #RUN_ON_STARTUP=true
 RESTIC_REPOSITORY=/mnt/restic
 RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=SCY5cmu12Odca302EXabPA9jXYkCb2NN
+RESTIC_PASSWORD=__GENERATE_7DTD_RESTIC_PASSWORD__
 # Backup (exuclusive with Check and Prune)
 BACKUP_CRON=*/15 * * * *
 RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
@@ -11,4 +11,4 @@ RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
 #RESTIC_CHECK_ARGS=--read-data-subset=40%
 # Prune (exuclusive with Check and Prune)
 #PRUNE_CRON=*/15 * * * *
-#RESTIC_PRUNE_ARGS=
+#RESTIC_PRUNE_ARGS=
@@ -1,21 +1,21 @@
 services:
  minecraft_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
    container_name: minecraft_backup
    profiles:
      - minecraft_backup
    depends_on:
      - mc-server
      - minecraft_proxy
-    restart: on-failure:7
+    extends:
+      file: ../../../common.yml
+      service: service-base
    env_file:
      - ./env/backup.env
    volumes:
      - minecraft_server_backup:/mnt/restic
      - minecraft_server_data:/data/minecraft_server_data:ro
      - minecraft_proxy_data:/data/minecraft_proxy_data:ro
-    security_opt:
-      - no-new-privileges:true
    network_mode: none
    cap_drop:
      - NET_ADMIN
@@ -0,0 +1,14 @@
+#RUN_ON_STARTUP=true
+RESTIC_REPOSITORY=/mnt/restic
+RESTIC_BACKUP_SOURCES=/data
+RESTIC_PASSWORD=__GENERATE_MINECRAFT_RESTIC_PASSWORD__
+# Backup (exuclusive with Check and Prune)
+RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
+BACKUP_CRON=*/15 * * * *
+#RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
+# Check (exuclusive with Check and Prune)
+#CHECK_CRON=*/15 * * * *
+#RESTIC_CHECK_ARGS=--read-data-subset=40%
+# Prune (exuclusive with Check and Prune)
+#PRUNE_CRON=*/15 * * * *
+#RESTIC_PRUNE_ARGS=
@@ -1,6 +1,6 @@
 services:
  minecraft_proxy:
-    image: itzg/bungeecord:latest
+    image: itzg/mc-proxy:${MINECRAFT_PROXY_DOCKER_TAG:-java25}
    container_name: minecraft_proxy_server
    profiles:
      - minecraft_proxy
@@ -26,7 +26,7 @@ services:
      - minecraft-network

  mc-server:
-    image: itzg/minecraft-server:latest
+    image: itzg/minecraft-server:${MINECRAFT_SERVER_DOCKER_TAG:-java25}
    container_name: minecraft_server
    profiles:
      - minecraft_server
@@ -31,4 +31,4 @@ REMOVE_OLD_MODS_DEPTH=16
 # MODS_FORGEAPI_IGNORE_GAMETYPE
 # REMOVE_OLD_FORGEAPI_MODS
 # REMOVE_OLD_DATAPACKS_DEPTH
-# REMOVE_OLD_DATAPACKS_INCLUDE
+# REMOVE_OLD_DATAPACKS_INCLUDE
@@ -0,0 +1,34 @@
+# Disable SignLink: 39593
+#KeepChunks,Chunky,Plasmo Voice Server,viaversion,viabackwards,LuckPerms,QuickShop-Reremake,KeepChunks, DecentHolograms
+#SPIGET_RESOURCES=23307,81534,91064,19254,27448,28140,62575,23307,96927
+#      MODPACK= # MODPACK or MODS
+#      MODS=https://dev.bukkit.org/projects/dynmap/files/3620010/download
+#MODS_FILE=/extras/plugins.txt
+REMOVE_OLD_MODS=false
+REMOVE_OLD_MODS_INCLUDE=*.jar,*-version.json
+REMOVE_OLD_MODS_EXCLUDE=
+REMOVE_OLD_MODS_DEPTH=16
+
+# RESOURCE_PACK=
+# RESOURCE_PACK_SHA1=
+
+#      Minecraft Datapack
+# DATAPACKS=Terralith_v2.2_Seed_3820.zip
+#DATAPACKS_FILE=/extras/datapacks.txt
+#REMOVE_OLD_DATAPACKS=false
+#REMOVE_OLD_DATAPACKS_INCLUDE=*.zip
+# REMOVE_OLD_DATAPACKS_EXCLUDE=
+#REMOVE_OLD_DATAPACKS_DEPTH=1
+
+#RESOURCE_PACK=
+#RESOURCE_PACK_SHA1=
+
+# MODS_FORGEAPI_KEY
+# MODS_FORGEAPI_FILE
+# MODS_FORGEAPI_PROJECTIDS
+# MODS_FORGEAPI_RELEASES
+# MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES
+# MODS_FORGEAPI_IGNORE_GAMETYPE
+# REMOVE_OLD_FORGEAPI_MODS
+# REMOVE_OLD_DATAPACKS_DEPTH
+# REMOVE_OLD_DATAPACKS_INCLUDE
@@ -1,12 +1,12 @@
 TYPE=VELOCITY
-VELOCITY_VERSION=3.5.0-SNAPSHOT
-VELOCITY_BUILD_ID=594
+VELOCITY_VERSION=4.0.0-SNAPSHOT
+VELOCITY_BUILD_ID=5
 #PLUGINS=
 #SPIGET_PLUGINS=
 DEBUG=false
 DEBUG_HELPER=false
 ENABLE_RCON=false
-#RCON_PASSWORD=6hxU3Oxmh2Q8e6S9fjkdWJik
+#RCON_PASSWORD=yPQJDpDkggvIEC2Twck0iA
 #RCON_PORT=25576
 INIT_MEMORY=512M
 MAX_MEMORY=1536M
@@ -0,0 +1,14 @@
+TYPE=VELOCITY
+VELOCITY_VERSION=4.0.0-SNAPSHOT
+VELOCITY_BUILD_ID=5
+#PLUGINS=
+#SPIGET_PLUGINS=
+DEBUG=false
+DEBUG_HELPER=false
+ENABLE_RCON=false
+#RCON_PASSWORD=__GENERATE_MINECRAFT_PROXY_RCON_PASSWORD__
+#RCON_PORT=25576
+INIT_MEMORY=512M
+MAX_MEMORY=1536M
+#JVM_OPTS=
+JVM_XX_OPTS=-XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15
@@ -11,8 +11,8 @@ ENFORCE_SECURE_PROFILE=false

 # Server jar options
 TYPE=PURPUR
-VERSION=1.21.11
-PURPUR_BUILD=2568
+VERSION=26.2
+PURPUR_BUILD=2608
 FORCE_REDOWNLOAD=false
 BUILD_FROM_SOURCE=false

@@ -64,7 +64,7 @@ ALLOW_FLIGHT=false

 # RCON options
 ENABLE_RCON=false
-RCON_PASSWORD=6hxU3Oxmh2Q8e6S9fjkdWJik
+RCON_PASSWORD=rDqV6FrU5NypcJQtXhbOgA
 RCON_PORT=25575
 BROADCAST_CONSOLE_TO_OPS=true
 BROADCAST_RCON_TO_OPS=true
@@ -78,4 +78,3 @@ SNOOPER_ENABLED=true
 ENABLE_STATUS=true
 PREVIEWS_CHAT=false
 #SYNC_CHUNK_WRITES=true
-
@@ -0,0 +1,80 @@
+# Base options
+EULA=true
+ONLINE_MODE=false
+SERVER_PORT=25565
+SERVER_NAME=MyServer
+ICON=https://github.com/bensuperpc/docker-minecraft-server/releases/download/Test_world/icon_64x64.png
+OVERRIDE_ICON=true
+MOTD=A §l§cMinecraft§r §nserver
+OVERRIDE_SERVER_PROPERTIES=true
+ENFORCE_SECURE_PROFILE=false
+
+# Server jar options
+TYPE=PURPUR
+VERSION=26.2
+PURPUR_BUILD=2608
+FORCE_REDOWNLOAD=false
+BUILD_FROM_SOURCE=false
+
+#       Server options
+INIT_MEMORY=2G
+MAX_MEMORY=12G
+EXEC_DIRECTLY=false
+USE_AIKAR_FLAGS=true
+USE_SIMD_FLAGS=true
+# TUNE_VIRTUALIZED=true
+# ENABLE_JMX=true
+CONSOLE=false
+GUI=false
+TZ=Europe/Paris
+
+# OPS options
+OPS=Bensuperpc
+# OPS_FILE=
+OVERRIDE_OPS=true
+#OP_PERMISSION_LEVEL=4
+#FUNCTION_PERMISSION_LEVEL
+
+# WHITELIST options
+ENABLE_WHITELIST=false
+OVERRIDE_WHITELIST=true
+#WHITELIST=Bensuperpc
+# WHITELIST_FILE=
+ENFORCE_WHITELIST=false
+
+# AUTOPAUSE options
+ENABLE_AUTOPAUSE=false
+AUTOPAUSE_TIMEOUT_EST=7200000
+AUTOPAUSE_TIMEOUT_INIT=3600000
+AUTOPAUSE_TIMEOUT_KN=480000
+
+# AUTOSTOP options
+# ENABLE_AUTOSTOP=true
+# AUTOSTOP_TIMEOUT_EST
+# AUTOSTOP_TIMEOUT_INIT
+# AUTOSTOP_PERIOD
+
+NETWORK_COMPRESSION_THRESHOLD=-1
+LOG_TIMESTAMP=true
+MAX_TICK_TIME=-1
+# Time (sec) before AFK player was disconnected
+PLAYER_IDLE_TIMEOUT=600
+MAX_PLAYERS=32
+ALLOW_FLIGHT=false
+
+# RCON options
+ENABLE_RCON=false
+RCON_PASSWORD=__GENERATE_MINECRAFT_RCON_PASSWORD__
+RCON_PORT=25575
+BROADCAST_CONSOLE_TO_OPS=true
+BROADCAST_RCON_TO_OPS=true
+
+# QUERY options
+#ENABLE_QUERY=true
+#QUERY_PORT=25565
+
+# Others options
+SNOOPER_ENABLED=true
+ENABLE_STATUS=true
+PREVIEWS_CHAT=false
+#SYNC_CHUNK_WRITES=true
@@ -19,4 +19,4 @@ SEED=3820
 # Spawn Entities Options
 SPAWN_ANIMALS=true
 SPAWN_MONSTERS=true
-SPAWN_NPCS=true
+SPAWN_NPCS=true
@@ -0,0 +1,22 @@
+LEVEL=world
+LEVEL_TYPE=default
+#      MAX_WORLD_SIZE=10000
+#      MAX_BUILD_HEIGHT=256
+ALLOW_NETHER=true
+GENERATE_STRUCTURES=true
+VIEW_DISTANCE=12
+SIMULATION_DISTANCE=10
+ENABLE_COMMAND_BLOCK=true
+ANNOUNCE_PLAYER_ACHIEVEMENTS=true
+PVP=true
+DIFFICULTY=hard
+FORCE_GAMEMODE=false
+MODE=survival
+HARDCORE=false
+SPAWN_PROTECTION=16
+SEED=3820
+
+# Spawn Entities Options
+SPAWN_ANIMALS=true
+SPAWN_MONSTERS=true
+SPAWN_NPCS=true
@@ -1,6 +1,6 @@
 services:
  satisfactory_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
    container_name: satisfactory_backup
    profiles:
      - satisfactory_backup
@@ -0,0 +1,14 @@
+#RUN_ON_STARTUP=true
+RESTIC_REPOSITORY=/mnt/restic
+RESTIC_BACKUP_SOURCES=/data
+RESTIC_PASSWORD=__GENERATE_SATISFACTORY_RESTIC_PASSWORD__
+# Backup (exuclusive with Check and Prune)
+BACKUP_CRON=*/15 * * * *
+RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
+RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
+# Check (exuclusive with Check and Prune)
+#CHECK_CRON=*/15 * * * *
+#RESTIC_CHECK_ARGS=--read-data-subset=40%
+# Prune (exuclusive with Check and Prune)
+#PRUNE_CRON=*/15 * * * *
+#RESTIC_PRUNE_ARGS=
@@ -1,11 +1,13 @@
 services:
  # Satisfactory server
  satisfactory_server:
-    image: wolveix/satisfactory-server:latest
+    extends:
+      file: ../../../common.yml
+      service: service-base
+    image: wolveix/satisfactory-server:${SATISFACTORY_DOCKER_TAG:-latest}
    container_name: satisfactory_server
    profiles:
      - satisfactory_server
-    restart: on-failure:7
    ports:
      - 7777:7777/udp
      - 7777:7777/tcp
@@ -19,17 +21,12 @@ services:
    environment:
      - PUID=${PUID:-1000}
      - PGID=${PGID:-1000}
-      - TZ=${TZ:-Europe/Paris}
-    security_opt:
-      - no-new-privileges:true
    healthcheck:
      test: bash /healthcheck.sh
      interval: 30s
      timeout: 10s
      retries: 3
      start_period: 120s
-    cap_drop:
-      - SYS_ADMIN

 volumes:
  satisfactory_server_config:
@@ -14,4 +14,4 @@ TIMEOUT=60

 AUTOSAVEONDISCONNECT=true
 CRASHREPORT=true
-NETWORKQUALITY=3
+NETWORKQUALITY=3
@@ -0,0 +1,17 @@
+AUTOSAVENUM=10
+DEBUG=false
+DISABLESEASONALEVENTS=false
+MAXOBJECTS=4325376
+MAXPLAYERS=4
+MAXTICKRATE=30
+ROOTLESS=false
+SERVERGAMEPORT=7777
+SERVERIP=0.0.0.0
+SERVERSTREAMING=true
+SKIPUPDATE=false
+STEAMBETA=false
+TIMEOUT=60
+
+AUTOSAVEONDISCONNECT=true
+CRASHREPORT=true
+NETWORKQUALITY=3
@@ -1,6 +1,6 @@
 services:
  teamfortress2_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
    container_name: teamfortress2_backup
    profiles:
      - teamfortress2_backup
@@ -1,7 +1,7 @@
 #RUN_ON_STARTUP=true
 RESTIC_REPOSITORY=/mnt/restic
 RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=SCY5cmu12Odca302EXabPA9jXYkCb2NN
+RESTIC_PASSWORD=QqnhpwUt3Ej_DzUlGbA1EQ
 # Backup (exuclusive with Check and Prune)
 BACKUP_CRON=*/15 * * * *
 RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
@@ -11,4 +11,4 @@ RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
 #RESTIC_CHECK_ARGS=--read-data-subset=40%
 # Prune (exuclusive with Check and Prune)
 #PRUNE_CRON=*/15 * * * *
-#RESTIC_PRUNE_ARGS=
+#RESTIC_PRUNE_ARGS=
@@ -0,0 +1,14 @@
+#RUN_ON_STARTUP=true
+RESTIC_REPOSITORY=/mnt/restic
+RESTIC_BACKUP_SOURCES=/data
+RESTIC_PASSWORD=__GENERATE_TEAMFORTRESS2_RESTIC_PASSWORD__
+# Backup (exuclusive with Check and Prune)
+BACKUP_CRON=*/15 * * * *
+RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
+#RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
+# Check (exuclusive with Check and Prune)
+#CHECK_CRON=*/15 * * * *
+#RESTIC_CHECK_ARGS=--read-data-subset=40%
+# Prune (exuclusive with Check and Prune)
+#PRUNE_CRON=*/15 * * * *
+#RESTIC_PRUNE_ARGS=
@@ -1,11 +1,13 @@
 services:
  # Team Fortress 2 server
  teamfortress2_server:
-    image: cm2network/tf2:sourcemod-x64
+    extends:
+      file: ../../../common.yml
+      service: service-base
+    image: cm2network/tf2:${TEAMFORTRESS2_DOCKER_TAG:-sourcemod-x64}
    container_name: teamfortress2_server
    profiles:
      - teamfortress2_server
-    restart: on-failure:7
    ports:
     - "27015:27015/tcp"
     - "27015:27015/udp"
@@ -15,16 +17,10 @@ services:
      - teamfortress2-network
    env_file:
      - ./env/teamfortress2.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
+#    environment:
 #      - PUID=${PUID:-1000}
 #      - PGID=${PGID:-1000}

-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN
-
 volumes:
  teamfortress2_data:
    name: teamfortress2_data
@@ -0,0 +1,12 @@
+# Get a free Game Server Login Token from https://steamcommunity.com/dev/managegameservers
+# This is NOT a value make init can generate for you, you must fill it in yourself.
+SRCDS_TOKEN=CHANGEME_STEAM_GSLT_TOKEN
+SRCDS_PW=2Ql1Qm4KHtGGEl8Fk5X3Lw
+SRCDS_PORT=27015
+SRCDS_MAXPLAYERS=32
+SRCDS_REGION=3
+SRCDS_STARTMAP=pl_goldrush
+#SRCDS_MAPCYCLE="mapcycle_default.txt"
+#pl_badwater
+SRCDS_CFG=server.cfg
+SRCDS_SECURED=0
@@ -0,0 +1,12 @@
+# Get a free Game Server Login Token from https://steamcommunity.com/dev/managegameservers
+# This is NOT a value make init can generate for you, you must fill it in yourself.
+SRCDS_TOKEN=CHANGEME_STEAM_GSLT_TOKEN
+SRCDS_PW=__GENERATE_TEAMFORTRESS2_SERVER_PW__
+SRCDS_PORT=27015
+SRCDS_MAXPLAYERS=32
+SRCDS_REGION=3
+SRCDS_STARTMAP=pl_goldrush
+#SRCDS_MAPCYCLE="mapcycle_default.txt"
+#pl_badwater
+SRCDS_CFG=server.cfg
+SRCDS_SECURED=0
@@ -1,7 +1,7 @@
 services:
  # argus
  argus:
-    image: releaseargus/argus:latest
+    image: releaseargus/argus:${ARGUS_DOCKER_TAG:-latest}
    container_name: argus
    profiles:
      - argus
@@ -10,6 +10,9 @@ authentication_backend:
  file:
    path: /config/users_database.yml

+# totp:
+#   issuer: bensuperpc.org
+
 access_control:
  default_policy: deny
  rules:
@@ -25,7 +28,7 @@ access_control:
        - "homepage.bensuperpc.org"
        - "forgejo.bensuperpc.org"
      policy: bypass
-    - domain: 
+    - domain:
        - "jellyfin.bensuperpc.org"
        - "openwebui.bensuperpc.org"
        - "qbittorrent.bensuperpc.org"
@@ -37,8 +40,8 @@ access_control:
      subject:
      - 'group:admins'
      - 'group:users'
-      policy: one_factor      
-    - domain: 
+      policy: one_factor
+    - domain:
        - "*.bensuperpc.org"
      subject:
      - 'group:admins'
@@ -68,4 +71,8 @@ storage:

 notifier:
  filesystem:
-    filename: /config/notification.txt
+    filename: /config/notification.txt
+  # smtp:
+  #   address: "submission://smtp.example.com:587"
+  #   username: bensuperpc
+  #   sender: "Authelia <authelia@bensuperpc.org>"
@@ -1,41 +1,41 @@
 services:
  authelia:
    container_name: authelia    
-    image: authelia/authelia:latest
+    image: authelia/authelia:${AUTHELIA_DOCKER_TAG:-4.39.20}
    profiles:
      - authelia
      - caddy
    depends_on:
      authelia-postgres:
        condition: service_healthy
+    extends:
+      file: ../../common.yml
+      service: service-base
    # environment:
    #   - TZ=America/New_York
 #       - PUID=${PUID:-1000}
 #       - PGID=${PGID:-1000}
    env_file:
      - ./env/authelia.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
    volumes:
      - ./config:/config
    networks:
      - caddy-infra
      - authelia-internal
-    restart: on-failure:7

  authelia-postgres:
-    image: postgres:17-alpine
+    image: postgres:${AUTHELIA_POSTGRES_DOCKER_TAG:-18.4-alpine3.24}
    container_name: authelia-postgres
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    volumes:
-      - authelia_db_data:/var/lib/postgresql/data
+      - authelia_db_data:/var/lib/postgresql
    env_file:
      - ./env/authelia_postgres.env
    profiles:
      - authelia
      - caddy
-    environment:
-      - TZ=${TZ:-Europe/Paris}
    healthcheck:
      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}" ]
      interval: 5s
@@ -1,7 +0,0 @@
-AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=ht87MVnXkXhBpDkMUHqKDqdg8UGBJt+Fx5jNIqXnN2k=
-AUTHELIA_SESSION_SECRET=nsvbXKGRXVZUCUkOapntlq/Zh+d75WacTK5Jgyh8zYk=
-AUTHELIA_STORAGE_ENCRYPTION_KEY=aWeIT74xIhGVd9nUOr4YTToTl5rpBEbzc/fv4jemuos=
-AUTHELIA_STORAGE_POSTGRES_ADDRESS=tcp://authelia-postgres:5432
-AUTHELIA_STORAGE_POSTGRES_DATABASE=authelia_db
-AUTHELIA_STORAGE_POSTGRES_USERNAME=authelia
-AUTHELIA_STORAGE_POSTGRES_PASSWORD=sAdkxFW6k3GiMOrlBpl6OV76eb9cQz/uk95jmA2UpI8=
@@ -0,0 +1,8 @@
+AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET=__GENERATE_AUTHELIA_JWT_SECRET__
+AUTHELIA_SESSION_SECRET=__GENERATE_AUTHELIA_SESSION_SECRET__
+AUTHELIA_STORAGE_ENCRYPTION_KEY=__GENERATE_AUTHELIA_STORAGE_ENCRYPTION_KEY__
+AUTHELIA_STORAGE_POSTGRES_ADDRESS=tcp://authelia-postgres:5432
+AUTHELIA_STORAGE_POSTGRES_DATABASE=authelia_db
+AUTHELIA_STORAGE_POSTGRES_USERNAME=authelia
+AUTHELIA_STORAGE_POSTGRES_PASSWORD=__GENERATE_AUTHELIA_DB_PASSWORD__
+#AUTHELIA_NOTIFIER_SMTP_PASSWORD=your-smtp-password-here
@@ -1,3 +0,0 @@
-POSTGRES_USER=authelia
-POSTGRES_PASSWORD=sAdkxFW6k3GiMOrlBpl6OV76eb9cQz/uk95jmA2UpI8=
-POSTGRES_DB=authelia_db
@@ -0,0 +1,3 @@
+POSTGRES_USER=authelia
+POSTGRES_PASSWORD=__GENERATE_AUTHELIA_DB_PASSWORD__
+POSTGRES_DB=authelia_db
@@ -1,9 +1,9 @@
 services:
  bentopdf:
    extends:
-      file: ../common.yml
+      file: ../../common.yml
      service: service-base
-    image: ghcr.io/alam00000/bentopdf-simple:latest
+    image: ghcr.io/alam00000/bentopdf-simple:${BENTOPDF_DOCKER_TAG:-latest}
    container_name: bentopdf
    profiles:
      - bentopdf
@@ -47,3 +47,4 @@ import website/dozzle.caddy
 import website/litellm.caddy
 import website/localai.caddy
 import website/bentopdf.caddy
+import website/vscode.caddy
@@ -0,0 +1,6 @@
+{$SCHEME}://vscode.{$MAIN_DOMAIN} {
+	import authelia_middleware
+	reverse_proxy {$VSCODE_SERVER_ADDRESS} {
+		header_up Host {upstream_hostport}
+	}
+}
@@ -2,14 +2,13 @@ services:
  # Caddy
  caddy:
    #image: bensuperpc/caddy-l4:latest
-    image: caddy:latest
+    image: caddy:${CADDY_DOCKER_TAG:-latest}
    container_name: caddy
    profiles:
      - caddy
    depends_on:
      main_infrastructure:
        condition: service_completed_successfully
-    restart: on-failure:7
    ports:
      - 80:80/tcp
      - 80:80/udp
@@ -32,10 +31,9 @@ services:
      - caddy-web
    env_file:
      - ./env/caddy.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
-    security_opt:
-      - no-new-privileges:true
+    extends:
+      file: ../../common.yml
+      service: service-base
    healthcheck:
      test: pidof caddy || exit 1
      interval: 120s
@@ -43,7 +41,7 @@ services:
      retries: 3

  caddy_backup:
-    image: mazzolino/restic:latest
+    image: mazzolino/restic:${RESTIC_DOCKER_TAG:-latest}
    container_name: caddy_backup
    profiles:
      - caddy
@@ -25,6 +25,7 @@ AUTHELIA_ADDRESS=authelia:9091
 DOZZLE_ADDRESS=dozzle:8080
 LOCALAI_ADDRESS=localai:8080
 BENTOPDF_ADDRESS=bentopdf:8080
+VSCODE_SERVER_ADDRESS=vscode-server:8443
 # Scheme
 SCHEME=https
 # ignore_loaded_certs off
@@ -1,7 +1,7 @@
 #RUN_ON_STARTUP=true
 RESTIC_REPOSITORY=/mnt/restic
 RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=YFQh8v3Wi95v0p6h88D4u8C8z4gLfdMw
+RESTIC_PASSWORD=__GENERATE_CADDY_RESTIC_PASSWORD__
 # Backup (exuclusive with Check and Prune)
 BACKUP_CRON=*/30 * * * *
 RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
@@ -11,4 +11,4 @@ RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
 #RESTIC_CHECK_ARGS=--read-data-subset=40%
 # Prune (exuclusive with Check and Prune)
 #PRUNE_CRON=*/30 * * * *
-#RESTIC_PRUNE_ARGS=
+#RESTIC_PRUNE_ARGS=
@@ -0,0 +1,50 @@
+services:
+  # vscode-server
+  vscode-server:
+    restart: on-failure:7
+    image: lscr.io/linuxserver/code-server:${VSCODE_SERVER_DOCKER_TAG:-latest}
+    container_name: vscode-server
+    ports:
+      - 8443:8443
+    environment:
+      - TZ=${TZ:-Europe/Paris}
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+    env_file:
+      - env/vscode-server.env
+    profiles:
+      - vscode-server
+    depends_on:
+      - docker-dind
+    volumes:
+      - vscode-server_config:/config:rw
+    networks:
+      - vscode-server
+
+  # docker-dind
+  docker-dind:
+    image: docker:dind
+    container_name: docker-dind
+    restart: on-failure:7
+    privileged: true
+    entrypoint: ["dockerd"]
+    command:
+      - --host=unix:///var/run/docker.sock
+      - --host=tcp://0.0.0.0:2375
+    volumes:
+      - docker-dind-data:/var/lib/docker
+    networks:
+      - vscode-server
+    profiles:
+      - vscode-server
+
+networks:
+  vscode-server:
+    driver: bridge
+    name: vscode-server
+
+volumes:
+  vscode-server_config:
+    name: vscode-server_config
+  docker-dind-data:
+    name: docker-dind-data
@@ -0,0 +1,5 @@
+SUDO_PASSWORD=__GENERATE_SUDO_VSCODE_SERVER_PASSWORD__
+PASSWORD=__GENERATE_VSCODE_SERVER_PASSWORD__
+PROXY_DOMAIN=vscode.bensuperpc.org
+DOCKER_MODS=linuxserver/mods:code-server-python3|linuxserver/mods:universal-docker
+DOCKER_HOST=tcp://docker-dind:2375
@@ -1,36 +1,32 @@
 services:
  # cyberchef
  cyberchef0:
-    image: mpepping/cyberchef:latest
+    extends:
+      file: ../../common.yml
+      service: service-base
+    image: mpepping/cyberchef:${CYBERCHEF_DOCKER_TAG:-latest}
    container_name: cyberchef0
    profiles:
      - cyberchef
-    restart: on-failure:7
    depends_on:
      - caddy
    networks:
      - caddy-tools
    read_only: false
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN

  cyberchef1:
-    image: mpepping/cyberchef:latest
+    extends:
+      file: ../../common.yml
+      service: service-base
+    image: mpepping/cyberchef:${CYBERCHEF_DOCKER_TAG:-latest}
    container_name: cyberchef1
    profiles:
      - cyberchef
-    restart: on-failure:7
    depends_on:
      - caddy
    networks:
      - caddy-tools
    read_only: false
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - SYS_ADMIN

 networks:
  caddy-tools:
@@ -1,6 +1,6 @@
 services:
  dependency-track-apiserver:
-    image: dependencytrack/apiserver
+    image: dependencytrack/apiserver:${DEPENDENCY_TRACK_API_DOCKER_TAG:-latest}
    container_name: dependency-track-apiserver
    profiles:
      - dependency-track
@@ -9,7 +9,9 @@ services:
        condition: service_healthy
    env_file:
      - ./env/dependency-track.env
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    networks:
      - caddy-web
      - dependency-track-internal
@@ -17,11 +19,13 @@ services:
    - 'dtrack-data:/data'

  dependency-track-frontend:
-    image: dependencytrack/frontend
+    image: dependencytrack/frontend:${DEPENDENCY_TRACK_FRONTEND_DOCKER_TAG:-latest}
    container_name: dependency-track-frontend
    profiles:
      - dependency-track
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    networks:
      - caddy-web
      - dependency-track-internal
@@ -30,19 +34,19 @@ services:
        condition: service_healthy
      caddy:
        condition: service_healthy
-    security_opt:
-      - no-new-privileges:true
    env_file:
      - ./env/dependency-track.env

  dependency-track-postgres:
-    image: postgres:17-alpine
+    image: postgres:${DEPENDENCY_TRACK_POSTGRES_DOCKER_TAG:-17-alpine}
    container_name: dependency-track-postgres
    profiles:
      - dependency-track
    env_file:
      - ./env/postgres.env
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    networks:
      - dependency-track-internal
    healthcheck:
@@ -2,6 +2,6 @@ ALPINE_DATABASE_MODE="external"
 ALPINE_DATABASE_URL="jdbc:postgresql://dependency-track-postgres:5432/dtrack"
 ALPINE_DATABASE_DRIVER="org.postgresql.Driver"
 ALPINE_DATABASE_USERNAME="dtrack"
-ALPINE_DATABASE_PASSWORD="dtrack"
+ALPINE_DATABASE_PASSWORD="__GENERATE_DTRACK_DB_PASSWORD__"

 API_BASE_URL="https://dependency-track.bensuperpc.org"
@@ -1,3 +0,0 @@
-POSTGRES_DB="dtrack"
-POSTGRES_USER="dtrack"
-POSTGRES_PASSWORD="dtrack"
@@ -0,0 +1,3 @@
+POSTGRES_DB="dtrack"
+POSTGRES_USER="dtrack"
+POSTGRES_PASSWORD="__GENERATE_DTRACK_DB_PASSWORD__"
@@ -1,7 +1,8 @@
 users:
-  bensuperpc:
-    email: bensuperpc@gmail.com
-    name: bensuperpc
+  admin:
+    email: me@email.net
+    name: admin
+    # docker run -it --rm amir20/dozzle generate admin --password password --email me@email.net --name "admin"
    password: $2a$11$w56N4NICh5xD5Bbq6Z2Z2ef9/QUaa/YKleMiawn/Bru9hYsQOJyrm
    filter: ""
    roles: ""
@@ -1,6 +1,6 @@
 services:
  dozzle:
-    image: amir20/dozzle:latest
+    image: amir20/dozzle:${DOZZLE_DOCKER_TAG:-latest}
    container_name: dozzle
    profiles:
      - dozzle
@@ -22,7 +22,7 @@ services:
      - dozzle-internal
    
  dozzle-dockerproxy:
-    image: tecnativa/docker-socket-proxy:latest
+    image: tecnativa/docker-socket-proxy:${DOCKER_SOCKET_PROXY_DOCKER_TAG:-latest}
    container_name: dozzle-dockerproxy
    profiles:
      - dozzle
@@ -1,12 +1,14 @@
 services:
  # dufs
  dufs:
-    image: sigoden/dufs:latest
+    image: sigoden/dufs:${DUFS_DOCKER_TAG:-latest}
    container_name: dufs
    profiles:
      - dufs
 #    user: ${PUID:-1000}:${PGID:-1000} 
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    depends_on:
      - caddy
    env_file:
@@ -15,8 +17,6 @@ services:
      - public_data:/data
    networks:
      - caddy-files
-    security_opt:
-      - no-new-privileges:true

 volumes:
  public_data:
@@ -4,4 +4,4 @@ DUFS_SERVE_PATH=/data
 DUFS_HIDDEN=tmp,*.log,*.lock
 DUFS_ALLOW_ALL=true
 DUFS_COMPRESS=medium
-DUFS_AUTH="admin:heqihlOfBmJDESGFlpbPi7P7Mi6F7RkV@/:rw|@/:ro"
+DUFS_AUTH="admin:__GENERATE_DUFS_PASSWORD__@/:rw|@/:ro"
@@ -1,7 +1,7 @@
 services:
  # forgejo
  forgejo:
-    image: codeberg.org/forgejo/forgejo:15
+    image: codeberg.org/forgejo/forgejo:${FORGEJO_DOCKER_TAG:-15}
    container_name: forgejo
    profiles:
      - forgejo
@@ -26,13 +26,15 @@ services:
  
  # Database forgejo
  database_forgejo:
-    image: mariadb:latest
+    image: mariadb:${FORGEJO_DB_DOCKER_TAG:-latest}
    container_name: database_forgejo
    profiles:
      - forgejo
    depends_on:
      - caddy
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    volumes:
      - forgejo_db:/var/lib/mysql:rw
    env_file:
@@ -40,12 +42,10 @@ services:
    command: '--default-authentication-plugin=mysql_native_password'
    networks:
      - forgejo-internal
-    security_opt:
-      - no-new-privileges:true

  # forgejo-runner
  docker-in-docker:
-    image: code.forgejo.org/oci/docker:dind
+    image: code.forgejo.org/oci/docker:${FORGEJO_DIND_DOCKER_TAG:-dind}
    container_name: 'docker_dind'
    hostname: docker
    networks:
@@ -60,7 +60,7 @@ services:
      - forgejo_certs:/certs

  forgejo_runner:
-    image: data.forgejo.org/forgejo/runner:12
+    image: data.forgejo.org/forgejo/runner:${FORGEJO_RUNNER_DOCKER_TAG:-12}
    networks:
      - forgejo-internal
    profiles:
@@ -4,7 +4,7 @@ FORGEJO__database__DB_TYPE=mysql
 FORGEJO__database__HOST=database_forgejo:3306
 FORGEJO__database__NAME=forgejo
 FORGEJO__database__USER=bensuperpc
-FORGEJO__database__PASSWD=ZcuHcM9tnIEM7EEO7R5jCpEt6v1d6r7s
+FORGEJO__database__PASSWD=__GENERATE_FORGEJO_DB_PASSWORD__
 FORGEJO__APP_NAME=Bensuperpc's Forgejo
 FORGEJO__APP_SLOGAN=Personal Code, Mirrors, and More
 FORGEJO__server__DOMAIN=git.bensuperpc.org
@@ -13,7 +13,7 @@ FORGEJO__server__HTTP_PORT=3000
 FORGEJO__server__SSH_LISTEN_PORT=2222
 FORGEJO__server__SSH_PORT=22
 FORGEJO__server__ROOT_URL=https://git.bensuperpc.org
-FORGEJO__security__SECRET_KEY=7IWrMh7mC7UMo1SowvUsAT2LOX49eU6P
+FORGEJO__security__SECRET_KEY=__GENERATE_FORGEJO_SECRET_KEY__
 #FORGEJO__security__INTERNAL_TOKEN=
 FORGEJO__security__INSTALL_LOCK=true
 FORGEJO__security__MIN_PASSWORD_LENGTH=8
@@ -22,4 +22,4 @@ FORGEJO__actions__DEFAULT_ACTIONS_URL="https://git.bensuperpc.org"
 #FORGEJO__log__LEVEL: "debug"
 FORGEJO__repository__ENABLE_PUSH_CREATE_USER=true
 FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE=false
-FORGEJO__repository__DEFAULT_REPO_UNITS=repo.code,repo.actions
+FORGEJO__repository__DEFAULT_REPO_UNITS=repo.code,repo.actions
@@ -1,4 +0,0 @@
-MARIADB_ROOT_PASSWORD=ZI8Trbot3b8WGqE5AKj1yphKMu4v9qQw
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=ZcuHcM9tnIEM7EEO7R5jCpEt6v1d6r7s
-MARIADB_DATABASE=forgejo
@@ -0,0 +1,4 @@
+MARIADB_ROOT_PASSWORD=__GENERATE_FORGEJO_DB_ROOT_PASSWORD__
+MARIADB_USER=bensuperpc
+MARIADB_PASSWORD=__GENERATE_FORGEJO_DB_PASSWORD__
+MARIADB_DATABASE=forgejo
@@ -1,3 +1,3 @@
 DOCKER_HOST=tcp://docker:2376
 DOCKER_CERT_PATH=/certs/client
-DOCKER_TLS_VERIFY=1
+DOCKER_TLS_VERIFY=1
@@ -152,6 +152,13 @@
        # ping: transmission.bensuperpc.org
        container: transmission
        server: my-docker
+    - vscode-server:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/vscode.png
+        href: https://vscode.bensuperpc.org/
+        description: VS Code Server
+        # ping: vscode.bensuperpc.org
+        container: vscode-server
+        server: my-docker

 - Games:
    - minecraft:
@@ -1,11 +1,13 @@
 services:
  # homepage
  homepage:
-    image: ghcr.io/gethomepage/homepage:latest
+    image: ghcr.io/gethomepage/homepage:${HOMEPAGE_DOCKER_TAG:-latest}
    container_name: homepage
    profiles:
      - homepage
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
 #    environment:
 #      - PUID=${PUID:-1000}
 #      - PGID=${PGID:-1000}
@@ -14,8 +16,6 @@ services:
      - homepage-dockerproxy
    env_file:
      - ./env/homepage.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
    volumes:
      - homepage_log:/app/logs
      - ./config:/app/config
@@ -23,11 +23,8 @@ services:
    networks:
      - caddy-infra
      - homepage-internal
-    security_opt:
-      - no-new-privileges:true
-
  homepage-dockerproxy:
-    image: tecnativa/docker-socket-proxy:latest
+    image: tecnativa/docker-socket-proxy:${DOCKER_SOCKET_PROXY_DOCKER_TAG:-latest}
    container_name: homepage-dockerproxy
    profiles:
      - homepage
@@ -2,9 +2,9 @@ services:
  # it-tools
  it-tools0:
    extends:
-      file: ../common.yml
+      file: ../../common.yml
      service: service-base
-    image: ghcr.io/sharevb/it-tools:latest
+    image: ghcr.io/sharevb/it-tools:${IT_TOOLS_DOCKER_TAG:-latest}
    container_name: it-tools0
    profiles:
      - it-tools
@@ -16,9 +16,9 @@ services:

  it-tools1:
    extends:
-      file: ../common.yml
+      file: ../../common.yml
      service: service-base
-    image: ghcr.io/sharevb/it-tools:latest
+    image: ghcr.io/sharevb/it-tools:${IT_TOOLS_DOCKER_TAG:-latest}
    container_name: it-tools1
    profiles:
      - it-tools
@@ -1,11 +1,13 @@
 services:
  # Jellyfin
  jellyfin:
-    image: lscr.io/linuxserver/jellyfin:latest
+    image: lscr.io/linuxserver/jellyfin:${JELLYFIN_DOCKER_TAG:-latest}
    container_name: jellyfin
    profiles:
      - jellyfin
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    environment:
      - PUID=${PUID:-1000}
      - PGID=${PGID:-1000}
@@ -24,8 +26,6 @@ services:
      - /dev/dri:/dev/dri
    networks:
      - caddy-media
-    security_opt:
-      - no-new-privileges:true

 volumes:
  jellyfin_config:
@@ -7,13 +7,13 @@ services:
    container_name: localai
    profiles:
      - localai
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    depends_on:
      - caddy
    env_file:
      - ./env/localai.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
    volumes:
      - localai_data:/data
      - localai_models:/models
@@ -21,8 +21,6 @@ services:
      - localai_config:/config
    networks:
      - caddy-ai
-    security_opt:
-      - no-new-privileges:true

 volumes:
  localai_models:
@@ -1,15 +1,16 @@
 services:
  main_infrastructure:
    container_name: main_infrastructure
-    image: alpine:latest
+    image: alpine:${ALPINE_DOCKER_TAG:-latest}
    profiles:
      - main_infrastructure
    volumes:
      - public_data:/public_data:rw
      - private_data:/private_data:rw
    read_only: true
-    security_opt:
-      - no-new-privileges:true
+    extends:
+      file: ../../common.yml
+      service: service-base
    cap_drop:
      - ALL
    cap_add:
@@ -22,7 +23,7 @@ services:
    container_name: watchtower
    profiles:
      - main_infrastructure
-    image: nickfedor/watchtower:latest
+    image: nickfedor/watchtower:${WATCHTOWER_DOCKER_TAG:-latest}
    environment:
      - TZ=${TZ:-Europe/Paris}
    volumes:
@@ -1,11 +1,13 @@
 services:
  # memos
  memos:
-    image: neosmemo/memos:latest
+    image: neosmemo/memos:${MEMOS_DOCKER_TAG:-latest}
    container_name: memos
    profiles:
      - memos
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    depends_on:
      - caddy
    env_file:
@@ -14,8 +16,6 @@ services:
      - memos_config:/var/opt/memos
    networks:
      - caddy-tools
-    security_opt:
-      - no-new-privileges:true

 volumes:
  memos_config:
@@ -1,8 +1,8 @@
 x-omni-tools: &omni-tools
  extends:
-    file: ../common.yml
+    file: ../../common.yml
    service: service-base
-  image: iib0011/omni-tools:latest
+  image: iib0011/omni-tools:${OMNI_TOOLS_DOCKER_TAG:-latest}
  profiles:
    - omni-tools
  depends_on:
@@ -2,14 +2,16 @@ name: openwebui

 services:
  ollama:
-    image: ollama/ollama:${OLLAMA_DOCKER_TAG:-0.30.11}
+    image: ollama/ollama:${OLLAMA_DOCKER_TAG:-0.32.4}
    container_name: ollama
    profiles:
      - openwebui
      - ollama
    depends_on:
      - caddy
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    tty: true
    volumes:
      - openwebui-ollama:/root/.ollama
@@ -17,10 +19,6 @@ services:
    #   - ${OLLAMA_PORT:-11434}:11434
    env_file:
      - ./env/openwebui-ollama.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
-    security_opt:
-      - no-new-privileges:true
    networks:
      - openwebui-internal
    # devices:
@@ -28,24 +26,22 @@ services:
    #   - /dev/kfd

  litellm:
-    image: ghcr.io/berriai/litellm:${LITELLM_DOCKER_TAG:-v1.89.6}
+    image: ghcr.io/berriai/litellm:${LITELLM_DOCKER_TAG:-v1.93.0}
    container_name: litellm
    profiles:
      - openwebui
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    depends_on:
      litellm-postgres:
        condition: service_healthy
    env_file:
      - ./env/litellm.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
    command: ["--port", "4000", "--detailed_debug"] 
    networks:
      - caddy-ai
      - openwebui-internal
-    security_opt:
-      - no-new-privileges:true

  litellm-postgres:
    image: postgres:${POSTGRES_DOCKER_TAG:-18.4-alpine3.24}
@@ -54,11 +50,11 @@ services:
      - openwebui
    env_file:
      - ./env/litellm-postgres.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
    volumes:
      - litellm-postgres:/var/lib/postgresql
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    networks:
      - openwebui-internal
    healthcheck:
@@ -74,11 +70,11 @@ services:
      - openwebui
    env_file:
      - ./env/openwebui-postgres.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
+    extends:
+      file: ../../common.yml
+      service: service-base
    volumes:
      - openwebui-postgres:/var/lib/postgresql
-    restart: on-failure:7
    networks:
      - openwebui-internal
    healthcheck:
@@ -88,10 +84,13 @@ services:
      retries: 5

  openwebui:
-    image: ghcr.io/open-webui/open-webui:${WEBUI_DOCKER_TAG:-git-ecd48e2}
+    image: ghcr.io/open-webui/open-webui:${OPEN_WEBUI_DOCKER_TAG:-v0.11.0}
    container_name: openwebui
    profiles:
      - openwebui
+    extends:
+      file: ../../common.yml
+      service: service-base
    volumes:
      - openwebui:/app/backend/data
    depends_on:
@@ -102,40 +101,37 @@ services:
      - valkey
    env_file:
      - ./env/openwebui.env
-    environment:
-      - TZ=${TZ:-Europe/Paris}
    #  - UID=${PUID:-1000}
    #  - GID=${PGID:-1000}
    # ports:
    #   - ${OPEN_WEBUI_PORT:-3000}:8080
-    restart: on-failure:7
    networks:
      - caddy-ai
      - openwebui-internal
-    security_opt:
-      - no-new-privileges:true

  openwebui-pipelines:
    image: ghcr.io/open-webui/pipelines:${WEBUI_PIPELINE_DOCKER_TAG:-git-039f9c5}
    container_name: openwebui-pipelines
    profiles:
      - openwebui
+    extends:
+      file: ../../common.yml
+      service: service-base
    networks:
      - openwebui-internal
    env_file:
      - ./env/openwebui-pipelines.env
-    restart: on-failure:7
    volumes:
      - openwebui-pipelines:/app/pipelines
-    security_opt:
-      - no-new-privileges:true

  qdrant:
-    image: qdrant/qdrant:${QDRANT_DOCKER_TAG:-v1.18.2}
+    image: qdrant/qdrant:${QDRANT_DOCKER_TAG:-v1.18.3}
    profiles:
      - openwebui
    container_name: qdrant
-    restart: on-failure:7
+    extends:
+      file: ../../common.yml
+      service: service-base
    # ports:
    #   - "6333:6333"
    #   - "6334:6334"
@@ -147,14 +143,18 @@ services:
      - openwebui-internal

  valkey:
-    image: valkey/valkey:${VALKEY_DOCKER_TAG:-9.1.0-alpine}
+    image: valkey/valkey:${VALKEY_DOCKER_TAG:-9.1.1-alpine}
    container_name: valkey
    profiles:
      - openwebui
    env_file:
      - ./env/openwebui-valkey.env
-    restart: on-failure:7
-    command: valkey-server --requirepass ${VALKEY_PASSWORD:-valkey_password} --maxclients 10000 --timeout 1800
+    extends:
+      file: ../../common.yml
+      service: service-base
+    # $$VALKEY_PASSWORD (not ${VALKEY_PASSWORD}) so it's expanded at container
+    # runtime from env_file, not at compose-parse time from the host shell.
+    command: sh -c 'exec valkey-server --requirepass "$$VALKEY_PASSWORD" --maxclients 10000 --timeout 1800'
    volumes:
      - openwebui-valkey:/data
    networks:
@@ -1,3 +0,0 @@
-POSTGRES_USER=litellm_user
-POSTGRES_PASSWORD=fdbdfsgfdghgjhfjtjgdfssdgsfdg
-POSTGRES_DB=litellm_db
@@ -0,0 +1,3 @@
+POSTGRES_USER=litellm_user
+POSTGRES_PASSWORD=__GENERATE_LITELLM_DB_PASSWORD__
+POSTGRES_DB=litellm_db
@@ -1,11 +0,0 @@
-DATABASE_URL=postgresql://litellm_user:fdbdfsgfdghgjhfjtjgdfssdgsfdg@litellm-postgres:5432/litellm_db
-
-LITELLM_MASTER_KEY=a51d5a17f7b8f96128866c6bfc903ec0
-
-LITELLM_MODE=proxy
-UI_USERNAME=admin
-UI_PASSWORD=ffdsfsdsfdggdfsgdfhgfsgfsg
-PROXY_BASE_URL=https://litellm.bensuperpc.org
-
-#OPENAI_API_KEY=
-#ANTHROPIC_API_KEY=
@@ -0,0 +1,11 @@
+DATABASE_URL=postgresql://litellm_user:__GENERATE_LITELLM_DB_PASSWORD__@litellm-postgres:5432/litellm_db
+
+LITELLM_MASTER_KEY=__GENERATE_LITELLM_MASTER_KEY__
+
+LITELLM_MODE=proxy
+UI_USERNAME=admin
+UI_PASSWORD=__GENERATE_LITELLM_UI_PASSWORD__
+PROXY_BASE_URL=https://litellm.bensuperpc.org
+
+#OPENAI_API_KEY=
+#ANTHROPIC_API_KEY=
@@ -1,4 +0,0 @@
-PGADMIN_DEFAULT_EMAIL=admin@local.ai
-PGADMIN_DEFAULT_PASSWORD=admin123
-PGADMIN_CONFIG_SERVER_MODE=False
-PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
@@ -0,0 +1,4 @@
+PGADMIN_DEFAULT_EMAIL=admin@local.ai
+PGADMIN_DEFAULT_PASSWORD=__GENERATE_PGADMIN_PASSWORD__
+PGADMIN_CONFIG_SERVER_MODE=False
+PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
@@ -1 +0,0 @@
-PIPELINES_API_KEY=ssdfsfdsfdgfgfg
@@ -0,0 +1 @@
+PIPELINES_API_KEY=__GENERATE_PIPELINES_API_KEY__
@@ -1,3 +0,0 @@
-POSTGRES_DB=openwebui
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=securepassword123
@@ -0,0 +1,3 @@
+POSTGRES_DB=openwebui
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=__GENERATE_OPENWEBUI_DB_PASSWORD__
@@ -1,2 +0,0 @@
-QDRANT__SERVICE__API_KEY=qdrant_api_key
-QDRANT__SERVICE__ENABLE_API_KEY_AUTHORIZATION=true
@@ -0,0 +1,2 @@
+QDRANT__SERVICE__API_KEY=__GENERATE_QDRANT_API_KEY__
+QDRANT__SERVICE__ENABLE_API_KEY_AUTHORIZATION=true
@@ -1 +0,0 @@
-VALKEY_PASSWORD=valkey_password
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`PIPELINES_API_KEY=__GENERATE_PIPELINES_API_KEY__`