From e62e5d39a70eb3614e84b1dc6d291973aa17c87c Mon Sep 17 00:00:00 2001
From: AnthonyAxenov <anthonyaxenov@gmail.com>
Date: Thu, 20 Feb 2025 09:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BF=D0=BE=D0=B7=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 25c97ad..df37618 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,19 +14,19 @@ volumes:
 
 networks:
   network:
-    external: false
+    driver: bridge
 
 services:
-  gitea-server:
+  gitea:
     <<: *common-attributes
     container_name: gitea
     image: gitea/gitea:latest-rootless
     environment:
       - GITEA__database__DB_TYPE=mysql
       - GITEA__database__HOST=gitea-db:3306
-      - GITEA__database__NAME=${GITEA_DB_USER:?check your .env file}
-      - GITEA__database__USER=${GITEA_DB_PASSWORD:?check your .env file}
-      - GITEA__database__PASSWD=${GITEA_DB_NAME:?check your .env file}
+      - GITEA__database__NAME=${GITEA_DB_NAME:?check your .env file}
+      - GITEA__database__USER=${GITEA_DB_USER:?check your .env file}
+      - GITEA__database__PASSWD=${GITEA_DB_PASSWORD:?check your .env file}
     volumes:
       # copy backup files first to pass them inside
       - ./gitea/app.ini:/etc/gitea/app.ini
@@ -53,25 +53,18 @@ services:
     ports:
       - ${HOST_DB_PORT:-3306}:3306
 
-  opengist-server:
+  opengist:
     <<: *common-attributes
     image: thomiceli/opengist:latest
     container_name: opengist
     environment:
       OG_DB_URI: mysql://${OG_DB_USER:?check your .env file}:${OG_DB_PASSWORD:?check your .env file}@opengist-db:3306/${OG_DB_NAME:-opengist}
-      # OG_GITEA_CLIENT_KEY: ${OG_GITEA_CLIENT_KEY}
-      # OG_GITEA_SECRET: ${OG_GITEA_SECRET}
-      # OG_GITEA_URL: http://localhost:${GITEA_HOST_WEB_PORT:-8080}
-      OG_CUSTOM_STATIC_LINK_0_NAME: Gitea
-      OG_CUSTOM_STATIC_LINK_0_PATH: http://localhost:${GITEA_HOST_WEB_PORT:-8080}
     ports:
       - ${OG_HOST_WEB_PORT:-8081}:6157
       - ${OG_HOST_SSH_PORT:-223}:2222
     volumes:
       # copy backup files first to pass them inside
       - ./opengist/data:/opengist
-    links:
-      - gitea-server
     depends_on:
       - opengist-db