Update CI files

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

.github/workflows/main.yml

@@ -26,7 +26,17 @@ jobs:
         with:
           submodules: "recursive"
           fetch-depth: 0
-      - name: "Update server"
+      - name: "Update server image"
-        run: make update
+        run: make update-docker
       - name: "Build server"
-        run: make build
+        run: make build
+#      - name: "Start server"
+#        run: make start
+      - name: "Stop server"
+        run: make stop
+      - name: "Down server"
+        run: make down
+      - name: "Clean server"
+        run: make clean
+      - name: "Purge server"
+        run: make purge

Makefile

@@ -18,54 +18,56 @@ PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
 
 # gitea-runner transmission
 
-COMPOSE_FILES :=  $(shell find docker-compose*.yml | sed -e 's/^/--file /')
+COMPOSE_FILES :=  $(shell find . -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /')
+
+COMPOSE_DIR := --project-directory ./infrastructure
 
 .PHONY: build all
 all: start
 
 .PHONY: build
 build:
-	docker compose $(COMPOSE_FILES) $(PROFILE_CMD) build
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) build
 
 .PHONY: start
 start:
-	docker compose $(COMPOSE_FILES) $(PROFILE_CMD) up -d
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up -d
 
 .PHONY: start-at
 start-at:
-	docker compose $(COMPOSE_FILES) $(PROFILE_CMD) up
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) up
 
 .PHONY: docker-check
 docker-check:
-	docker compose $(COMPOSE_FILES) $(PROFILE_CMD) config
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) config
 
 .PHONY: stop
 stop: down
 
 .PHONY: down
 down:
-	docker compose $(COMPOSE_FILES) $(PROFILE_CMD) down
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down
 
 .PHONY: restart
 restart: stop start
 
 .PHONY: logs
 logs:
-	docker compose $(COMPOSE_FILES) logs
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) logs
 
 .PHONY: state
 state:
-	docker compose $(COMPOSE_FILES) ps
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) ps
-	docker compose $(COMPOSE_FILES) top
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) top
 
 .PHONY: update-docker
 update-docker:
-	docker compose $(COMPOSE_FILES) $(PROFILE_CMD) pull
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) pull
 
 .PHONY: update
 update: update-docker
-#	git submodule update --init --recursive --remote
+	git submodule update --init --recursive --remote
-#	git pull --recurse-submodules --all --progress
+	git pull --recurse-submodules --all --progress
 
 .PHONY: clean
 clean:
@@ -73,4 +75,4 @@ clean:
 
 .PHONY: purge
 purge:
-	docker compose $(COMPOSE_FILES) $(PROFILE_CMD) down -v --rmi all
+	docker compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD) down -v --rmi all

README.md

@@ -19,7 +19,7 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [x] Jellyfin (Media server)
 - [x] Gitea (Git server)
 - [x] Uptime Kuma (Monitoring)
-- [x] qbittorrent server
+- [x] qbittorrent and transmission (Torrent client/server)
 
 ## Screenshots
 
