diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 4d1bf40..ed5f8c0 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: https://code.forgejo.org/actions/checkout@v6 + - uses: https://code.forgejo.org/actions/checkout@v7 - uses: https://code.forgejo.org/actions/setup-python@v6 with: python-version: '3.10' @@ -19,7 +19,7 @@ jobs: k8s: runs-on: ubuntu-22.04 steps: - - uses: https://code.forgejo.org/actions/checkout@v6 + - uses: https://code.forgejo.org/actions/checkout@v7 - name: Set up Kubeconform uses: bmuschko/setup-kubeconform@v1 @@ -30,7 +30,7 @@ jobs: tflint: runs-on: ubuntu-22.04 steps: - - uses: https://code.forgejo.org/actions/checkout@v6 + - uses: https://code.forgejo.org/actions/checkout@v7 - uses: terraform-linters/setup-tflint@v6 name: Setup TFLint with: diff --git a/.forgejo/workflows/deploy-tofu.yaml b/.forgejo/workflows/deploy-tofu.yaml index 543f381..070f24a 100644 --- a/.forgejo/workflows/deploy-tofu.yaml +++ b/.forgejo/workflows/deploy-tofu.yaml @@ -10,7 +10,7 @@ jobs: authentik: runs-on: ubuntu-22.04 steps: - - uses: https://code.forgejo.org/actions/checkout@v6 + - uses: https://code.forgejo.org/actions/checkout@v7 - uses: opentofu/setup-opentofu@v2 with: tofu_version: 1.8.1 @@ -40,7 +40,7 @@ jobs: adguard: runs-on: ubuntu-22.04 steps: - - uses: https://code.forgejo.org/actions/checkout@v6 + - uses: https://code.forgejo.org/actions/checkout@v7 - uses: opentofu/setup-opentofu@v2 with: tofu_version: 1.7.0 diff --git a/docker/ganymede/docker-compose.yml b/docker/ganymede/docker-compose.yml deleted file mode 100644 index 201213e..0000000 --- a/docker/ganymede/docker-compose.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -services: - ganymede: - container_name: ganymede - image: ghcr.io/zibbp/ganymede:4.17.0 - restart: unless-stopped - environment: - DEBUG: ${GANYMEDE_DEBUG:-false} - TZ: ${GANYMEDE_TZ:-Europe/Madrid} - VIDEOS_DIR: ${GANYMEDE_VIDEOS_DIR:-/data/videos} - TEMP_DIR: ${GANYMEDE_TEMP_DIR:-/data/temp} - LOGS_DIR: ${GANYMEDE_LOGS_DIR:-/data/logs} - CONFIG_DIR: ${GANYMEDE_CONFIG_DIR:-/data/config} - DB_HOST: ${GANYMEDE_DB_HOST:-192.168.1.3} - DB_PORT: ${GANYMEDE_DB_PORT:-5432} - DB_USER: ${GANYMEDE_DB_USER:-ganymede} - DB_PASS: ${GANYMEDE_DB_PASS} - DB_NAME: ${GANYMEDE_DB_NAME:-ganymede} - DB_SSL: ${GANYMEDE_DB_SSL:-disable} - TWITCH_CLIENT_ID: ${GANYMEDE_TWITCH_CLIENT_ID} - TWITCH_CLIENT_SECRET: ${GANYMEDE_TWITCH_CLIENT_SECRET} - MAX_CHAT_DOWNLOAD_EXECUTIONS: ${GANYMEDE_MAX_CHAT_DOWNLOAD_EXECUTIONS:-3} - MAX_CHAT_RENDER_EXECUTIONS: ${GANYMEDE_MAX_CHAT_RENDER_EXECUTIONS:-2} - MAX_VIDEO_DOWNLOAD_EXECUTIONS: ${GANYMEDE_MAX_VIDEO_DOWNLOAD_EXECUTIONS:-2} - MAX_VIDEO_CONVERT_EXECUTIONS: ${GANYMEDE_MAX_VIDEO_CONVERT_EXECUTIONS:-3} - MAX_VIDEO_SPRITE_THUMBNAIL_EXECUTIONS: ${GANYMEDE_MAX_VIDEO_SPRITE_THUMBNAIL_EXECUTIONS:-2} - OAUTH_ENABLED: ${GANYMEDE_OAUTH_ENABLED:-true} - OAUTH_PROVIDER_URL: ${GANYMEDE_OAUTH_PROVIDER_URL:-https://auth.fukurokuju.dev/application/o/ganymede/} - OAUTH_CLIENT_ID: ${GANYMEDE_OAUTH_CLIENT_ID} - OAUTH_CLIENT_SECRET: ${GANYMEDE_OAUTH_CLIENT_SECRET} - OAUTH_REDIRECT_URL: ${GANYMEDE_OAUTH_REDIRECT_URL:-https://vods.roboces.dev/api/v1/auth/oauth/callback} - SHOW_SSO_LOGIN_BUTTON: ${GANYMEDE_SHOW_SSO_LOGIN_BUTTON:-true} - FORCE_SSO_AUTH: ${GANYMEDE_FORCE_SSO_AUTH:-true} - REQUIRE_LOGIN: ${GANYMEDE_REQUIRE_LOGIN:-true} - volumes: - - ${GANYMEDE_VIDEOS:-/mnt/vods/ganymede/videos}:/data/videos - - ${GANYMEDE_TEMP:-/mnt/vods/ganymede/temp}:/data/temp - - ${GANYMEDE_CACHE:-/mnt/vods/ganymede/cache}:/data/.cache - - ${GANYMEDE_LOGS:-/mnt/vods/ganymede/logs}:/data/logs - - ${GANYMEDE_CONFIG:-/mnt/vods/ganymede/config}:/data/config - ports: - - "4800:4000" - healthcheck: - test: curl --fail http://localhost:4000/health || exit 1 - interval: 60s - retries: 5 - start_period: 60s - timeout: 10s diff --git a/docker/ganymede/sample.env b/docker/ganymede/sample.env deleted file mode 100644 index 5b2205b..0000000 --- a/docker/ganymede/sample.env +++ /dev/null @@ -1,27 +0,0 @@ -GANYMEDE_DEBUG=false -GANYMEDE_TZ=Europe/Madrid -GANYMEDE_VIDEOS_DIR=/data/videos -GANYMEDE_TEMP_DIR=/data/temp -GANYMEDE_LOGS_DIR=/data/logs -GANYMEDE_CONFIG_DIR=/data/config -GANYMEDE_DB_HOST=192.168.1.3 -GANYMEDE_DB_PORT=5432 -GANYMEDE_DB_USER=ganymede -GANYMEDE_DB_PASS= -GANYMEDE_DB_NAME=ganymede -GANYMEDE_DB_SSL=disable -GANYMEDE_TWITCH_CLIENT_ID= -GANYMEDE_TWITCH_CLIENT_SECRET= -GANYMEDE_MAX_CHAT_DOWNLOAD_EXECUTIONS=3 -GANYMEDE_MAX_CHAT_RENDER_EXECUTIONS=2 -GANYMEDE_MAX_VIDEO_DOWNLOAD_EXECUTIONS=2 -GANYMEDE_MAX_VIDEO_CONVERT_EXECUTIONS=3 -GANYMEDE_MAX_VIDEO_SPRITE_THUMBNAIL_EXECUTIONS=2 -GANYMEDE_OAUTH_ENABLED=true -GANYMEDE_OAUTH_PROVIDER_URL=https://auth.fukurokuju.dev/application/o/ganymede/ -GANYMEDE_OAUTH_CLIENT_ID= -GANYMEDE_OAUTH_CLIENT_SECRET= -GANYMEDE_OAUTH_REDIRECT_URL=https://vods.roboces.dev/api/v1/auth/oauth/callback -GANYMEDE_SHOW_SSO_LOGIN_BUTTON=true -GANYMEDE_FORCE_SSO_AUTH=false -GANYMEDE_REQUIRE_LOGIN=false diff --git a/docker/immich/docker-compose.yml b/docker/immich/docker-compose.yml new file mode 100644 index 0000000..af05a5f --- /dev/null +++ b/docker/immich/docker-compose.yml @@ -0,0 +1,34 @@ +--- + +name: immich + +services: + immich-server: + container_name: immich_server + image: ghcr.io/immich-app/immich-server:v3.0.1 + restart: unless-stopped + volumes: + - ${IMMICH_UPLOAD_LOCATION:-/mnt/nas1/shared/immich}:/data + environment: + TZ: ${IMMICH_TZ:-Europe/Madrid} + DB_HOSTNAME: ${IMMICH_DB_HOSTNAME} + DB_PORT: ${IMMICH_DB_PORT} + DB_USERNAME: ${IMMICH_DB_USERNAME} + DB_PASSWORD: ${IMMICH_DB_PASSWORD} + DB_DATABASE_NAME: ${IMMICH_DB_DATABASE_NAME} + REDIS_HOSTNAME: ${IMMICH_REDIS_HOSTNAME} + REDIS_PORT: ${IMMICH_REDIS_PORT} + REDIS_USERNAME: ${IMMICH_REDIS_USERNAME} + REDIS_PASSWORD: ${IMMICH_REDIS_PASSWORD} + REDIS_DBINDEX: ${IMMICH_REDIS_DBINDEX} + ports: + - '2283:2283' + + immich-machine-learning: + container_name: immich_machine_learning + image: ghcr.io/immich-app/immich-machine-learning:v3.0.1 + ports: + - "3003:3003" + volumes: + - ${IMMICH_ML_MODEL_CACHE_LOCATION:-/mnt/nas1/shared/immich-model-cache}:/cache + restart: unless-stopped diff --git a/docker/immich/sample.env b/docker/immich/sample.env new file mode 100644 index 0000000..421baa6 --- /dev/null +++ b/docker/immich/sample.env @@ -0,0 +1,16 @@ +IMMICH_UPLOAD_LOCATION=/mnt/nas1/shared/immich +IMMICH_TZ=Europe/Madrid + +IMMICH_DB_HOSTNAME=192.168.1.3 +IMMICH_DB_PORT=55432 +IMMICH_DB_USERNAME= +IMMICH_DB_PASSWORD= +IMMICH_DB_DATABASE_NAME= + +IMMICH_REDIS_HOSTNAME=192.168.1.3 +IMMICH_REDIS_PORT=300036 +IMMICH_REDIS_USERNAME= +IMMICH_REDIS_PASSWORD= +IMMICH_REDIS_DBINDEX= + +IMMICH_ML_MODEL_CACHE_LOCATION=/mnt/nas1/shared/immich-model-cache diff --git a/docker/pluton/docker-compose.yml b/docker/pluton/docker-compose.yml index a319abe..bcd297a 100644 --- a/docker/pluton/docker-compose.yml +++ b/docker/pluton/docker-compose.yml @@ -1,7 +1,7 @@ --- services: pluton: - image: plutonhq/pluton:0.16.6 + image: plutonhq/pluton:0.17.1 container_name: pluton-backup restart: always ports: diff --git a/docker/tailscale/docker-compose.yml b/docker/tailscale/docker-compose.yml index 39bacf7..422a0a3 100644 --- a/docker/tailscale/docker-compose.yml +++ b/docker/tailscale/docker-compose.yml @@ -1,7 +1,7 @@ --- services: tailscale: - image: tailscale/tailscale:v1.98.4 + image: tailscale/tailscale:v1.98.8 hostname: tailscale environment: TS_AUTHKEY: ${TS_AUTHKEY} diff --git a/k8s/argo-apps/huesporro.yaml b/k8s/argo-apps/huesporro.yaml index 93ac93f..7321640 100644 --- a/k8s/argo-apps/huesporro.yaml +++ b/k8s/argo-apps/huesporro.yaml @@ -15,6 +15,8 @@ spec: targetRevision: v0.3.7 helm: valuesObject: + image: + pullPolicy: IfNotPresent secret: existingSecretName: huesoporro-secrets ingress: diff --git a/k8s/argo-apps/kured.yaml b/k8s/argo-apps/kured.yaml index ff3d18e..5ab7b1d 100644 --- a/k8s/argo-apps/kured.yaml +++ b/k8s/argo-apps/kured.yaml @@ -13,7 +13,7 @@ spec: source: chart: kured repoURL: https://kubereboot.github.io/charts - targetRevision: 5.12.* + targetRevision: 6.1.* helm: valuesObject: configuration.rebootDays: diff --git a/k8s/argo-apps/meili.yaml b/k8s/argo-apps/meili.yaml index 9303052..61faaa1 100644 --- a/k8s/argo-apps/meili.yaml +++ b/k8s/argo-apps/meili.yaml @@ -18,7 +18,7 @@ spec: targetRevision: main - chart: meilisearch repoURL: https://meilisearch.github.io/meilisearch-kubernetes - targetRevision: 0.32.* + targetRevision: 0.33.* helm: valuesObject: environment: diff --git a/k8s/argo-apps/portainer.yaml b/k8s/argo-apps/portainer.yaml index aec9c82..73a1383 100644 --- a/k8s/argo-apps/portainer.yaml +++ b/k8s/argo-apps/portainer.yaml @@ -15,7 +15,7 @@ spec: sources: - repoURL: https://portainer.github.io/k8s/ chart: portainer - targetRevision: 239.3.* + targetRevision: 239.4.* helm: valuesObject: service: diff --git a/k8s/argo-apps/renovate.yaml b/k8s/argo-apps/renovate.yaml index ce5a885..befc166 100644 --- a/k8s/argo-apps/renovate.yaml +++ b/k8s/argo-apps/renovate.yaml @@ -13,7 +13,7 @@ spec: sources: - chart: renovate repoURL: https://docs.renovatebot.com/helm-charts - targetRevision: 46.184.* + targetRevision: 46.217.* helm: valuesObject: renovate: diff --git a/k8s/argo-apps/woodpecker.yaml b/k8s/argo-apps/woodpecker.yaml index 87bee3e..cda7560 100644 --- a/k8s/argo-apps/woodpecker.yaml +++ b/k8s/argo-apps/woodpecker.yaml @@ -14,7 +14,7 @@ spec: sources: - chart: woodpecker repoURL: ghcr.io/woodpecker-ci/helm - targetRevision: 3.6.4 + targetRevision: 3.6.5 helm: valuesObject: agent: diff --git a/k8s/charts/oxicloud/Chart.yaml b/k8s/charts/oxicloud/Chart.yaml index a412671..7bc79ac 100644 --- a/k8s/charts/oxicloud/Chart.yaml +++ b/k8s/charts/oxicloud/Chart.yaml @@ -5,4 +5,4 @@ description: | Ultra-fast, secure & lightweight self-hosted cloud storage — your files, photos, calendars & contacts, all in one place. Built in Rust. type: application version: 0.1.0 -appVersion: "0.6.0" +appVersion: "0.8.2"