diff --git a/custom/invidious-db/Dockerfile b/custom/invidious-db/Dockerfile deleted file mode 100644 index 1c64783..0000000 --- a/custom/invidious-db/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 8ae4a4f..0000000 --- a/custom/invidious/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 8c00631..0000000 --- a/custom/invidious/config.yml +++ /dev/null @@ -1,11 +0,0 @@ -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 8eb9b3a..b230045 100644 --- a/docker-compose.utils.yml +++ b/docker-compose.utils.yml @@ -180,10 +180,21 @@ services: - proxy invidious: - build: - context: custom/invidious + image: quay.io/invidious/invidious:latest 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 @@ -200,11 +211,12 @@ services: - invidious-db invidious-db: - build: - context: custom/invidious-db + image: docker.io/library/postgres:14 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