diff --git a/INSTALLING.md b/INSTALLING.md index 06982de7..0a86db31 100644 --- a/INSTALLING.md +++ b/INSTALLING.md @@ -2,7 +2,7 @@ 1. Install docker & docker-compose 2. Download the - [`docker-compose.yml`](https://raw.githubusercontent.com/zoriya/Kyoo/master/docker-compose.prod.yml), + [`docker-compose.yml`](https://github.com/zoriya/kyoo/releases/latest/download/docker-compose.yml), [`nginx.conf.template`](https://raw.githubusercontent.com/zoriya/Kyoo/master/nginx.conf.template) and [`.env`](https://raw.githubusercontent.com/zoriya/Kyoo/master/.env.example) files 3. Fill the `.env` file with your configuration options (and an API Key from [themoviedb.org](https://www.themoviedb.org/)) @@ -22,7 +22,7 @@ Those files can be put in any directory of your choice. Those 3 files are: -- A `docker-compose.yml` (simply copy docker-compose.prod.yml from [here](https://raw.githubusercontent.com/zoriya/Kyoo/master/docker-compose.prod.yml)). +- A `docker-compose.yml` (simply download docker-compose.yml from [the latest release](https://github.com/zoriya/kyoo/releases/latest/download/docker-compose.yml)). - A `nginx.conf.template` copied from [here](https://raw.githubusercontent.com/zoriya/Kyoo/master/nginx.conf.template). - A `.env` file that you will need to **fill**. Look at the example [.env.example](https://raw.githubusercontent.com/zoriya/Kyoo/master/.env.example) @@ -50,9 +50,6 @@ unsure that your `.env` contains all the options specified in the updated `.env. After that, you will need to update Kyoo's services. For that, open a terminal in the configuration's directory and run the command `docker-compose pull`. You are now ready to restart Kyoo, you can run `docker-compose up -d`. -You can also enable automatic updates via an external tool like [watchtower](https://containrrr.dev/watchtower/). -TLDR: `docker run -d --name watchtower -e WATCHTOWER_CLEANUP=true -e WATCHTOWER_POLL_INTERVAL=86400 -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower` - # Uninstalling To uninstall Kyoo, you need to open a terminal in the configuration's directory and run `docker-compose down`. This will diff --git a/docker-compose.prod.yml b/docker-compose.build.yml similarity index 87% rename from docker-compose.prod.yml rename to docker-compose.build.yml index 0e7a9872..c8815528 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.build.yml @@ -1,10 +1,10 @@ x-transcoder: &transcoder-base - image: zoriya/kyoo_transcoder:latest + build: ./transcoder networks: default: aliases: - transcoder - restart: unless-stopped + restart: on-failure env_file: - ./.env volumes: @@ -14,9 +14,8 @@ x-transcoder: &transcoder-base services: back: - image: zoriya/kyoo_back:latest - restart: unless-stopped - cpus: 1.5 + build: ./back + restart: on-failure env_file: - ./.env depends_on: @@ -32,7 +31,9 @@ services: - kyoo:/kyoo migrations: - image: zoriya/kyoo_migrations:latest + build: + context: ./back + dockerfile: Dockerfile.migrations restart: "no" depends_on: postgres: @@ -41,14 +42,14 @@ services: - ./.env front: - image: zoriya/kyoo_front:latest - restart: unless-stopped + build: ./front + restart: on-failure environment: - KYOO_URL=${KYOO_URL:-http://back:5000} scanner: - image: zoriya/kyoo_scanner:latest - restart: unless-stopped + build: ./scanner + restart: on-failure depends_on: back: condition: service_healthy @@ -60,7 +61,7 @@ services: - ${LIBRARY_ROOT}:/video:ro matcher: - image: zoriya/kyoo_scanner:latest + build: ./scanner command: matcher restart: unless-stopped depends_on: @@ -72,7 +73,7 @@ services: - KYOO_URL=${KYOO_URL:-http://back:5000} autosync: - image: zoriya/kyoo_autosync:latest + build: ./autosync restart: on-failure depends_on: rabbitmq: @@ -115,7 +116,7 @@ services: ingress: image: nginx - restart: unless-stopped + restart: on-failure environment: - PORT=8901 - FRONT_URL=http://front:8901 @@ -130,7 +131,7 @@ services: postgres: image: postgres:15 - restart: unless-stopped + restart: on-failure env_file: - ./.env volumes: @@ -143,7 +144,7 @@ services: meilisearch: image: getmeili/meilisearch:v1.4 - restart: unless-stopped + restart: on-failure volumes: - search:/meili_data environment: diff --git a/docker-compose.yml b/docker-compose.yml index c8815528..0e7a9872 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ x-transcoder: &transcoder-base - build: ./transcoder + image: zoriya/kyoo_transcoder:latest networks: default: aliases: - transcoder - restart: on-failure + restart: unless-stopped env_file: - ./.env volumes: @@ -14,8 +14,9 @@ x-transcoder: &transcoder-base services: back: - build: ./back - restart: on-failure + image: zoriya/kyoo_back:latest + restart: unless-stopped + cpus: 1.5 env_file: - ./.env depends_on: @@ -31,9 +32,7 @@ services: - kyoo:/kyoo migrations: - build: - context: ./back - dockerfile: Dockerfile.migrations + image: zoriya/kyoo_migrations:latest restart: "no" depends_on: postgres: @@ -42,14 +41,14 @@ services: - ./.env front: - build: ./front - restart: on-failure + image: zoriya/kyoo_front:latest + restart: unless-stopped environment: - KYOO_URL=${KYOO_URL:-http://back:5000} scanner: - build: ./scanner - restart: on-failure + image: zoriya/kyoo_scanner:latest + restart: unless-stopped depends_on: back: condition: service_healthy @@ -61,7 +60,7 @@ services: - ${LIBRARY_ROOT}:/video:ro matcher: - build: ./scanner + image: zoriya/kyoo_scanner:latest command: matcher restart: unless-stopped depends_on: @@ -73,7 +72,7 @@ services: - KYOO_URL=${KYOO_URL:-http://back:5000} autosync: - build: ./autosync + image: zoriya/kyoo_autosync:latest restart: on-failure depends_on: rabbitmq: @@ -116,7 +115,7 @@ services: ingress: image: nginx - restart: on-failure + restart: unless-stopped environment: - PORT=8901 - FRONT_URL=http://front:8901 @@ -131,7 +130,7 @@ services: postgres: image: postgres:15 - restart: on-failure + restart: unless-stopped env_file: - ./.env volumes: @@ -144,7 +143,7 @@ services: meilisearch: image: getmeili/meilisearch:v1.4 - restart: on-failure + restart: unless-stopped volumes: - search:/meili_data environment: