From 77c09bf902a1c6851b0fe646ee8974af8b231d4a Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Tue, 10 May 2022 17:13:50 +0200 Subject: [PATCH 1/5] Add Pinner service to the stack. --- dc | 5 +++++ docker-compose.pinner.yml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 docker-compose.pinner.yml diff --git a/dc b/dc index d54bbf2d..de8f9e9a 100755 --- a/dc +++ b/dc @@ -45,6 +45,11 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do if [[ ${PORTAL_MODULES:i-1:1} == "u" ]]; then COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml -f docker-compose.abuse-scanner.yml" fi + + # pinner module - alias "p" + if [[ ${PORTAL_MODULES:i-1:1} == "p" ]]; then + COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.pinner.yml" + fi done # override file if exists diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml new file mode 100644 index 00000000..05427426 --- /dev/null +++ b/docker-compose.pinner.yml @@ -0,0 +1,31 @@ +version: "3.7" + +x-logging: &default-logging + driver: json-file + options: + max-size: "10m" + max-file: "3" + +services: + health-check: + environment: + - BLOCKER_HOST=10.10.10.110 + - BLOCKER_PORT=4000 + + blocker: + # uncomment "build" and comment out "image" to build from sources + # build: https://github.com/SkynetLabs/pinner.git#main + image: skynetlabs/pinner + container_name: pinner + restart: unless-stopped + logging: *default-logging + env_file: + - .env + expose: + - 4000 + networks: + shared: + ipv4_address: 10.10.10.130 + depends_on: + - mongo + - sia From 0128b492bc859a08d0ddfa017e7f87a94583e29b Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Tue, 10 May 2022 17:16:49 +0200 Subject: [PATCH 2/5] Add changelog. --- changelog/items/key-updates/pinner.md | 1 + docker-compose.pinner.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog/items/key-updates/pinner.md diff --git a/changelog/items/key-updates/pinner.md b/changelog/items/key-updates/pinner.md new file mode 100644 index 00000000..19e15ddb --- /dev/null +++ b/changelog/items/key-updates/pinner.md @@ -0,0 +1 @@ +- Add Pinner service to the portal stack. Activate it by selecting the 'p' module. diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml index 05427426..50066ebc 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -9,8 +9,8 @@ x-logging: &default-logging services: health-check: environment: - - BLOCKER_HOST=10.10.10.110 - - BLOCKER_PORT=4000 + - PINNER_HOST=10.10.10.130 + - PINNER_PORT=4000 blocker: # uncomment "build" and comment out "image" to build from sources From 8d74c86254a9afb53111cfef2ea3545f4247a97e Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Tue, 10 May 2022 17:18:10 +0200 Subject: [PATCH 3/5] Fix the service name. --- docker-compose.pinner.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml index 50066ebc..5d76b21b 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -7,12 +7,7 @@ x-logging: &default-logging max-file: "3" services: - health-check: - environment: - - PINNER_HOST=10.10.10.130 - - PINNER_PORT=4000 - - blocker: + pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main image: skynetlabs/pinner From 0bcdf36f2777c45bbfae1b90557213801c73e554 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Tue, 24 May 2022 11:04:39 +0200 Subject: [PATCH 4/5] Set a pinner version. --- docker-compose.pinner.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml index 5d76b21b..3e8f03af 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,12 +10,14 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner + image: skynetlabs/pinner:0.1.0 container_name: pinner restart: unless-stopped logging: *default-logging env_file: - .env + environment: + - PINNER_LOG_LEVEL=${PINNER_LOG_LEVEL:-trace} expose: - 4000 networks: From 78c5b9947bef8055197ef558d708cb8f1a7c79c2 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Tue, 24 May 2022 13:48:58 +0200 Subject: [PATCH 5/5] set other log level --- docker-compose.pinner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml index 3e8f03af..5df54d4e 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -17,7 +17,7 @@ services: env_file: - .env environment: - - PINNER_LOG_LEVEL=${PINNER_LOG_LEVEL:-trace} + - PINNER_LOG_LEVEL=${PINNER_LOG_LEVEL:-info} expose: - 4000 networks: