Merge branch 'master' of github.com:acedanger/docker

memos/docker-compose.yml

@@ -3,7 +3,13 @@ services:
     image: ghcr.io/usememos/memos:latest
     container_name: memos
     volumes:
-      - ~/.memos/:/var/opt/memos
+      - ./.memos/:/var/opt/memos
     ports:
       - 5230:5230
+    networks:
+      - cloudflare_default
     restart: unless-stopped
+
+networks:
+  cloudflare_default:
+    external: true

nginxproxymanager/docker-compose.yml

@@ -1,12 +1,12 @@
 services:
   app:
-    image: 'jc21/nginx-proxy-manager:latest'
+    image: jc21/nginx-proxy-manager:latest
     restart: unless-stopped
     ports:
       # These ports are in format <host-port>:<container-port>
-      - '80:80' # Public HTTP Port
+      - 80:80 # Public HTTP Port
-      - '443:443' # Public HTTPS Port
+      - 443:443 # Public HTTPS Port
-      - '81:81' # Admin Web Port
+      - 81:81 # Admin Web Port
       # Add any other Stream port you want to expose
       # - '21:21' # FTP
 
@@ -20,23 +20,28 @@ services:
       # DISABLE_IPV6: 'true'
     environment:
       # Mysql/Maria connection parameters:
-      DB_MYSQL_HOST: "db"
+      DB_MYSQL_HOST: db
       DB_MYSQL_PORT: 3306
-      DB_MYSQL_USER: "npm"
+      DB_MYSQL_USER: npm
-      DB_MYSQL_PASSWORD: "npm"
+      DB_MYSQL_PASSWORD: npm
-      DB_MYSQL_NAME: "npm"
+      DB_MYSQL_NAME: npm
+    networks:
+      - cloudflare_default
     volumes:
       - ./data:/data
       - ./letsencrypt:/etc/letsencrypt
     depends_on:
       - db
   db:
-    image: 'jc21/mariadb-aria:latest'
+    image: jc21/mariadb-aria:latest
     restart: unless-stopped
     environment:
-      MYSQL_ROOT_PASSWORD: 'npm'
+      MYSQL_ROOT_PASSWORD: npm
-      MYSQL_DATABASE: 'npm'
+      MYSQL_DATABASE: npm
-      MYSQL_USER: 'npm'
+      MYSQL_USER: npm
-      MYSQL_PASSWORD: 'npm'
+      MYSQL_PASSWORD: npm
     volumes:
       - ./mysql:/var/lib/mysql
+networks:
+  cloudflare_default:
+    external: true

ntfy/docker-compose.yml

@@ -19,4 +19,10 @@ services:
         timeout: 10s
         retries: 3
         start_period: 40s
+    networks:
+      - cloudflare_default
     restart: unless-stopped
+
+networks:
+  cloudflare_default:
+    external: true

uptime-kuma/docker-compose.yml

@@ -6,7 +6,14 @@ services:
       - uptime-kuma:/app/data
     ports:
       - 6001:3001
+    networks:
+      - cloudflare_default
     restart: unless-stopped
 
 volumes:
   uptime-kuma: 
+    name: uptime-kuma
+
+networks:
+  cloudflare_default:
+    external: true

wiki/docker-compose.yml

@@ -8,8 +8,10 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: ${POSTGRES_USER}
     logging:
-      driver: "none"
+      driver: none
     restart: unless-stopped
+    networks:
+      - cloudflare_default
     volumes:
       - db-data:/var/lib/postgresql/data
 
@@ -26,7 +28,13 @@ services:
       DB_NAME: ${POSTGRES_DB}
     restart: unless-stopped
     ports:
-      - "8300:3000"
+      - 8300:3000
+    networks:
+      - cloudflare_default
 
 volumes:
   db-data:
+  
+networks:
+  cloudflare_default:
+    external: true