From 165737d680733ea14aa98980a5a822796d7e113b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 2 Jan 2019 16:53:01 +0100 Subject: [PATCH] Upgrade the container config for Postgres --- danielquinn-paperless-backup.syno.json | 65 -------------- ...son => danielquinn-paperless-consumer.json | 28 +++--- ...on => danielquinn-paperless-webserver.json | 15 ++-- postgres.json | 85 +++++++++++++++++++ sbrunner-scan-to-paperless.json | 55 ++++++++++++ 5 files changed, 167 insertions(+), 81 deletions(-) delete mode 100644 danielquinn-paperless-backup.syno.json rename danielquinn-paperless-consumer.syno.json => danielquinn-paperless-consumer.json (76%) rename danielquinn-paperless-webserver.syno.json => danielquinn-paperless-webserver.json (82%) create mode 100644 postgres.json create mode 100644 sbrunner-scan-to-paperless.json diff --git a/danielquinn-paperless-backup.syno.json b/danielquinn-paperless-backup.syno.json deleted file mode 100644 index 7dbaeb4e..00000000 --- a/danielquinn-paperless-backup.syno.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "cap_add" : [], - "cap_drop" : [], - "cmd" : "document_exporter /export", - "cpu_priority" : 50, - "devices" : null, - "enable_publish_all_ports" : false, - "enable_restart_policy" : false, - "enabled" : false, - "entrypoint_default" : "/sbin/docker-entrypoint.sh", - "env_variables" : [ - { - "key" : "PATH", - "value" : "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key" : "PAPERLESS_EXPORT_DIR", - "value" : "/export" - }, - { - "key" : "PAPERLESS_CONSUMPTION_DIR", - "value" : "/consume" - } - ], - "exporting" : false, - "id" : "1c5c85084b46f708f87ef1170711403db1b057e4733c79181b364b97b1de5452", - "image" : "danielquinn/paperless:latest", - "is_ddsm" : false, - "is_package" : false, - "links" : [], - "memory_limit" : 0, - "name" : "danielquinn-paperless-backup", - "network" : [ - { - "driver" : "bridge", - "name" : "bridge" - } - ], - "network_mode" : "bridge", - "port_bindings" : [], - "privileged" : false, - "shortcut" : { - "enable_shortcut" : false - }, - "ulimits" : null, - "use_host_network" : false, - "volume_bindings" : [ - { - "host_volume_file" : "/data/sync/Documents Stéphane Laetitia/paperless/export", - "mount_point" : "/export", - "type" : "rw" - }, - { - "host_volume_file" : "/data/sync/Documents Stéphane Laetitia/paperless/media", - "mount_point" : "/usr/src/paperless/media", - "type" : "rw" - }, - { - "host_volume_file" : "/data/sync/Documents Stéphane Laetitia/paperless/data", - "mount_point" : "/usr/src/paperless/data", - "type" : "rw" - } - ], - "volumes_from" : null -} diff --git a/danielquinn-paperless-consumer.syno.json b/danielquinn-paperless-consumer.json similarity index 76% rename from danielquinn-paperless-consumer.syno.json rename to danielquinn-paperless-consumer.json index ccc4a1eb..f3abd5aa 100644 --- a/danielquinn-paperless-consumer.syno.json +++ b/danielquinn-paperless-consumer.json @@ -2,13 +2,16 @@ "cap_add" : [], "cap_drop" : [], "cmd" : "document_consumer", - "cpu_priority" : 50, + "cpu_priority" : 10, "devices" : null, "enable_publish_all_ports" : false, "enable_restart_policy" : true, "enabled" : true, - "entrypoint_default" : "/sbin/docker-entrypoint.sh", "env_variables" : [ + { + "key" : "PAPERLESS_DBHOST", + "value" : "postgres" + }, { "key" : "PATH", "value" : "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" @@ -47,12 +50,12 @@ } ], "exporting" : false, - "id" : "c545301bc550785ac8a6b800fb7a491b1dc6e893a5fb273776cac9eeaf740343", + "id" : "e77fcdb40f980461986de00e8d2fa87c3fe1945068f9275c407b0e3e38289121", "image" : "danielquinn/paperless:latest", "is_ddsm" : false, "is_package" : false, "links" : [], - "memory_limit" : 0, + "memory_limit" : 4294967296, "name" : "danielquinn-paperless-consumer", "network" : [ { @@ -70,18 +73,23 @@ "use_host_network" : false, "volume_bindings" : [ { - "host_volume_file" : "/data/sync/Documents Stéphane Laetitia/paperless/consume", - "mount_point" : "/consume", + "host_volume_file" : "/paperless/dumpdata", + "mount_point" : "/dumpdata", "type" : "rw" }, { - "host_volume_file" : "/data/sync/Documents Stéphane Laetitia/paperless/media", - "mount_point" : "/usr/src/paperless/media", + "host_volume_file" : "/paperless/export", + "mount_point" : "/export", "type" : "rw" }, { - "host_volume_file" : "/data/sync/Documents Stéphane Laetitia/paperless/data", - "mount_point" : "/usr/src/paperless/data", + "host_volume_file" : "/paperless/consume", + "mount_point" : "/consume", + "type" : "rw" + }, + { + "host_volume_file" : "/paperless/media", + "mount_point" : "/usr/src/paperless/media", "type" : "rw" } ], diff --git a/danielquinn-paperless-webserver.syno.json b/danielquinn-paperless-webserver.json similarity index 82% rename from danielquinn-paperless-webserver.syno.json rename to danielquinn-paperless-webserver.json index a4ca6d68..c0f04de2 100644 --- a/danielquinn-paperless-webserver.syno.json +++ b/danielquinn-paperless-webserver.json @@ -7,8 +7,11 @@ "enable_publish_all_ports" : false, "enable_restart_policy" : true, "enabled" : false, - "entrypoint_default" : "/sbin/docker-entrypoint.sh", "env_variables" : [ + { + "key" : "PAPERLESS_DBHOST", + "value" : "postgres" + }, { "key" : "PATH", "value" : "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" @@ -43,7 +46,7 @@ } ], "exporting" : false, - "id" : "af4faf487b324c3209ee8fce6e427944ba32fd3c3b8fc50e5400be45b850f24d", + "id" : "30691049e29a312ab184291d03ddea034c4824517c82a126d1e43205f554fa25", "image" : "danielquinn/paperless:latest", "is_ddsm" : false, "is_package" : false, @@ -72,13 +75,13 @@ "use_host_network" : false, "volume_bindings" : [ { - "host_volume_file" : "/data/sync/Documents Stéphane Laetitia/paperless/media", - "mount_point" : "/usr/src/paperless/media", + "host_volume_file" : "/paperless/dumpdata", + "mount_point" : "/dump", "type" : "rw" }, { - "host_volume_file" : "/data/sync/Documents Stéphane Laetitia/paperless/data", - "mount_point" : "/usr/src/paperless/data", + "host_volume_file" : "/paperless/media", + "mount_point" : "/usr/src/paperless/media", "type" : "rw" } ], diff --git a/postgres.json b/postgres.json new file mode 100644 index 00000000..6bd73896 --- /dev/null +++ b/postgres.json @@ -0,0 +1,85 @@ +{ + "cap_add" : null, + "cap_drop" : null, + "cmd" : "postgres", + "cpu_priority" : 50, + "devices" : null, + "enable_publish_all_ports" : false, + "enable_restart_policy" : true, + "enabled" : true, + "entrypoint_default" : "docker-entrypoint.sh", + "env_variables" : [ + { + "key" : "PATH", + "value" : "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/postgresql/10/bin" + }, + { + "key" : "GOSU_VERSION", + "value" : "1.10" + }, + { + "key" : "LANG", + "value" : "en_US.utf8" + }, + { + "key" : "PG_MAJOR", + "value" : "10" + }, + { + "key" : "PG_VERSION", + "value" : "10.5-2.pgdg90+1" + }, + { + "key" : "PGDATA", + "value" : "/var/lib/postgresql/data" + }, + { + "key" : "POSTGRES_DB", + "value" : "paperless" + }, + { + "key" : "POSTGRES_USER", + "value" : "paperless" + }, + { + "key" : "POSTGRES_PASSWORD", + "value" : "1234" + } + ], + "exporting" : false, + "id" : "31b1f071e4f98c6ab607fc105013675c1575b4fc8abd406553cfb92cc909af29", + "image" : "postgres:10", + "is_ddsm" : false, + "is_package" : false, + "links" : [], + "memory_limit" : 0, + "name" : "postgres", + "network" : [ + { + "driver" : "bridge", + "name" : "bridge" + } + ], + "network_mode" : "bridge", + "port_bindings" : [ + { + "container_port" : 5432, + "host_port" : 0, + "type" : "tcp" + } + ], + "privileged" : false, + "shortcut" : { + "enable_shortcut" : false + }, + "ulimits" : null, + "use_host_network" : false, + "volume_bindings" : [ + { + "host_volume_file" : "/paperless/pgdata", + "mount_point" : "/var/lib/postgresql/data", + "type" : "rw" + } + ], + "volumes_from" : null +} diff --git a/sbrunner-scan-to-paperless.json b/sbrunner-scan-to-paperless.json new file mode 100644 index 00000000..1bc46afc --- /dev/null +++ b/sbrunner-scan-to-paperless.json @@ -0,0 +1,55 @@ +{ + "cap_add" : [], + "cap_drop" : [], + "cmd" : "/opt/process", + "cpu_priority" : 50, + "devices" : null, + "enable_publish_all_ports" : false, + "enable_restart_policy" : true, + "enabled" : false, + "env_variables" : [ + { + "key" : "LANG", + "value" : "C.UTF-8" + }, + { + "key" : "PROGRESS", + "value" : "TRUE" + } + ], + "exporting" : false, + "id" : "3b6322a6058f8a6a02d23157c8e8dd724e136a2c59cc7c1e0b34e13d496fb973", + "image" : "sbrunner/scan-to-paperless:latest", + "is_ddsm" : false, + "is_package" : false, + "links" : [], + "memory_limit" : 0, + "name" : "sbrunner-scan-to-paperless", + "network" : [ + { + "driver" : "bridge", + "name" : "bridge" + } + ], + "network_mode" : "bridge", + "port_bindings" : [], + "privileged" : false, + "shortcut" : { + "enable_shortcut" : false + }, + "ulimits" : null, + "use_host_network" : false, + "volume_bindings" : [ + { + "host_volume_file" : "/paperless/scan", + "mount_point" : "/source", + "type" : "rw" + }, + { + "host_volume_file" : "/paperless/consume", + "mount_point" : "/destination", + "type" : "rw" + } + ], + "volumes_from" : null +}