fix

docker-compose.yml

@@ -237,11 +237,6 @@ services:
   website:
     image: marcpartensky/website
     restart: unless-stopped
-    build:
-      context: ~/git/website
-      dockerfile: ~/git/website/Dockerfile
-      args:
-        env_file: ~/git/website/.env
     env_file:
       - ./data/secrets/website.env
     environment:
@@ -389,10 +384,9 @@ services:
   servant:
     image: marcpartensky/servitor
     restart: unless-stopped
-    build: ~/git/servitor
 
   pandoc:
-    build: ~/git/pandoc-api
+    build: ../git/pandoc-api
     image: marcpartensky/pandoc-api
     restart: unless-stopped
     working_dir: /app
@@ -414,6 +408,29 @@ services:
       - nginx
       - caddy
 
+  # https://...com/itzg/docker-minecraft-server/blob/master/README.md
+  # minecraft_aventure:
+  #   image: itzg/minecraft-server
+  #   restart: always
+  #   environment:
+  #     - TZ=Europe/Paris
+  #     - OPS=MazexRedstone
+  #     - EULA=TRUE
+  #     - ENABLE_AUTOPAUSE=TRUE
+  #     - ENABLE_COMMAND_BLOCK=TRUE
+  #     - MEMORY=2G
+  #     - VERSION=1.13.2
+  #     - ICON=https://cdn.discordapp.com/attachments/507519157387132940/816443237384454144/maxime.png
+  #     - MOTD=Venez jouer sur le serveur de Marc Partensky. Venez! On est bien!
+  #     - WORLD=https://download2342.mediafire.com/89adsak3r96g/xavlx2bmrypq2s0/Across+The+Time+II+-+Time+For+Regrets+%28release+1.0.4%29.zip
+  #     # - MODS=https://www.example.com/mods/mod1.jar,https://www.example.com/mods/mod2.jar
+  #   tty: true
+  #   stdin_open: true
+  #   volumes:
+  #     - .srv/minecraft/data:/data
+  #   ports:
+  #     - "25565:25565"
+=======
   # https://~.com/itzg/docker-minecraft-server/blob/master/README.md
   minecraft_aventure:
     image: itzg/minecraft-server
@@ -520,7 +537,7 @@ services:
       - "traefik.http.services.minecraft.loadbalancer.server.port=8080"
 
   # pterodactyl:
-  #   build: ~/fork/panel
+  #   build: ../fork/panel
   #   restart: unless-stopped
   #   networks:
   #     - nginx
@@ -575,11 +592,6 @@ services:
 
 # env:
   #   image: marcpartensky/env
-  #   build:
-  #     context: ~/git/dotfiles
-  #     dockerfile: ~/git/dotfiles/Dockerfile
-  #     args:
-  #       env_file: ~/git/dotfiles/.env
   #   ports:
   #     - "22:7020"
   #     - "8022:7021"
@@ -624,13 +636,10 @@ services:
     image: marcpartensky/ialab
     user: nobody
     restart: unless-stopped
-    build:
-      context: ~/git/ialab
-      dockerfile: ~/git/ialab/Dockerfile
     environment:
       FLASK_APP: server.py
     # env_file:
-      # - ~/git/ialab/.flaskenv
+      # - ../git/ialab/.flaskenv
     # working_dir: /app
     entrypoint: flask run --host ialab --port 80
     # entrypoint: "gunicorn server:app"
@@ -650,11 +659,9 @@ services:
       - "traefik.http.services.ialab.loadbalancer.server.port=80"
 
   open_web_calendar:
-    working_dir: /app
+    image: marcpartensky/open_web_calendar
     restart: unless-stopped
-    build:
-      context: ~/fork/open-web-calendar
-      dockerfile: ~/fork/open-web-calendar/Dockerfile
+    working_dir: /app
     environment:
       - HOST=open_web_calendar
       - PORT=80
@@ -1020,6 +1027,7 @@ services:
   openvpn:
     image: kylemanna/openvpn
     restart: unless-stopped
+    user: root
     cap_add:
      - NET_ADMIN
     ports:
@@ -1043,7 +1051,7 @@ services:
     restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ~/.docker/config.json:/config.json
+      - ../.docker/config.json:/config.json
     networks:
       - caddy
       - nginx
@@ -1150,7 +1158,7 @@ services:
     image: poiret
     restart: unless-stopped
     build:
-      context: ~/git/poiret
+      context: ../git/poiret
     networks:
       - caddy
       - nginx
@@ -1175,8 +1183,6 @@ services:
     image: marcpartensky/brainperformer
     restart: unless-stopped
     # user: healingpath
-    build:
-      context: ~/git/brainperformer
     env_file: ./data/secrets/healingpath.env
     networks:
       - caddy
@@ -1248,9 +1254,9 @@ services:
     ports:
       - "7027:22"
     volumes:
-      - ~/.ssh:~/.ssh:ro
+      - ../.ssh:~/.ssh:ro
     environment:
-      SSH_KEYS_PATH: ~/.ssh
+      SSH_KEYS_PATH: ../.ssh
       SSH_HOSTNAME: marcpartensky.com
       SSH_PORT_LISTEN: 22
 
@@ -1447,6 +1453,7 @@ services:
       - ~/git/thaiwara:/var/www/localhost/htdocs
       - ~/git/thaiwara/etc/lighttpd:/etc/lighttpd
     tty: true
+>>>>>>> main
     networks:
       - caddy
       - nginx