From c8f48c4402c149e45b35a041574145e87f3d1c26 Mon Sep 17 00:00:00 2001
From: noticons <79101622+noticons@users.noreply.github.com>
Date: Fri, 27 Dec 2024 19:16:06 +0000
Subject: [PATCH 1/2] Update docker-compose.yaml

fixed deprecated "links to" and changed to depends_on and setup a shiori network so each sub-package doesn't need an external network port.
---
 docker-compose.yaml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 96fd9d73d..41de21f85 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,32 +3,32 @@
 version: "3"
 services:
   shiori:
-    build:
-      context: .
-      dockerfile: Dockerfile.compose
+    image: ghcr.io/go-shiori/shiori
     container_name: shiori
     ports:
-      - "8080:8080"
+      - "8080:8080" #set port number if it needs to be different
     volumes:
       - "./dev-data:/srv/shiori"
       - ".:/src/shiori"
     restart: unless-stopped
-    links:
+    depends_on:
       - "postgres"
       - "mariadb"
     environment:
       SHIORI_DIR: /srv/shiori
       #SHIORI_DATABASE_URL: mysql://shiori:shiori@(mariadb)/shiori?charset=utf8mb4
       SHIORI_DATABASE_URL: postgres://shiori:shiori@postgres/shiori?sslmode=disable
-
+    networks:
+      shiori:
   postgres:
     image: postgres:15
     environment:
       POSTGRES_PASSWORD: shiori
       POSTGRES_USER: shiori
     ports:
-      - "5432:5432"
-
+      - 5432
+    networks:
+      shiori:
   mariadb:
     image: mariadb:11
     environment:
@@ -37,4 +37,10 @@ services:
       MYSQL_USER: shiori
       MYSQL_PASSWORD: shiori
     ports:
-      - "3306:3306"
+      - 3306
+    networks:
+      shiori:
+networks:
+  shiori:
+
+

From 57c65a3e17ff8689ec9236b16ae3e8e06ea3692a Mon Sep 17 00:00:00 2001
From: noticons <79101622+noticons@users.noreply.github.com>
Date: Tue, 31 Dec 2024 13:11:21 +0000
Subject: [PATCH 2/2] Update docker-compose.yaml

Co-authored-by: Felipe Martin <812088+fmartingr@users.noreply.github.com>
---
 docker-compose.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 41de21f85..cf2668b8f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -40,6 +40,7 @@ services:
       - 3306
     networks:
       shiori:
+
 networks:
   shiori: