From e025200ee1f0d0fc0c597adfbe90da330e7e7791 Mon Sep 17 00:00:00 2001
From: faulty <didier@faulty.nl>
Date: Tue, 14 Feb 2023 11:55:09 +0100
Subject: [PATCH] dockerfiles etc

---
 custom/invidious-db/Dockerfile |  8 ++++++++
 custom/invidious/Dockerfile    |  3 +++
 custom/invidious/config.yml    | 11 +++++++++++
 docker-compose.utils.yml       | 20 ++++----------------
 4 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 custom/invidious-db/Dockerfile
 create mode 100644 custom/invidious/Dockerfile
 create mode 100644 custom/invidious/config.yml

diff --git a/custom/invidious-db/Dockerfile b/custom/invidious-db/Dockerfile
new file mode 100644
index 0000000..1c64783
--- /dev/null
+++ b/custom/invidious-db/Dockerfile
@@ -0,0 +1,8 @@
+FROM docker.io/library/postgres:14-bullseye
+
+RUN apt update && apt install -y \
+    git
+
+RUN git clone git clone https://github.com/iv-org/invidious /tmp/invidious
+RUN cp -r /tmp/invidious/config/sql /config/sql
+RUN cp -r /tmp/invidious/docker/init-invidious-db.sh /docker-entrypoint-initdb.d/init-invidious-db.sh
\ No newline at end of file
diff --git a/custom/invidious/Dockerfile b/custom/invidious/Dockerfile
new file mode 100644
index 0000000..8ae4a4f
--- /dev/null
+++ b/custom/invidious/Dockerfile
@@ -0,0 +1,3 @@
+FROM quay.io/invidious/invidious
+
+COPY config.yml /invidious/config/config.yml
\ No newline at end of file
diff --git a/custom/invidious/config.yml b/custom/invidious/config.yml
new file mode 100644
index 0000000..8c00631
--- /dev/null
+++ b/custom/invidious/config.yml
@@ -0,0 +1,11 @@
+db:
+  dbname: invidious
+  user: indivious
+  password: indivious
+  host: invidious-db
+  port: 5432
+check_tables: true
+domain: yt.neo.ixvd.net
+# external_port:
+# https_only: false
+# statistics_enabled: false
\ No newline at end of file
diff --git a/docker-compose.utils.yml b/docker-compose.utils.yml
index b230045..8eb9b3a 100644
--- a/docker-compose.utils.yml
+++ b/docker-compose.utils.yml
@@ -180,21 +180,10 @@ services:
       - proxy
 
   invidious:
-    image: quay.io/invidious/invidious:latest
+    build: 
+      context: custom/invidious
     restart: unless-stopped
     environment:
-      INVIDIOUS_CONFIG: |
-        db:
-          dbname: invidious
-          user: indivious
-          password: indivious
-          host: invidious-db
-          port: 5432
-        check_tables: true
-        domain: yt.neo.ixvd.net
-        # external_port:
-        # https_only: false
-        # statistics_enabled: false
       LETSENCRYPT_HOST: "yt.neo.ixvd.net"
       VIRTUAL_HOST: "yt.neo.ixvd.net"
       VIRTUAL_PORT: 3000
@@ -211,12 +200,11 @@ services:
       - invidious-db
 
   invidious-db:
-    image: docker.io/library/postgres:14
+    build:
+      context: custom/invidious-db
     restart: unless-stopped
     volumes:
       - /srv/indivious/other/db/data:/var/lib/postgresql/data
-      - /srv/indivious/other/db/config/sql:/config/sql
-      - /srv/indivious/other/db/docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
     environment:
       POSTGRES_DB: invidious
       POSTGRES_USER: invidious