From 5648176f0e7189036d10c955b2aa160b260d7d73 Mon Sep 17 00:00:00 2001 From: evazion Date: Wed, 16 Jun 2021 07:14:07 -0500 Subject: [PATCH] docker: add IQDB to Docker Compose file. --- docker-compose.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 8b40fcb07..8324785f6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -21,6 +21,7 @@ version: "3.4" services: danbooru: + user: root image: evazion/danbooru ports: - "80:3000" @@ -29,6 +30,7 @@ services: - RAILS_SERVE_STATIC_FILES=true - DATABASE_URL=postgresql://danbooru@postgres/danbooru - DANBOORU_REDIS_URL=redis://redis:6379 + - DANBOORU_IQDB_URL=http://iqdb:5588 - DANBOORU_CANONICAL_URL=http://localhost volumes: - "danbooru-images:/danbooru/public/data" @@ -40,27 +42,45 @@ services: user: root cron: + user: root image: evazion/danbooru environment: - RAILS_ENV=production - DATABASE_URL=postgresql://danbooru@postgres/danbooru - DANBOORU_REDIS_URL=redis://redis:6379 + - DANBOORU_IQDB_URL=http://iqdb:5588 - DANBOORU_CANONICAL_URL=http://localhost depends_on: - danbooru + volumes: + - "danbooru-images:/danbooru/public/data" command: ["bash", "-c", "bin/wait-for-http http://danbooru:3000 5s && bin/rails danbooru:cron"] delayed_jobs: + # We need root to write temp upload files in the images directory (/danbooru/public/data) + user: root image: evazion/danbooru environment: - RAILS_ENV=production - DATABASE_URL=postgresql://danbooru@postgres/danbooru - DANBOORU_REDIS_URL=redis://redis:6379 + - DANBOORU_IQDB_URL=http://iqdb:5588 - DANBOORU_CANONICAL_URL=http://localhost depends_on: - danbooru + volumes: + # We need access to images so we can add/remove images to IQDB. + - "danbooru-images:/danbooru/public/data" command: ["bash", "-c", "bin/wait-for-http http://danbooru:3000 5s && bin/delayed_job run"] + # https://github.com/danbooru/iqdb + # https://hub.docker.com/repository/docker/evazion/iqdb + iqdb: + image: evazion/iqdb + volumes: + - "iqdb-data:/iqdb/data" + command: ["http", "0.0.0.0", "5588", "/iqdb/data/iqdb.sqlite"] + redis: image: redis @@ -77,3 +97,5 @@ volumes: name: danbooru-images danbooru-data: name: danbooru-data + iqdb-data: + name: iqdb-data