Execute jobs only on master branch, better tags for images

.forgejo/workflows/ci.yml

@@ -6,7 +6,8 @@ on:
   schedule:
     - cron: '0 7 * * 0'
   push:
-    branches: ["*"]
+    branches:
+      - "master"
 
 jobs:
   build:
@@ -25,12 +26,21 @@ jobs:
         username: ${{ secrets.USERNAME }}
         password: ${{ secrets.TOKEN }}
 
+    - name: Docker meta
+      id: meta
+      uses: https://github.com/docker/metadata-action@v5
+      with:
+        images: git.nadeko.net/fijxu/invidious
+        tags: |
+          type=sha,format=short,prefix={{date 'YYYY.MM.DD'}}-,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+          type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+
     - uses: https://code.forgejo.org/docker/build-push-action@v5
       name: Build images
       with:
         context: .
         file: docker/Dockerfile
-        tags: git.nadeko.net/fijxu/invidious:latest 
+        tags: ${{ steps.meta.outputs.tags }}
         platforms: linux/amd64
         push: true
         build-args: |

docker-compose.yml

@@ -8,22 +8,28 @@ version: "3"
 services:
 
   invidious-refresher:
-    image: git.nadeko.net/invidious/invidious:latest
+    image: git.nadeko.net/fijxu/invidious:latest
     restart: unless-stopped
-    ports:
-      - "127.0.0.1:5432:5432"
     volumes:
-      - ./config/config.conf:/etc/config/invidious-refresher.conf
+      - ./config/config-refresher.yml:/etc/invidious/config.yml:ro
+      - ./logs:/var/log/invidious:rw
+      - /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432:rw
+      - /var/run/redis/redis.sock:/var/run/redis/redis.sock:rw
+    environment:
+      INVIDIOUS_CONFIG_FILE: /etc/invidious/config.yml
 
   invidious:
-    image: git.nadeko.net/invidious/invidious:latest
+    image: git.nadeko.net/fijxu/invidious:latest
     restart: unless-stopped
-    ports:
-      - "127.0.0.1:5432:5432"
     deploy: 
       replicas: 4
     volumes:
-      - ./config/config.conf:/etc/config/config.conf
+      - ./config/config.yml:/etc/invidious/config.yml:ro
+      - ./logs:/var/log/invidious:rw
+      - /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432:rw
+      - /var/run/redis/redis.sock:/var/run/redis/redis.sock:rw
+    environment:
+      INVIDIOUS_CONFIG_FILE: /etc/invidious/config.yml
 
   invidious-nginx:
    image: nginx:latest
@@ -33,4 +39,4 @@ services:
    depends_on:
      - invidious
    ports:
-     - "127.0.0.1:50011:3000"
+     - "127.0.0.1:10011:3000"

nginx.conf

@@ -1,6 +1,6 @@
 user www-data;
 events {
-     worker_connections 1000;
+     worker_connections 1024;
 }
 http {
      server {

src/invidious/views/channel.ecr

@@ -30,7 +30,7 @@
 <meta property="og:site_name" content="Invidious">
 <meta property="og:url" content="<%= HOST_URL %>/channel/<%= ucid %>">
 <meta property="og:title" content="<%= author %>">
-<meta property="og:image" content="/ggpht<%= channel_profile_pic %>">
+<meta property="og:image" content="<%= HOST_URL %>/ggpht<%= channel_profile_pic %>">
 <meta property="og:description" content="<%= channel.description %>">
 <meta name="twitter:card" content="summary">
 <meta name="twitter:url" content="<%= HOST_URL %>/channel/<%= ucid %>">

src/invidious/views/watch.ecr

@@ -10,7 +10,7 @@
 <meta property="og:site_name" content="<%= author %> | Invidious">
 <meta property="og:url" content="<%= HOST_URL %>/watch?v=<%= video.id %>">
 <meta property="og:title" content="<%= title %>">
-<meta property="og:image" content="/vi/<%= video.id %>/maxres.jpg">
+<meta property="og:image" content="<%= HOST_URL %>/vi/<%= video.id %>/maxres.jpg">
 <meta property="og:description" content="<%= HTML.escape(video.short_description) %>">
 <meta property="og:type" content="video.other">
 <meta property="og:video:url" content="<%= HOST_URL %>/embed/<%= video.id %>">