@@ -67,6 +67,7 @@ And then, caddy will generate the certificate for you and renew it automatically
 | [adminer.bensuperpc.org](https://adminer.bensuperpc.org) | Sub | Adminer for MariaDB for wordpress only |
 | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
 | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
+| [transmission.bensuperpc.org](https://transmission.bensuperpc.org) | Sub | Torrent client/server |
 | [git.bensuperpc.org](https://git.bensuperpc.org) | Sub | Gitea for git |
 | [link.bensuperpc.org](https://link.bensuperpc.org) | Sub | For link shortener |
 | [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) | Sub | Jellyfin for media server |
@@ -87,7 +88,7 @@ You can generate a password with 32 characters:
 openssl rand -base64 32
 ```
 
-For the [wordpress.env](env/wordpress.env) file, you need to change the password and user for the database.
+For the [wordpress.env](infrastructure/wordpress/env/wordpress.env) file, you need to change the password and user for the database.
 
 ```sh
 WORDPRESS_DB_USER=bensuperpc
@@ -96,7 +97,7 @@ WORDPRESS_DB_NAME=wordpress
 WORDPRESS_DB_HOST=wordpress_db:3306
 ```
 
-For [wordpress_db.env](env/wordpress_db.env) file, you need to change the password(s) and user for the database.
+For [wordpress_db.env](infrastructure/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database.
     
 ```sh
 MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
@@ -105,7 +106,7 @@ MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
 MARIADB_DATABASE=wordpress
 ```
 
-For [adminer.env](env/adminer.env) file, you need to change the password(s) and user for the database.
+For [adminer.env](infrastructure/wordpress/env/adminer.env) file, you need to change the password(s) and user for the database.
 
 ```sh
 MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
@@ -114,7 +115,7 @@ MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
 ADMINER_DEFAULT_SERVER=wordpress_db
 ```
 
-For [gitea.env](env/gitea.env) file, you need to change the password(s) and user for the database.
+For [gitea.env](infrastructure/gitea/env/gitea.env) file, you need to change the password(s) and user for the database.
 
 ```sh
 GITEA__database__DB_TYPE=mysql
@@ -125,7 +126,7 @@ GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
 GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
 ```
 
-For [gitea_db.env](env/gitea_db.env) file, you need to change the password(s) and user for the database.
+For [gitea_db.env](infrastructure/gitea/env/gitea_db.env) file, you need to change the password(s) and user for the database.
 
 ```sh
 MYSQL_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
@@ -134,7 +135,7 @@ MYSQL_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
 MYSQL_DATABASE=gitea
 ```
 
-For [psitransfer.env](env/psitransfer.env) file, you need to change the password(s) and user for the database.
+For [psitransfer.env](infrastructure/psitransfer/env/psitransfer.env) file, you need to change the password(s) and user for the database.
 
 ```sh
 PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
@@ -162,7 +163,7 @@ make down
 
 ### All services
 
-You can find all services on the [docker-compose.yml](docker-compose.yml) file or on this table:
+You can find all service on this table:
 
 | Service | Description | URL |
 | --- | --- | --- |
@@ -170,6 +171,7 @@ You can find all services on the [docker-compose.yml](docker-compose.yml) file o
 | Adminer | Adminer for MariaDB | [adminer.bensuperpc.org](https://adminer.bensuperpc.org) |
 | Uptime Kuma | Uptime Kuma for monitoring | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) |
 | qbittorrent | qbittorrent server | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) |
+| transmission | transmission server | [transmission.bensuperpc.org](https://transmission.bensuperpc.org) |
 | Gitea | Gitea for git | [git.bensuperpc.org](https://git.bensuperpc.org) |
 | Jellyfin | Jellyfin for media server | [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) |
 | SyncThing | SyncThing for file synchronization | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) |

docker-compose.networks.yml

@@ -1,4 +0,0 @@
-networks:
-  infra-network:
-    driver: bridge
-    name: infra-network

docker-compose.volumes.yml

@@ -1,3 +0,0 @@
-volumes:
-  uptimekuma_data:
-    name: uptimekuma_data

infrastructure/caddy/docker-compose.caddy.yml

@@ -13,11 +13,11 @@ services:
       - wordpress:/var/www/html:rw
       - caddy_data:/data:rw
       - caddy_config:/config:rw
-      - ./caddy:/etc/caddy:ro
+      - ./caddy/config:/etc/caddy:ro
     networks:
       - infra-network
     env_file:
-      - env/caddy.env
+      - ./caddy/env/caddy.env
     security_opt:
       - no-new-privileges:true
     #cap_drop:
@@ -35,3 +35,8 @@ volumes:
     name: caddy_data
   caddy_config:
     name: caddy_config
+
+networks:
+  infra-network:
+    driver: bridge
+    name: infra-network

infrastructure/gitea/docker-compose.gitea.yml

@@ -12,7 +12,7 @@ services:
     ports:
       - "22:22"
     env_file:
-      - env/gitea.env
+      - ./gitea/env/gitea.env
     volumes:
       - gitea_data:/var/lib/gitea
       - gitea_config:/etc/gitea
@@ -34,7 +34,7 @@ services:
     volumes:
       - gitea_db:/var/lib/mysql:rw
     env_file:
-      - env/gitea_db.env
+      - ./gitea/env/gitea_db.env
     command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - infra-network
@@ -51,11 +51,11 @@ services:
       - gitea
     restart: on-failure:5
     env_file:
-      - env/gitea-runner.env
+      - ./gitea/env/gitea-runner.env
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - gitea_runner:/data
-      - ./config/gitea_runner/config.yaml:/config.yaml:ro
+      - ./gitea/config/gitea_runner/config.yaml:/config.yaml:ro
     networks:
       - infra-network
     security_opt:

infrastructure/jellyfin/docker-compose.jellyfin.yml

@@ -8,6 +8,8 @@ services:
     restart: on-failure:5
     depends_on:
       - caddy
+    env_file:
+      - ./jellyfin/env/jellyfin.env
     volumes:
       - jellyfin_config:/config
       - jellyfin_data_movies:/movies:rw

infrastructure/psitransfer/docker-compose.psitransfer.yml

@@ -9,7 +9,7 @@ services:
     depends_on:
       - caddy
     env_file:
-      - env/psitransfer.env
+      - ./psitransfer/env/psitransfer.env
     volumes:
       - psitransfer_data:/data
     networks:

infrastructure/qbittorrent/docker-compose.qbittorrent.yml

@@ -9,7 +9,7 @@ services:
     depends_on:
       - caddy
     env_file:
-      - env/qbittorrent.env
+      - ./qbittorrent/env/qbittorrent.env
     volumes:
       - qbittorrent_config:/config
       - qbittorrent_data:/downloads

infrastructure/syncthing/docker-compose.syncthing.yml

@@ -9,7 +9,7 @@ services:
       - caddy
     restart: on-failure:5
     env_file:
-      - env/syncthing.env
+      - ./syncthing/env/syncthing.env
     volumes:
       - syncthing_config:/config
       - syncthing_data:/data1

infrastructure/transmission/docker-compose.transmission.yml

@@ -9,7 +9,7 @@ services:
     depends_on:
       - caddy
     env_file:
-      - env/transmission.env
+      - ./transmission/env/transmission.env
     volumes:
       - transmission_config:/config
       - transmission_data:/downloads

infrastructure/uptime-kuma/docker-compose.uptime-kuma.yml

@@ -14,3 +14,7 @@ services:
       - infra-network
     security_opt:
       - no-new-privileges:true
+
+volumes:
+  uptimekuma_data:
+    name: uptimekuma_data

infrastructure/wordpress/docker-compose.adminer.yml

@@ -7,7 +7,7 @@ services:
       - adminer
     restart: on-failure:5
     env_file: 
-      - env/adminer.env
+      - ./wordpress/env/adminer.env
     depends_on:
       - wordpress_db
       - caddy

infrastructure/wordpress/docker-compose.wordpress.yml

@@ -10,9 +10,9 @@ services:
       - wordpress_db
       - caddy
     env_file:
-      - env/wordpress.env
+      - ./wordpress/env/wordpress.env
     volumes:
-      - ./config/wordpress/php.ini:/usr/local/etc/php/conf.d/custom.ini:ro
+      - ./wordpress/config/wordpress/php.ini:/usr/local/etc/php/conf.d/custom.ini:ro
       - wordpress:/var/www/html:rw
     networks:
       - infra-network
@@ -32,7 +32,7 @@ services:
     volumes:
       - wordpress_db:/var/lib/mysql:rw
     env_file:
-      - env/wordpress_db.env
+      - ./wordpress/env/wordpress_db.env
     command: '--default-authentication-plugin=mysql_native_password'
     networks:
       - infra-network
@@ -48,7 +48,7 @@ services:
       - wordpress
     restart: on-failure:5
     env_file:
-      - env/backup.env
+      - ./wordpress/env/backup.env
     volumes:
       - wordpress_backup:/mnt/restic
       - wordpress_db:/data/wordpress_db:ro