diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3844927..c04b564 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,60 +11,60 @@ updates: schedule: interval: "weekly" labels: - - "dependencies" - - "auto-merge" + - "firefly" #immich - package-ecosystem: "docker-compose" directory: "/projects/immich" schedule: - interval: "monthly" + interval: "weekly" + labels: + - "immich" #n8n - package-ecosystem: "docker-compose" directory: "/projects/n8n" schedule: interval: "weekly" labels: - - "dependencies" - - "auto-merge" + - "n8n" #paperless - package-ecosystem: "docker-compose" directory: "/projects/paperless" schedule: - interval: "monthly" + interval: "weekly" + labels: + - "paperless" #tandoor - package-ecosystem: "docker-compose" directory: "/projects/tandoor" schedule: - interval: "monthly" + interval: "weekly" + labels: + - "tandoor" #jellyseer - package-ecosystem: "docker-compose" directory: "/projects/jellyseer" schedule: interval: "weekly" labels: - - "dependencies" - - "auto-merge" + - "jellyseer" #jellyfin - package-ecosystem: "docker-compose" directory: "/projects/jellyfin" schedule: interval: "weekly" labels: - - "dependencies" - - "auto-merge" + - "jellyfin" #vaultwarden - package-ecosystem: "docker-compose" directory: "/projects/vaultwarden" schedule: interval: "weekly" labels: - - "dependencies" - - "auto-merge" + - "vaultwarden" #nextcloud - package-ecosystem: "docker-compose" directory: "/projects/nextcloud" schedule: interval: "weekly" labels: - - "dependencies" - - "auto-merge" + - "nextcloud" diff --git a/.github/workflows/dependabotautomerge.yml b/.github/workflows/dependabotautomerge.yml deleted file mode 100644 index b3d52ed..0000000 --- a/.github/workflows/dependabotautomerge.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Auto-merge Dependabot PRs - -on: - pull_request: - types: [opened, synchronize, reopened] - -permissions: - contents: write - pull-requests: write - -jobs: - automerge: - if: github.event.pull_request.user.login == 'dependabot[bot]' - runs-on: ubuntu-latest - - steps: - - name: Debug token presence - run: | - if [ -z "${{ secrets.GITHUB_TOKEN }}" ]; then - echo "TOKEN IS EMPTY" - exit 1 - else - echo "TOKEN EXISTS" - fi - - - name: Auto-merge - if: contains(github.event.pull_request.labels.*.name, 'auto-merge') - uses: fastify/github-action-merge-dependabot@v3 - with: - github-token: ${{ secrets.GH_TOKEN }} diff --git a/projects/immich/docker-compose.yml b/projects/immich/docker-compose.yml index 4df6842..3fe5092 100644 --- a/projects/immich/docker-compose.yml +++ b/projects/immich/docker-compose.yml @@ -3,6 +3,11 @@ version: "3.9" services: immich-server: image: ghcr.io/immich-app/immich-server:v2.7.5 + deploy: + resources: + limits: + cpus: "1.25" + memory: 2G labels: - rclone.storage=storagebox-crypt volumes: @@ -36,7 +41,11 @@ services: immich-machine-learning: image: ghcr.io/immich-app/immich-machine-learning:v2.7.5 - + deploy: + resources: + limits: + cpus: "1.75" + memory: 2.5G volumes: - immich-model-cache:/cache environment: @@ -52,7 +61,11 @@ services: immich-redis: image: redis:6.2-alpine - + deploy: + resources: + limits: + cpus: "0.25" + memory: 256M volumes: - immich-redis-data:/data healthcheck: @@ -64,7 +77,11 @@ services: immich-database: image: tensorchord/pgvecto-rs:pg14-v0.3.0 - + deploy: + resources: + limits: + cpus: "0.75" + memory: 1.5G volumes: - immich-postgres:/var/lib/postgresql/data environment: diff --git a/projects/jellyfin/docker-compose.yml b/projects/jellyfin/docker-compose.yml index 274c7b2..0a45591 100644 --- a/projects/jellyfin/docker-compose.yml +++ b/projects/jellyfin/docker-compose.yml @@ -2,6 +2,11 @@ version: "3.8" services: jellyfin: image: jellyfin/jellyfin:10 + deploy: + resources: + limits: + cpus: "2.0" + memory: 2G volumes: - config:/config - cache:/cache diff --git a/projects/n8n/docker-compose.yml b/projects/n8n/docker-compose.yml index 0a67d8a..ddb249e 100644 --- a/projects/n8n/docker-compose.yml +++ b/projects/n8n/docker-compose.yml @@ -1,6 +1,6 @@ services: n8n: - image: docker.n8n.io/n8nio/n8n:2.17.7 + image: docker.n8n.io/n8nio/n8n:2.29.10 restart: always labels: - rclone.storage=storagebox-crypt diff --git a/projects/nextcloud/docker-compose.yml b/projects/nextcloud/docker-compose.yml index e9cbfb1..a7af7de 100644 --- a/projects/nextcloud/docker-compose.yml +++ b/projects/nextcloud/docker-compose.yml @@ -1,6 +1,6 @@ services: nextcloud: - image: nextcloud:33.0.2 + image: nextcloud:34.0.1 restart: unless-stopped labels: - rclone.storage=storagebox-crypt diff --git a/projects/paperless/docker-compose.yml b/projects/paperless/docker-compose.yml index 8ddd688..50c1a66 100644 --- a/projects/paperless/docker-compose.yml +++ b/projects/paperless/docker-compose.yml @@ -2,6 +2,11 @@ version: '3.8' services: paperless: image: ghcr.io/paperless-ngx/paperless-ngx:2.20.10 + deploy: + resources: + limits: + cpus: "1.0" + memory: 1.5G container_name: paperless restart: unless-stopped labels: @@ -21,6 +26,7 @@ services: PAPERLESS_ALLOWED_HOSTS: ${PAPERLESS_ALLOWED_HOSTS} PAPERLESS_DBHOST: ${PAPERLESS_DBHOST} PAPERLESS_DBPASS: ${PAPERLESS_DBPASS} + PAPERLESS_OCR_OUTPUT_TYPE: ${PAPERLESS_OCR_OUTPUT_TYPE} healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000"] interval: 30s @@ -31,6 +37,11 @@ services: redis: image: redis:8.8.0 + deploy: + resources: + limits: + cpus: "0.25" + memory: 256M container_name: paperless-redis restart: unless-stopped volumes: @@ -41,6 +52,11 @@ services: db: container_name: paperless-db image: postgres:16 + deploy: + resources: + limits: + cpus: "0.75" + memory: 1G restart: unless-stopped volumes: - paperlessdb:/var/lib/postgresql/data diff --git a/projects/vaultwarden/docker-compose.yml b/projects/vaultwarden/docker-compose.yml index a867ed1..bfff2cf 100644 --- a/projects/vaultwarden/docker-compose.yml +++ b/projects/vaultwarden/docker-compose.yml @@ -1,6 +1,6 @@ services: vaultwarden: - image: vaultwarden/server:1.35.8 + image: vaultwarden/server:1.36.0 restart: always environment: DOMAIN: ${DOMAIN}