From 640ced80211ca5d2e6ff566e23d65fbd9d2f3782 Mon Sep 17 00:00:00 2001 From: highghlow Date: Fri, 17 May 2024 18:31:58 +0300 Subject: [PATCH 1/8] Added scanservjs --- scanservjs/docker-compose.yml | 15 +++++++++++++++ scanservjs/umbrel-app.yml | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 scanservjs/docker-compose.yml create mode 100644 scanservjs/umbrel-app.yml diff --git a/scanservjs/docker-compose.yml b/scanservjs/docker-compose.yml new file mode 100644 index 0000000000..45ebd1c7df --- /dev/null +++ b/scanservjs/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3.7" + +services: + app_proxy: + environment: + APP_HOST: scanservjs_server_1 + APP_PORT: 8080 + + server: + image: sbs20/scanservjs:v3.0.3 # target: latest #! + restart: on-failure + stop_grace_period: 1m + volumes: + - /var/run/dbus:/var/run/dbus + priveleged: true # IDK, their docker guide told me to do that diff --git a/scanservjs/umbrel-app.yml b/scanservjs/umbrel-app.yml new file mode 100644 index 0000000000..20d10e7b6b --- /dev/null +++ b/scanservjs/umbrel-app.yml @@ -0,0 +1,23 @@ +manifestVersion: 1 +id: scanservjs +category: files +name: scanservjs +version: "3.0.3" +tagline: SANE scanner nodejs web ui +description: >- + scanservjs is a web UI frontend for your scanner. It allows you to share one or more scanners (using SANE) on a network without the need for drivers or complicated installation. +developer: sbs20 +website: https://sbs20.github.io/scanservjs/ +dependencies: [] +repo: https://github.com/sbs20/scanservjs +support: https://github.com/sbs20/scanservjs/issues +port: 2903 +gallery: + - 1.jpg + - 2.jpg + - 3.jpg +path: "" +defaultUsername: "" +defaultPassword: "" +submitter: highghlow +submission: https://github.com/getumbrel/umbrel-apps/pull/TODO From f18f0345293e9017415065b84a53a93c4e15943f Mon Sep 17 00:00:00 2001 From: highghlow Date: Fri, 17 May 2024 18:40:09 +0300 Subject: [PATCH 2/8] Added mounts, updated privileged message --- scanservjs/docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scanservjs/docker-compose.yml b/scanservjs/docker-compose.yml index 45ebd1c7df..5c36cf0378 100644 --- a/scanservjs/docker-compose.yml +++ b/scanservjs/docker-compose.yml @@ -12,4 +12,6 @@ services: stop_grace_period: 1m volumes: - /var/run/dbus:/var/run/dbus - priveleged: true # IDK, their docker guide told me to do that + - ${APP_DATA_DIR}/data/scans:/var/lib/scanservjs/output + - ${APP_DATA_DIR}/data/cfg:/etc/scanservjs + priveleged: true # It's for accessing usb-connected scanners From 6e5b2f23e34a95d9c35a27c0108bd9ee476929bc Mon Sep 17 00:00:00 2001 From: highghlow Date: Fri, 17 May 2024 18:45:14 +0300 Subject: [PATCH 3/8] Updated submission PR number --- scanservjs/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanservjs/umbrel-app.yml b/scanservjs/umbrel-app.yml index 20d10e7b6b..a3fc9d77b5 100644 --- a/scanservjs/umbrel-app.yml +++ b/scanservjs/umbrel-app.yml @@ -20,4 +20,4 @@ path: "" defaultUsername: "" defaultPassword: "" submitter: highghlow -submission: https://github.com/getumbrel/umbrel-apps/pull/TODO +submission: https://github.com/getumbrel/umbrel-apps/pull/1094 From ced261883cf431bb768be98f1184836a0048ef2f Mon Sep 17 00:00:00 2001 From: highghlow Date: Fri, 17 May 2024 18:58:41 +0300 Subject: [PATCH 4/8] Pinned digest --- scanservjs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanservjs/docker-compose.yml b/scanservjs/docker-compose.yml index 5c36cf0378..a6c4d580e0 100644 --- a/scanservjs/docker-compose.yml +++ b/scanservjs/docker-compose.yml @@ -7,7 +7,7 @@ services: APP_PORT: 8080 server: - image: sbs20/scanservjs:v3.0.3 # target: latest #! + image: sbs20/scanservjs:v3.0.3@sha256:dad1fd6e9a98957d324499e822a3019cc43d6557e314635c82665baf576b960e # target: latest #! restart: on-failure stop_grace_period: 1m volumes: From 72057a954a2da8ec4d4f5cf9ce4b5163b9922359 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Mon, 3 Jun 2024 12:44:31 +1000 Subject: [PATCH 5/8] fix invalid compose yaml --- scanservjs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanservjs/docker-compose.yml b/scanservjs/docker-compose.yml index a6c4d580e0..c0c47d8f91 100644 --- a/scanservjs/docker-compose.yml +++ b/scanservjs/docker-compose.yml @@ -14,4 +14,4 @@ services: - /var/run/dbus:/var/run/dbus - ${APP_DATA_DIR}/data/scans:/var/lib/scanservjs/output - ${APP_DATA_DIR}/data/cfg:/etc/scanservjs - priveleged: true # It's for accessing usb-connected scanners + privileged: true # It's for accessing usb-connected scanners From 50c84c226bddc61a4af7078a0a54b3382b9c8c84 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Mon, 3 Jun 2024 12:52:43 +1000 Subject: [PATCH 6/8] remove comments --- scanservjs/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scanservjs/docker-compose.yml b/scanservjs/docker-compose.yml index c0c47d8f91..b33d4b4eb3 100644 --- a/scanservjs/docker-compose.yml +++ b/scanservjs/docker-compose.yml @@ -7,11 +7,11 @@ services: APP_PORT: 8080 server: - image: sbs20/scanservjs:v3.0.3@sha256:dad1fd6e9a98957d324499e822a3019cc43d6557e314635c82665baf576b960e # target: latest #! + image: sbs20/scanservjs:v3.0.3@sha256:dad1fd6e9a98957d324499e822a3019cc43d6557e314635c82665baf576b960e restart: on-failure stop_grace_period: 1m volumes: - /var/run/dbus:/var/run/dbus - ${APP_DATA_DIR}/data/scans:/var/lib/scanservjs/output - ${APP_DATA_DIR}/data/cfg:/etc/scanservjs - privileged: true # It's for accessing usb-connected scanners + privileged: true From 0af028e916a2d4cc7a85f6d31873f4f18a2505fc Mon Sep 17 00:00:00 2001 From: nmfretz Date: Mon, 3 Jun 2024 12:54:09 +1000 Subject: [PATCH 7/8] map /dev --- scanservjs/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scanservjs/docker-compose.yml b/scanservjs/docker-compose.yml index b33d4b4eb3..43fa31f3cd 100644 --- a/scanservjs/docker-compose.yml +++ b/scanservjs/docker-compose.yml @@ -14,4 +14,6 @@ services: - /var/run/dbus:/var/run/dbus - ${APP_DATA_DIR}/data/scans:/var/lib/scanservjs/output - ${APP_DATA_DIR}/data/cfg:/etc/scanservjs + # map the host's /dev to allow discovery of usb devices without needing to know apriori which devices are connected + - /dev:/dev privileged: true From 1bc54379cfe648f4ee0d6aef35a5a3bb7063ec5a Mon Sep 17 00:00:00 2001 From: nmfretz Date: Mon, 3 Jun 2024 12:55:50 +1000 Subject: [PATCH 8/8] Add data directories --- scanservjs/data/config/.gitkeep | 0 scanservjs/data/scans/.gitkeep | 0 scanservjs/docker-compose.yml | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 scanservjs/data/config/.gitkeep create mode 100644 scanservjs/data/scans/.gitkeep diff --git a/scanservjs/data/config/.gitkeep b/scanservjs/data/config/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scanservjs/data/scans/.gitkeep b/scanservjs/data/scans/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scanservjs/docker-compose.yml b/scanservjs/docker-compose.yml index 43fa31f3cd..7c816e82f0 100644 --- a/scanservjs/docker-compose.yml +++ b/scanservjs/docker-compose.yml @@ -11,9 +11,9 @@ services: restart: on-failure stop_grace_period: 1m volumes: - - /var/run/dbus:/var/run/dbus - ${APP_DATA_DIR}/data/scans:/var/lib/scanservjs/output - - ${APP_DATA_DIR}/data/cfg:/etc/scanservjs + - ${APP_DATA_DIR}/data/config:/etc/scanservjs + - /var/run/dbus:/var/run/dbus # map the host's /dev to allow discovery of usb devices without needing to know apriori which devices are connected - /dev:/dev privileged: true