test

Author: ildoc

.gitlab/ci/invidious.yml

@@ -13,15 +13,14 @@ include:
 update_invidious:
   stage: update_services
   image: docker:latest
-  services:
-    - docker:dind
+  services: []
   extends:
     - .rules_update_invidious
     - .ssh_setup
   variables:
-    DOCKER_DRIVER: overlay2
+    DOCKER_HOST: unix:///var/run/docker.sock
     SERVER_IP: $INVIDIOUS_SSH_SERVER_IP
   before_script:
     - apk add --no-cache docker-cli
   script:
-    - docker run --rm -e VAULT_ROLE_ID=$VAULT_ROLE_ID -e VAULT_SECRET_ID=$VAULT_SECRET_ID -v $(pwd):/app/playbooks registry.gitlab.local.ildoc.it/devops/ansible-vault:09e0f45efdcdb6abb72cc93790bf4018c4db07d8 invidious.yml
+    - docker run --rm -e VAULT_ROLE_ID=$VAULT_ROLE_ID -e VAULT_SECRET_ID=$VAULT_SECRET_ID -v ansible:/app/playbooks registry.gitlab.local.ildoc.it/devops/ansible-vault:09e0f45efdcdb6abb72cc93790bf4018c4db07d8 invidious.yml

ansible/roles/invidious/templates/docker-compose.yml.j2

@@ -2,7 +2,7 @@
 services:
 
   invidious:
-    image: quay.io/invidious/invidious:2025.03.26-23ff613
+    image: quay.io/invidious/invidious:2025.05.02-7579adc
     restart: unless-stopped
     ports:
       - "80:3000"

ansible/roles/invidious/templates/docker-compose.yml.j2_companion

@@ -0,0 +1,80 @@
+---
+services:
+
+  invidious:
+    image: quay.io/invidious/invidious:2025.04.04-0c07e9d
+    restart: unless-stopped
+    ports:
+      - "80:3000"
+    environment:
+      # Please read the following file for a comprehensive list of all available
+      # configuration options and their associated syntax:
+      # https://github.com/iv-org/invidious/blob/master/config/config.example.yml
+      INVIDIOUS_CONFIG: |
+        db:
+          dbname: invidious
+          user: {{ invidious.db_user }}
+          password: {{ invidious.db_password }}
+          host: invidious-db
+          port: 5432
+        check_tables: true
+        invidious_companion:
+        - private_url: "http://companion:8282"
+          public_url: "http://localhost:8282"
+        invidious_companion_key: "{{ invidious.companion_key }}"
+        # external_port:
+        # domain: 
+        # https_only: false
+        # statistics_enabled: false
+        hmac_key: "{{ invidious.hmac_key }}"
+    healthcheck:
+      test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/trending || exit 1
+      interval: 30s
+      timeout: 5s
+      retries: 2
+    logging:
+      options:
+        max-size: "1G"
+        max-file: "4"
+    depends_on:
+      - invidious-db
+
+  companion:
+    image: quay.io/invidious/invidious-companion:master-0eadc21
+    environment:
+    # Use the key generated in the 2nd step
+       - SERVER_SECRET_KEY={{ invidious.companion_key }}
+    restart: unless-stopped
+    # Remove "127.0.0.1:" if used from an external IP
+    ports:
+      - "127.0.0.1:8282:8282"
+    logging:
+      options:
+        max-size: "1G"
+        max-file: "4"
+    cap_drop:
+      - ALL
+    read_only: true
+    # cache for youtube library
+    volumes:
+      - companioncache:/var/tmp/youtubei.js:rw
+    security_opt:
+      - no-new-privileges:true
+
+  invidious-db:
+    image: postgres:14
+    restart: unless-stopped
+    volumes:
+      - postgresdata:/var/lib/postgresql/data
+      - ./config/sql:/config/sql
+      - ./docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
+    environment:
+      POSTGRES_DB: invidious
+      POSTGRES_USER: {{ invidious.db_user }}
+      POSTGRES_PASSWORD: {{ invidious.db_password }}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+
+volumes:
+  postgresdata:
+  companioncache: