modified

docker-compose.yml

@@ -12,19 +12,15 @@ services:
       - GITEA__database__NAME=gitea
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=A68nMCsvzyvueYwE
-      - SSH_DOMAIN=ssh.git.zinomedia.de
+      - SSH_DOMAIN=git.zinomedia.de
       - ROOT_URL=https://git.zinomedia.de
       - SSH_LISTEN_PORT=22
+      - SSH_PORT=222
     restart: "unless-stopped"
     volumes:
       - ./volumes/gitea-data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-<<<<<<< HEAD
-=======
-    ports:
-      - "222:22"
->>>>>>> 707ec0e3d10cb32a00381e517b67422774638027
     depends_on:
       - gitea-mariadb
     networks: