Fix warning, remove ssh.bensuperpc.org ect...

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

Makefile

@@ -13,7 +13,7 @@
 
 DOCKER := docker
 
-PROFILES := caddy wordpress gitea adminer uptime-kuma qbittorrent jellyfin watchtower backup syncthing openssh gitea-runner
+PROFILES := caddy wordpress adminer uptime-kuma qbittorrent jellyfin watchtower backup syncthing openssh gitea gitea-runner
 PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
 
 COMPOSE_FILES :=  $(shell find docker-compose*.yml | sed -e 's/^/--file /')

README.md

@@ -170,6 +170,8 @@ You can find all services on the [docker-compose.yml](docker-compose.yml) file o
 
 You can disable some services by removing the service name in PROFILES variable in the [Makefile](Makefile) file.
 
+To enable the gitea CI: https://medium.com/@lokanx/how-to-build-docker-containers-using-gitea-runners-600729555e07
+
 ## Build with
 
 - [Wordpress](https://wordpress.org/)

caddy/bensuperpc.org/Caddyfile

@@ -59,10 +59,6 @@ jellyfin.bensuperpc.org {
 	reverse_proxy jellyfin:8096
 }
 
-ssh.bensuperpc.org {
-	reverse_proxy openssh:2222
-}
-
 syncthing.bensuperpc.org {
 	reverse_proxy syncthing:8384 {
 		header_up Host {upstream_hostport}

docker-compose.adminer.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Adminer
   adminer:

docker-compose.backup.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Backup
   backup:

docker-compose.caddy.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Caddy
   caddy:

docker-compose.gitea.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Gitea
   gitea:
@@ -12,7 +10,7 @@ services:
       - database_gitea
       - caddy
     ports:
-      - "2222:2222"
+      - "22:22"
     env_file:
       - env/gitea.env
     volumes:

docker-compose.jellyfin.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Jellyfin
   jellyfin:

docker-compose.openssh.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Openssh
   openssh:
@@ -7,6 +5,8 @@ services:
     container_name: openssh
     profiles:
       - openssh
+    depends_on:
+      - caddy
     restart: on-failure:5
     env_file:
       - env/openssh.env

docker-compose.qbittorrent.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # qBittorrent
   qbittorrent:

docker-compose.syncthing.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # syncthing
   syncthing:
@@ -7,6 +5,8 @@ services:
     container_name: syncthing
     profiles:
       - syncthing
+    depends_on:
+      - caddy
     restart: on-failure:5
     env_file:
       - env/syncthing.env

docker-compose.uptime-kuma.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Uptime Kuma
   uptime-kuma:
@@ -10,6 +8,8 @@ services:
     volumes:
       - uptimekuma_data:/app/data
     restart: on-failure:5
+    depends_on:
+      - caddy
     networks:
       - infra-network
     security_opt:

docker-compose.watchtower.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Watchtower
   watchtower:
@@ -7,6 +5,8 @@ services:
     container_name: watchtower
     profiles:
       - watchtower
+    depends_on:
+      - caddy
     restart: on-failure:5
     networks:
       - infra-network

docker-compose.wordpress.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
   # Wordpress
   wordpress:

env/gitea.env

@@ -6,4 +6,10 @@ GITEA__database__NAME=gitea
 GITEA__database__USER=bensuperpc
 GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
 #GITEA__security__SECRET_KEY=
-#GITEA__security__INTERNAL_TOKEN=
+#GITEA__security__INTERNAL_TOKEN=
+GITEA__server__DOMAIN=git.bensuperpc.org
+GITEA__server__SSH_DOMAIN=git.bensuperpc.org
+GITEA__server__HTTP_PORT=3000
+GITEA__server__SSH_LISTEN_PORT=22
+GITEA__server__SSH_PORT=22
+GITEA__server__ROOT_URL=https://git.bensuperpc.org