Web Development Umgebung angepasst

code-server/docker-compose.yml

@@ -16,7 +16,12 @@ services:
     volumes:
       - ./config:/config
       - /opt/webserver/DocumentRoot:/code
-      - ./code-server:/home/coder/.local/share/code-server
+      - www:/www
     ports:
       - 8181:8443
+      - 8184:5500
     restart: unless-stopped
+
+volumes:
+  www:
+    external: true

dev_webserver/docker-compose.yml

@@ -0,0 +1,49 @@
+version: "3"
+
+services: 
+  webserver:
+    container_name: dev_webserver
+    build: .
+    ports: 
+      - 8182:80
+    user: "www-data:www-data"
+    environment:
+      - TZ=Europe/Berlin
+    volumes: 
+#      - ./DocumentRoot:/var/www/html
+      - www:/var/www/html
+      - energie:/var/www/html/knx/archiv
+      - /etc/localtime:/etc/localtime:ro
+    restart: unless-stopped
+
+  database:
+    image: mariadb:latest
+    container_name: dev_webserver_mariadb
+    ports: 
+      - 3310:3306
+    environment: 
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - TZ=Europe/Berlin
+    volumes: 
+      - ./dbdata:/var/lib/mysql
+      - /etc/localtime:/etc/localtime:ro
+    restart: unless-stopped
+
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    container_name: dev_webserver_phpmyadmin
+    environment:
+      - TZ=Europe/Berlin
+    links:
+      - 'database:db'
+    ports:
+      - 8183:80
+    restart: unless-stopped
+
+volumes:
+  www:
+    external: true
+  energie:
+    external: true

webserver/docker-compose.yml

@@ -10,7 +10,9 @@ services:
     environment:
       - TZ=Europe/Berlin
     volumes: 
-      - ./DocumentRoot:/var/www/html
+#      - ./DocumentRoot:/var/www/html
+      - www:/var/www/html
+      - energie:/var/www/html/knx/archiv
       - /etc/localtime:/etc/localtime:ro
     restart: unless-stopped
 
@@ -40,25 +42,8 @@ services:
       - 8087:80
     restart: unless-stopped
 
-#  code-server:
-#    image: ghcr.io/linuxserver/code-server
-#    container_name: webserver_code-server
-#    environment:
-#      - PUID=33
-#      - PGID=33
-#      - TZ=Europe/Berlin
-#      - PASSWORD=${PASSWORD}
-#      - SUDO_PASSWORD=${SUDO_PASSWORD}
-#      - PROXY_DOMAIN=${PROXY_DOMAIN}
-#      - HASHED_PASSWORD= #optional
-#      - SUDO_PASSWORD_HASH= #optional
-#    volumes:
-#      - ./config:/config
-#      - ./DocumentRoot:/code
-#      - /var/run/docker.sock:/var/run/docker.sock:ro
-#      - /code-server:/home/coder/.local/share/code-server
-#    ports:
-#      - 8183:8443
-#    links:
-#      - 'webserver'
-#    restart: unless-stopped
+volumes:
+  www:
+    external: true
+  energie:
+    external: true

youtubeDL/docker-compose.yml

@@ -1,16 +1,20 @@
 version: "3.2"
 services:
     ytdl_material:
+        image: tzahi12345/youtubedl-material:latest
         container_name: youtubeDL
         environment: 
             ALLOW_CONFIG_MUTATIONS: 'true'
-        restart: always
         volumes:
             - ./appdata:/app/appdata
-            - ./audio:/app/audio
+            - youtubeDL:/app/audio
             - ./video:/app/video
             - ./subscriptions:/app/subscriptions
             - ./users:/app/users
         ports:
             - "8998:17442"
-        image: tzahi12345/youtubedl-material:latest
+        restart: always
+
+volumes:
+  youtubeDL:
+    external: true