diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 055735f9..ad619cf4 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -258,7 +258,6 @@ jobs: notification_message: 'PR #${{ steps.pr_merge.outputs.pr_index }} merged.' ansible-config-docker-compose-deploy: name: Deploy via Ansible & Docker Compose - timeout-minutes: 360 runs-on: ubuntu-latest needs: [pr-merge] env: @@ -306,6 +305,7 @@ jobs: vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - name: Docker Compose Deployment # if: ${{ steps.regenerate-readme-modified-services.outputs.modified_services != '' }} + timeout-minutes: 360 continue-on-error: true uses: keatonLiu/docker-compose-remote-action@v1.2 with: diff --git a/README.md b/README.md index 2b26ce62..9d763fda 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ | castopod | castopod/castopod:latest | | cloudflared | cloudflare/cloudflared:latest | | cloudflareddns | ghcr.io/hotio/cloudflareddns:latest | +| convertx | ghcr.io/c4illin/convertx | | cronicle | elestio/cronicle:latest | | crowdsec | crowdsecurity/crowdsec:latest | | crowdsec-dashboard | metabase/metabase | @@ -64,6 +65,7 @@ | jitsi-web | jitsi/web:stable | | joplin-db | postgres:17-alpine | | joplin | joplin/server:latest | +| libretranslate | libretranslate/libretranslate | | lidarr | lscr.io/linuxserver/lidarr:latest | | lidify | thewicklowwolf/lidify:latest | | lldap | lldap/lldap:stable | diff --git a/docker-compose.yml b/docker-compose.yml index c49b6d78..ca8eedb8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -617,6 +617,28 @@ services: source: /rinoa-storage target: /storage type: bind + convertx: + container_name: convertx + environment: + JWT_SECRET: ${CONVERTX_JWT_SECRET} + image: ghcr.io/c4illin/convertx + labels: + homepage.group: System Administration + homepage.name: ConvertX + homepage.href: https://convert.${MY_TLD} + homepage.icon: sh-convertx.png + homepage.description: Online file converter + swag: enable + swag_port: 3000 + swag_proto: http + swag_url: convert.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.url: https://convert.${MY_TLD} + ports: + - 38946:3000 + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/convertx:/app/data cronicle: container_name: cronicle entrypoint: manager @@ -2664,6 +2686,31 @@ services: published: "22300" target: 22300 restart: unless-stopped + libretranslate: + container_name: libretranslate + # command: --ssl --ga-id MY-GA-ID --req-limit 100 --char-limit 500 + image: libretranslate/libretranslate + healthcheck: + test: ['CMD-SHELL', './venv/bin/python scripts/healthcheck.py'] + environment: + LT_UPDATE_MODELS: true + labels: + homepage.group: Personal Services + homepage.name: LibreTranslate + homepage.href: https://translate.${MY_TLD} + homepage.icon: sh-libretranslate.svg + homepage.description: Open-source language translation + swag: enable + swag_port: 5000 + swag_url: translate.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.url: https://translate.${MY_TLD} + ports: + - 5000:5000 + restart: unless-stopped + volumes: + # - libretranslate_api_keys:/app/db + - libretranslate_models:/home/libretranslate/.local:rw lidarr: container_name: lidarr environment: @@ -3148,13 +3195,16 @@ services: TZ: ${TZ} PORT: 20211 image: jokobsk/netalertx:latest - network_mode: host labels: homepage.group: Infrastructure/App Performance Monitoring homepage.name: NetAlertX homepage.href: http://192.168.1.254:20211 homepage.icon: netalertx.svg homepage.description: Network Monitoring + homepage.widget.type: netalertx + homepage.widget.url: http://192.168.1.254:20211 + homepage.widget.key: ${NETALERTX_API_TOKEN} + network_mode: host restart: unless-stopped volumes: - ${DOCKER_VOLUME_CONFIG}/netalertx/config:/app/config @@ -3299,6 +3349,9 @@ services: homepage.href: https://cloud.${MY_TLD} homepage.icon: nextcloud.svg homepage.description: Private Cloud + homepage.widget.type: nextcloud + homepage.widget.url: https://cloud.trez.wtf + homepage.widget.key: ${NEXTCLOUD_HOMEPAGE_TOKEN} swag: enable swag_port: 11000 swag_proto: http @@ -6084,11 +6137,10 @@ services: environment: PGID: ${PGID} PUID: ${PUID} - TZ: America/New_York + TZ: ${TZ} UPTIME_KUMA_USERNAME: ${UPTIME_KUMA_USERNAME} UPTIME_KUMA_PASSWORD: ${UPTIME_KUMA_PASSWORD} - DOCKER_HOST: http://dockerproxy:2375 - DOCKER_MODS: ghcr.io/themepark-dev/theme.park:uptime-kuma + DOCKER_HOST: tcp://dockerproxy:2375 hostname: Rinoa image: louislam/uptime-kuma:latest labels: @@ -6097,6 +6149,9 @@ services: homepage.href: https://uptime.${MY_TLD} homepage.icon: uptime-kuma.png homepage.description: HTTP Endpoint Monitoring + homepage.widget.type: uptimekuma + homepage.widget.url: http://uptimekuma:3001 + homepage.widget.slug: rinoa-services swag: enable swag_proto: http swag_url: uptime.${MY_TLD} @@ -6505,6 +6560,8 @@ volumes: name: jitsi-web-admin-upload joplin_data: name: joplin_data + libretranslate_models: + name: libretranslate_models lldap_data: name: lldap_data mastodon-pg-db: