From 582526b73514173be074cb63ca1c34190d4cd092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczyk?= Date: Mon, 20 Jun 2022 15:39:01 +0200 Subject: [PATCH 01/86] Bump webportal-accounts-dashboard to 1.1.2 --- docker-compose.accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 85184925..6ea30164 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -59,7 +59,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-accounts-dashboard.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-accounts-dashboard:1.1.1 + image: skynetlabs/webportal-accounts-dashboard:1.1.2 container_name: dashboard restart: unless-stopped logging: *default-logging From 09c0fcfc357a85f1296cca98b26cebd7cae1336a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Tue, 21 Jun 2022 11:22:26 +0200 Subject: [PATCH 02/86] update webportal-nginx to version 0.3.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7225c83b..f2f15c93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,7 +59,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-nginx.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-nginx:0.2.0 + image: skynetlabs/webportal-nginx:0.3.0 container_name: nginx restart: unless-stopped logging: *default-logging From 66b12f1d77e1e5b8b81d223b6a30009aae16a0f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:00:02 +0000 Subject: [PATCH 03/86] chore(deps): add renovate.json --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..f45d8f11 --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} From 4e18dfaca045cb68dbeef9e071069fa6d01808df Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 21 Jun 2022 13:26:51 +0200 Subject: [PATCH 04/86] configure only docker-compose files --- renovate.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index f45d8f11..f763fa76 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,4 @@ { - "extends": [ - "config:base" - ] + "extends": ["config:base", ":prHourlyLimitNone"], + "enabledManagers": ["docker-compose"] } From 990ad41c0f0d9f969eebd1667bd37a81351b04a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:35:28 +0000 Subject: [PATCH 05/86] chore(deps): update dependency mongo to v4.4.14 --- docker-compose.mongodb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.mongodb.yml b/docker-compose.mongodb.yml index e8eb9aca..1e3e279b 100644 --- a/docker-compose.mongodb.yml +++ b/docker-compose.mongodb.yml @@ -14,7 +14,7 @@ services: - MONGODB_PASSWORD=${SKYNET_DB_PASS} mongo: - image: mongo:4.4.1 + image: mongo:4.4.14 command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet} --setParameter ShardingTaskExecutorPoolMinSize=10 container_name: mongo restart: unless-stopped From 7719089dbddc1a6b2e85c77368383db66d0a0890 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:35:33 +0000 Subject: [PATCH 06/86] chore(deps): update dependency certbot/dns-route53 to v1.28.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f2f15c93..48dae999 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: - 9980 certbot: - image: certbot/dns-route53:v1.25.0 + image: certbot/dns-route53:v1.28.0 entrypoint: sh /entrypoint.sh container_name: certbot restart: unless-stopped From de310cf8730fdc4ed3632f8c0c35dc3c3fcbc2b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:35:37 +0000 Subject: [PATCH 07/86] chore(deps): update dependency docker.elastic.co/elasticsearch/elasticsearch to v7.17.4 --- docker-compose.jaeger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index a7fb2483..9dfabb2a 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -93,7 +93,7 @@ services: - elasticsearch elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4 container_name: elasticsearch restart: on-failure logging: *default-logging From cbc3d6560e56d18b804628a712d9c444dae1ca65 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 21 Jun 2022 13:40:45 +0200 Subject: [PATCH 08/86] group renovate jaegertracing --- renovate.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index f763fa76..7c3ef876 100644 --- a/renovate.json +++ b/renovate.json @@ -1,4 +1,7 @@ { "extends": ["config:base", ":prHourlyLimitNone"], - "enabledManagers": ["docker-compose"] + "enabledManagers": ["docker-compose"], + "packageRules": [ + { "groupName": "jaegertracing", "matchPackagePatterns": ["jaegertracing"] } + ] } From c1f6ae9e0428aa2b367d2e2ddcbfedf8d63912a0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 15:01:58 +0000 Subject: [PATCH 09/86] chore(deps): update dependency skynetlabs/webportal-nginx to v0.3.1 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f2f15c93..d471de82 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,7 +59,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-nginx.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-nginx:0.3.0 + image: skynetlabs/webportal-nginx:0.3.1 container_name: nginx restart: unless-stopped logging: *default-logging From a603879277ee4075d3a57e1a55eafd71cc7ba142 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 15:31:38 +0000 Subject: [PATCH 10/86] chore(deps): update jaegertracing to v1.35.2 --- docker-compose.jaeger.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index 9dfabb2a..e9d9eb75 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -21,7 +21,7 @@ services: - JAEGER_REPORTER_LOG_SPANS=false jaeger-agent: - image: jaegertracing/jaeger-agent:1.32.0 + image: jaegertracing/jaeger-agent:1.35.2 command: [ "--reporter.grpc.host-port=jaeger-collector:14250", @@ -43,7 +43,7 @@ services: - jaeger-collector jaeger-collector: - image: jaegertracing/jaeger-collector:1.32.0 + image: jaegertracing/jaeger-collector:1.35.2 entrypoint: /wait_to_start.sh container_name: jaeger-collector restart: on-failure @@ -68,7 +68,7 @@ services: - elasticsearch jaeger-query: - image: jaegertracing/jaeger-query:1.32.0 + image: jaegertracing/jaeger-query:1.35.2 entrypoint: /wait_to_start.sh container_name: jaeger-query restart: on-failure From d88c3b65fa8efca18769e31d65a5ed740caf99a6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 15:32:28 +0000 Subject: [PATCH 11/86] chore(deps): update dependency skynetlabs/webportal-website to v0.2.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5ef5c6a1..355141b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,7 +89,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-website.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-website:0.1.0 + image: skynetlabs/webportal-website:0.2.0 container_name: website restart: unless-stopped logging: *default-logging From e273491360d3471521f96a3c3a212485976d72a4 Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Sat, 25 Jun 2022 23:48:35 -0400 Subject: [PATCH 12/86] Update authorized_keys --- setup-scripts/support/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/setup-scripts/support/authorized_keys b/setup-scripts/support/authorized_keys index b2848d66..91d02488 100644 --- a/setup-scripts/support/authorized_keys +++ b/setup-scripts/support/authorized_keys @@ -9,3 +9,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN6Kcx8yetova4/ALUQHigo/PBMJO33ZTKOsg2jxSO2a ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcenWnMQ6q/OEC4ZmQgjLDV2obWlR3fENV0zRGFvJF+ marcins@siasky.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB7prtVOTwtcSN9HkXum107RwcW5H8Vggx6Qv7T57ItT daniel@siasky.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH+4IrfEM9H16jqvPZncHkWWoHO4/BVq7d4pEyzK4e0W michal.leszczyk@skynetlabs.com +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDY48P1s8NAgjKFRN2/iUYXWbYsEb10kyPRPxlawtI4JqEMfDxan30c99ANe6badh3KS+EDLdviijD7FDKGP2sPSBWv4L0N996u5t8+tK+eon3kRaJfGfyHlAuQWoRIHU1IK/liMqcJ5RgpZxavwMYbz0nza3LVRgkzfAR4qtWOBL3TfWclRHqYC6+qvP9Y3mc/FJxXPCyFBukZt4z3kFSW4WzoZuPxubw7wfOhgiG+2NSjLMxmKbFOCqcDfD/UyAY/z3JY9VSOBqX2+XqTex4O0WYNt4GaVd3Spo5sWV2s+xAPnBLEr4+pN45reLs2CaJjjqygPWDPJ8fDUjK1qSgAmfOFiP79jDDsnU/+fL0HsnmfmVC79td5gwi7TTmoAGSXzCNKCgcW5Q1GecSdG2doXGuNYfcvX5S737K+9KU+ril5rUKxvNjHWugYStbgDU0xvKtI5buI+CYD+p2OP0qRupb9jmwuZ+EsIwSX09LzITjs0H9sZ3Jd36eTT9EmHPc= user@dev From f17e78f7c412e634cff94f06ff991aa4eb3c16fc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 11:01:11 +0000 Subject: [PATCH 13/86] chore(deps): update dependency skynetlabs/skynet-accounts to v1.2.2 --- docker-compose.accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 6ea30164..8f62a42b 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -22,7 +22,7 @@ services: accounts: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/skynet-accounts.git#main - image: skynetlabs/skynet-accounts:1.2.0 + image: skynetlabs/skynet-accounts:1.2.2 container_name: accounts restart: unless-stopped logging: *default-logging From cdf5c3f7327939caf555fe58ba9d530664b8bc9a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 14:11:03 +0000 Subject: [PATCH 14/86] chore(deps): update dependency skynetlabs/webportal-nginx to v0.3.3 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 355141b1..4ee63c7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,7 +59,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-nginx.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-nginx:0.3.1 + image: skynetlabs/webportal-nginx:0.3.3 container_name: nginx restart: unless-stopped logging: *default-logging From 46d109956108d3d2ec79a07c7d1e29d8249152d1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 14:11:08 +0000 Subject: [PATCH 15/86] chore(deps): update dependency skynetlabs/webportal-website to v0.2.1 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 355141b1..59b394ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,7 +89,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-website.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-website:0.2.0 + image: skynetlabs/webportal-website:0.2.1 container_name: website restart: unless-stopped logging: *default-logging From fa156a208d1f468f491862826335f7ae7f6d5a29 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 14:11:14 +0000 Subject: [PATCH 16/86] chore(deps): update dependency skynetlabs/webportal-health-check to v0.2.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 355141b1..069e62c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -169,7 +169,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-health-check.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-health-check:0.1.3 + image: skynetlabs/webportal-health-check:0.2.0 container_name: health-check restart: unless-stopped logging: *default-logging From b57dd97b247c84d838686a82516fd14692d8fea0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 18:16:43 +0000 Subject: [PATCH 17/86] chore(deps): update dependency skynetlabs/blocker to v0.1.2 --- docker-compose.blocker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.blocker.yml b/docker-compose.blocker.yml index db398805..09d3c835 100644 --- a/docker-compose.blocker.yml +++ b/docker-compose.blocker.yml @@ -15,7 +15,7 @@ services: blocker: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/blocker.git#main - image: skynetlabs/blocker:0.1.1 + image: skynetlabs/blocker:0.1.2 container_name: blocker restart: unless-stopped logging: *default-logging From 8bc3da2bfb8d203c79bf59812003ac1ed603e04c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 18:16:48 +0000 Subject: [PATCH 18/86] chore(deps): update dependency skynetlabs/abuse-scanner to v0.2.0 --- docker-compose.abuse-scanner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.abuse-scanner.yml b/docker-compose.abuse-scanner.yml index 2eae443b..9234e563 100644 --- a/docker-compose.abuse-scanner.yml +++ b/docker-compose.abuse-scanner.yml @@ -10,7 +10,7 @@ services: abuse-scanner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/abuse-scanner.git#main - image: skynetlabs/abuse-scanner:0.1.1 + image: skynetlabs/abuse-scanner:0.2.0 container_name: abuse-scanner restart: unless-stopped logging: *default-logging From dd192c11b28520e63242f81332188a1253bad34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Tue, 28 Jun 2022 10:36:30 +0200 Subject: [PATCH 19/86] Create CODEOWNERS --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..ee5673f0 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @kwypchlo @meeh0w From b3d344ec81e578303c6a5fc3fcfc001e8eb8d1f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 16:51:56 +0000 Subject: [PATCH 20/86] chore(deps): update dependency docker.elastic.co/elasticsearch/elasticsearch to v7.17.5 --- docker-compose.jaeger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index 9dfabb2a..8af05a58 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -93,7 +93,7 @@ services: - elasticsearch elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5 container_name: elasticsearch restart: on-failure logging: *default-logging From db579f6ebdbbaf8a55f4ed7ac92ed2c80811503d Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 1 Jul 2022 16:40:34 +0200 Subject: [PATCH 21/86] add readme note about certbot plugin --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 3d161261..0fc75855 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,6 +41,10 @@ services: - 9980 certbot: + # replace this image with the image supporting your dns provider from + # https://hub.docker.com/r/certbot/certbot and adjust CERTBOT_ARGS env variable + # note: you will need to authenticate your dns request so consult the plugin docs + # configuration https://eff-certbot.readthedocs.io/en/stable/using.html#dns-plugins image: certbot/dns-route53:v1.28.0 entrypoint: sh /entrypoint.sh container_name: certbot From 975ede05f5954b6b083f500363b054246f2a529a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 13:00:10 +0000 Subject: [PATCH 22/86] chore(deps): update jaegertracing to v1.36.0 --- docker-compose.jaeger.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index 30b062e1..740da435 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -21,7 +21,7 @@ services: - JAEGER_REPORTER_LOG_SPANS=false jaeger-agent: - image: jaegertracing/jaeger-agent:1.35.2 + image: jaegertracing/jaeger-agent:1.36.0 command: [ "--reporter.grpc.host-port=jaeger-collector:14250", @@ -43,7 +43,7 @@ services: - jaeger-collector jaeger-collector: - image: jaegertracing/jaeger-collector:1.35.2 + image: jaegertracing/jaeger-collector:1.36.0 entrypoint: /wait_to_start.sh container_name: jaeger-collector restart: on-failure @@ -68,7 +68,7 @@ services: - elasticsearch jaeger-query: - image: jaegertracing/jaeger-query:1.35.2 + image: jaegertracing/jaeger-query:1.36.0 entrypoint: /wait_to_start.sh container_name: jaeger-query restart: on-failure From 919061a6ec2e3c5877762ce400f6177b0ccfdab1 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Tue, 5 Jul 2022 16:23:46 +0300 Subject: [PATCH 23/86] Define a log file for pinner. --- docker-compose.pinner.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml index 19bacc5e..2f170141 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -16,8 +16,11 @@ services: logging: *default-logging env_file: - .env + volumes: + - ./docker/data/pinner/logs:/logs environment: - PINNER_LOG_LEVEL=${PINNER_LOG_LEVEL:-info} + - PINNER_LOG_FILE=${PINNER_LOG_FILE} expose: - 4000 networks: From 6bfc12287d02ab5a973ff68ca7044e42b8ac6351 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Tue, 5 Jul 2022 17:11:41 +0300 Subject: [PATCH 24/86] Clean up redundant code. --- docker-compose.pinner.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml index 2f170141..3ac385b1 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -20,7 +20,6 @@ services: - ./docker/data/pinner/logs:/logs environment: - PINNER_LOG_LEVEL=${PINNER_LOG_LEVEL:-info} - - PINNER_LOG_FILE=${PINNER_LOG_FILE} expose: - 4000 networks: From 9e8def4c5d63ace78e5143017f3f1ab60863ab61 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 15:35:52 +0000 Subject: [PATCH 25/86] chore(deps): update dependency skynetlabs/skynet-accounts to v1.2.3 --- docker-compose.accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 8f62a42b..b33f3d25 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -22,7 +22,7 @@ services: accounts: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/skynet-accounts.git#main - image: skynetlabs/skynet-accounts:1.2.2 + image: skynetlabs/skynet-accounts:1.2.3 container_name: accounts restart: unless-stopped logging: *default-logging From 04f3579f60d6754476f050bbc4362a8745bfd03a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 15:35:57 +0000 Subject: [PATCH 26/86] chore(deps): update dependency skynetlabs/pinner to v0.4.0 --- 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 19bacc5e..ac84f1d8 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.3.1 + image: skynetlabs/pinner:0.4.0 container_name: pinner restart: unless-stopped logging: *default-logging From 62e300ca0c589d25665c9de98d1d6412b37c2f8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:11:49 +0000 Subject: [PATCH 27/86] chore(deps): update dependency mongo to v4.4.15 --- docker-compose.mongodb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.mongodb.yml b/docker-compose.mongodb.yml index 1e3e279b..898365a4 100644 --- a/docker-compose.mongodb.yml +++ b/docker-compose.mongodb.yml @@ -14,7 +14,7 @@ services: - MONGODB_PASSWORD=${SKYNET_DB_PASS} mongo: - image: mongo:4.4.14 + image: mongo:4.4.15 command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet} --setParameter ShardingTaskExecutorPoolMinSize=10 container_name: mongo restart: unless-stopped From 2941d33ee5647cdbf59f1acec0a11451872de9ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Jul 2022 02:53:05 +0000 Subject: [PATCH 28/86] chore(deps): update dependency certbot/dns-route53 to v1.29.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3d161261..dced9c07 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: - 9980 certbot: - image: certbot/dns-route53:v1.28.0 + image: certbot/dns-route53:v1.29.0 entrypoint: sh /entrypoint.sh container_name: certbot restart: unless-stopped From 59af9b8ae694107777cfdf856c1cb84fa8164830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Wed, 6 Jul 2022 15:28:40 +0200 Subject: [PATCH 29/86] Update setup-scripts/support/authorized_keys --- setup-scripts/support/authorized_keys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-scripts/support/authorized_keys b/setup-scripts/support/authorized_keys index 91d02488..b5132b0d 100644 --- a/setup-scripts/support/authorized_keys +++ b/setup-scripts/support/authorized_keys @@ -9,4 +9,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN6Kcx8yetova4/ALUQHigo/PBMJO33ZTKOsg2jxSO2a ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcenWnMQ6q/OEC4ZmQgjLDV2obWlR3fENV0zRGFvJF+ marcins@siasky.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB7prtVOTwtcSN9HkXum107RwcW5H8Vggx6Qv7T57ItT daniel@siasky.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH+4IrfEM9H16jqvPZncHkWWoHO4/BVq7d4pEyzK4e0W michal.leszczyk@skynetlabs.com -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDY48P1s8NAgjKFRN2/iUYXWbYsEb10kyPRPxlawtI4JqEMfDxan30c99ANe6badh3KS+EDLdviijD7FDKGP2sPSBWv4L0N996u5t8+tK+eon3kRaJfGfyHlAuQWoRIHU1IK/liMqcJ5RgpZxavwMYbz0nza3LVRgkzfAR4qtWOBL3TfWclRHqYC6+qvP9Y3mc/FJxXPCyFBukZt4z3kFSW4WzoZuPxubw7wfOhgiG+2NSjLMxmKbFOCqcDfD/UyAY/z3JY9VSOBqX2+XqTex4O0WYNt4GaVd3Spo5sWV2s+xAPnBLEr4+pN45reLs2CaJjjqygPWDPJ8fDUjK1qSgAmfOFiP79jDDsnU/+fL0HsnmfmVC79td5gwi7TTmoAGSXzCNKCgcW5Q1GecSdG2doXGuNYfcvX5S737K+9KU+ril5rUKxvNjHWugYStbgDU0xvKtI5buI+CYD+p2OP0qRupb9jmwuZ+EsIwSX09LzITjs0H9sZ3Jd36eTT9EmHPc= user@dev +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHptEpqs57lhnHkfa+0SQgXQ4A63/YGV2cNTcGMQW+Jt david@skynetlabs.com From 241de3f2aecdaed83f09bdaea5f2765cb64c92cf Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Wed, 6 Jul 2022 18:40:24 +0200 Subject: [PATCH 30/86] use remote sia dockerfile --- docker-compose.yml | 4 ++-- docker/sia/Dockerfile | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 docker/sia/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index dced9c07..4c66d80a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,8 +16,8 @@ networks: services: sia: build: - context: ./docker/sia - dockerfile: Dockerfile + context: https://github.com/SkynetLabs/docker-skyd.git#main + dockerfile: scratch/Dockerfile args: branch: portal-latest container_name: sia diff --git a/docker/sia/Dockerfile b/docker/sia/Dockerfile deleted file mode 100644 index 953dd27c..00000000 --- a/docker/sia/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM golang:1.16.7 AS sia-builder - -ENV GOOS linux -ENV GOARCH amd64 - -ARG branch=portal-latest - -RUN git clone https://gitlab.com/SkynetLabs/skyd.git Sia --single-branch --branch ${branch} && \ - make release --directory Sia - -FROM nebulouslabs/sia:1.5.6 - -COPY --from=sia-builder /go/bin/ /usr/bin/ - -RUN if [ -f "/usr/bin/skyd" ]; then mv /usr/bin/skyd /usr/bin/siad; fi && \ - if [ -f "/usr/bin/skyc" ]; then mv /usr/bin/skyc /usr/bin/siac; fi From 5031229e18d9269ba833d35a79db450ab200ae7a Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Wed, 6 Jul 2022 18:44:35 +0200 Subject: [PATCH 31/86] remove dockerfile linter from this repository --- .github/workflows/lint-dockerfiles.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .github/workflows/lint-dockerfiles.yml diff --git a/.github/workflows/lint-dockerfiles.yml b/.github/workflows/lint-dockerfiles.yml deleted file mode 100644 index a766db46..00000000 --- a/.github/workflows/lint-dockerfiles.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Dockerfile Lint - -on: - push: - branches: - - master - pull_request: - -jobs: - hadolint: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - dockerfile: - - docker/sia/Dockerfile - steps: - - uses: actions/checkout@v3 - - uses: hadolint/hadolint-action@v2.0.0 - with: - dockerfile: ${{ matrix.dockerfile }} From dd5e362b2df6a0cae6ffc5e4fe7d40f09f68d5f5 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Wed, 6 Jul 2022 18:48:10 +0200 Subject: [PATCH 32/86] adjust command for new skyd container --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4c66d80a..e7292be3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,7 @@ services: dockerfile: scratch/Dockerfile args: branch: portal-latest + command: --disable-api-security --api-addr :9980 --modules gtcwra container_name: sia restart: unless-stopped stop_grace_period: 5m From 266e9a9307cd14e7bb16d0def316a4623e7879fc Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Wed, 6 Jul 2022 18:51:01 +0200 Subject: [PATCH 33/86] remove unused PORTAL_MODULES env variable --- docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e7292be3..584c7cf8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,13 +20,12 @@ services: dockerfile: scratch/Dockerfile args: branch: portal-latest - command: --disable-api-security --api-addr :9980 --modules gtcwra + command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia restart: unless-stopped stop_grace_period: 5m logging: *default-logging environment: - - SIA_MODULES=gctwra - SKYD_DISK_CACHE_ENABLED=${SKYD_DISK_CACHE_ENABLED:-true} - SKYD_DISK_CACHE_SIZE=${SKYD_DISK_CACHE_SIZE:-53690000000} # 50GB - SKYD_DISK_CACHE_MIN_HITS=${SKYD_DISK_CACHE_MIN_HITS:-3} From 60717027dd277ff159bacca14367dee1bae6aba2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 11:12:58 +0000 Subject: [PATCH 34/86] chore(deps): update dependency skynetlabs/webportal-health-check to v0.3.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index dced9c07..633590cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -169,7 +169,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-health-check.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-health-check:0.2.0 + image: skynetlabs/webportal-health-check:0.3.0 container_name: health-check restart: unless-stopped logging: *default-logging From f3ec6f5f33218055b7b2c1d4a74e14b73a79ff22 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 8 Jul 2022 10:49:19 +0200 Subject: [PATCH 35/86] cloudflare example --- docker-compose.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0fc75855..9083d9e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,6 +45,19 @@ services: # https://hub.docker.com/r/certbot/certbot and adjust CERTBOT_ARGS env variable # note: you will need to authenticate your dns request so consult the plugin docs # configuration https://eff-certbot.readthedocs.io/en/stable/using.html#dns-plugins + # + # ================================================================================= + # example docker-compose.yml changes required for Cloudflare dns provider: + # + # image: certbot/dns-cloudflare + # environment: + # - CERTBOT_ARGS=--dns-cloudflare --dns-cloudflare-credentials /etc/letsencrypt/cloudflare.ini + # + # create ./docker/data/certbot/cloudflare.ini file with the following content: + # dns_cloudflare_api_token = + # + # make sure that the file has 0400 permissions with: + # chmod 0400 ./docker/data/certbot/cloudflare.ini image: certbot/dns-route53:v1.28.0 entrypoint: sh /entrypoint.sh container_name: certbot From 2c3978babf91f5cab502f6ddd22fbfdf4d314754 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:29:01 +0000 Subject: [PATCH 36/86] chore(deps): update dependency skynetlabs/pinner to v0.4.1 --- 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 ee863911..1abf70cf 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.4.0 + image: skynetlabs/pinner:0.4.1 container_name: pinner restart: unless-stopped logging: *default-logging From 79c8cd997a4b8cc1808907b09b8da417e5629f0b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Jul 2022 13:44:11 +0000 Subject: [PATCH 37/86] chore(deps): update dependency skynetlabs/webportal-accounts-dashboard to v2 --- docker-compose.accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index b33f3d25..ec69e343 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -59,7 +59,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-accounts-dashboard.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-accounts-dashboard:1.1.2 + image: skynetlabs/webportal-accounts-dashboard:2.0.0 container_name: dashboard restart: unless-stopped logging: *default-logging From d13a4ae1541535648dc7c5ea7f9239e93e1b7773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczyk?= Date: Mon, 11 Jul 2022 11:03:19 +0200 Subject: [PATCH 38/86] Don't pass GATSBY_ env vars to dashboard anymore (#2163) * Don't pass GATSBY_ env vars to dashboard anymore * Bump dashboard image to 2.0.0 --- docker-compose.accounts.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index b33f3d25..76e23eda 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -59,15 +59,12 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-accounts-dashboard.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-accounts-dashboard:1.1.2 + image: skynetlabs/webportal-accounts-dashboard:2.0.0 container_name: dashboard restart: unless-stopped logging: *default-logging env_file: - .env - environment: - - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN} - - GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY} volumes: - ./docker/data/dashboard/.cache:/usr/app/.cache - ./docker/data/dashboard/public:/usr/app/public From b636894aa21bcde5d4bc4f42fcaa47e7d68b7ae4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 09:41:30 +0000 Subject: [PATCH 39/86] chore(deps): update dependency skynetlabs/webportal-nginx to v0.4.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 19c19a1c..39373abc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,7 +59,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-nginx.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-nginx:0.3.3 + image: skynetlabs/webportal-nginx:0.4.0 container_name: nginx restart: unless-stopped logging: *default-logging From f6fbf4242df2d1a7f2ec14068c6121744086a47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Tue, 19 Jul 2022 10:51:28 +0200 Subject: [PATCH 40/86] remove codeql --- .github/workflows/codeql-analysis.yml | 71 --------------------------- 1 file changed, 71 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 188d8d70..00000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,71 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ main ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ main ] - schedule: - - cron: '32 21 * * 0' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'javascript', 'python' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 From 03df7c7b335032206e7e7ea2b666c3c7ce66ffc6 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Mon, 25 Jul 2022 19:28:56 +0300 Subject: [PATCH 41/86] Show HSD logs by default. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 516d386c..d69c6085 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -128,7 +128,7 @@ services: restart: unless-stopped logging: *default-logging environment: - - HSD_LOG_CONSOLE=false + - HSD_LOG_CONSOLE=true - HSD_HTTP_HOST=0.0.0.0 - HSD_NETWORK=main - HSD_PORT=12037 From 61f153efe645a0623f8f9141e6ff719017945719 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Mon, 25 Jul 2022 20:03:41 +0300 Subject: [PATCH 42/86] Remove the var altogether. --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d69c6085..6b0e35ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -128,7 +128,6 @@ services: restart: unless-stopped logging: *default-logging environment: - - HSD_LOG_CONSOLE=true - HSD_HTTP_HOST=0.0.0.0 - HSD_NETWORK=main - HSD_PORT=12037 From 82e869bf34b16c6c330728ddadf2f6f19570e22e Mon Sep 17 00:00:00 2001 From: PJ Date: Wed, 27 Jul 2022 16:06:37 +0200 Subject: [PATCH 43/86] Update abuse-scanner compose file --- docker-compose.abuse-scanner.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.abuse-scanner.yml b/docker-compose.abuse-scanner.yml index 9234e563..7a99ab81 100644 --- a/docker-compose.abuse-scanner.yml +++ b/docker-compose.abuse-scanner.yml @@ -10,7 +10,7 @@ services: abuse-scanner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/abuse-scanner.git#main - image: skynetlabs/abuse-scanner:0.2.0 + image: skynetlabs/abuse-scanner:0.3.0 container_name: abuse-scanner restart: unless-stopped logging: *default-logging @@ -36,3 +36,6 @@ services: depends_on: - mongo - blocker + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /tmp/abuse-scanner:/tmp From a41ea10f64ab961b04cf5bfb7e8257fb1d4a24fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Fri, 29 Jul 2022 12:05:01 +0200 Subject: [PATCH 44/86] upgrade to handshakeorg/hsd:4.0.2 (#2179) * use handshakeorg/hsd:4.0.2 * add --no-auth --- docker-compose.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6b0e35ad..8f2ef5af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -122,17 +122,11 @@ services: - 9000 handshake: - image: skynetlabs/hsd:3.0.1 - command: --chain-migrate=2 --wallet-migrate=1 + image: handshakeorg/hsd:4.0.2 + command: --chain-migrate=3 --no-wallet --no-auth --compact-tree-on-init --network=main --http-host=0.0.0.0 container_name: handshake restart: unless-stopped logging: *default-logging - environment: - - HSD_HTTP_HOST=0.0.0.0 - - HSD_NETWORK=main - - HSD_PORT=12037 - env_file: - - .env volumes: - ./docker/data/handshake/.hsd:/root/.hsd networks: From a78f1d27455a07375ccecc700af28a45746b6d34 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 12:10:54 +0000 Subject: [PATCH 45/86] chore(deps): update dependency skynetlabs/webportal-nginx to v0.5.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8f2ef5af..7771ed7f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -76,7 +76,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-nginx.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-nginx:0.4.0 + image: skynetlabs/webportal-nginx:0.5.0 container_name: nginx restart: unless-stopped logging: *default-logging From ad743b3a3d0266f85b125a0cd15adcbb2776eee4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 10:55:13 +0000 Subject: [PATCH 46/86] chore(deps): update dependency skynetlabs/pinner to v0.5.0 --- 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 1abf70cf..00948f1e 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.4.1 + image: skynetlabs/pinner:0.5.0 container_name: pinner restart: unless-stopped logging: *default-logging From 1f136747856fdc9bf28a519a5441763948f0f226 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 10:55:18 +0000 Subject: [PATCH 47/86] chore(deps): update dependency skynetlabs/skynet-accounts to v1.3.0 --- docker-compose.accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 76e23eda..f1b6e69e 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -22,7 +22,7 @@ services: accounts: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/skynet-accounts.git#main - image: skynetlabs/skynet-accounts:1.2.3 + image: skynetlabs/skynet-accounts:1.3.0 container_name: accounts restart: unless-stopped logging: *default-logging From 45feb45d31e5442eeb16e67d37d332b5d8c70b67 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 10:55:23 +0000 Subject: [PATCH 48/86] chore(deps): update dependency skynetlabs/webportal-accounts-dashboard to v2.1.0 --- docker-compose.accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 76e23eda..4909d855 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -59,7 +59,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-accounts-dashboard.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-accounts-dashboard:2.0.0 + image: skynetlabs/webportal-accounts-dashboard:2.1.0 container_name: dashboard restart: unless-stopped logging: *default-logging From aa0a91472bbe40fb85bcab0625a6b7fb5b1cfcc6 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Mon, 1 Aug 2022 13:48:58 +0200 Subject: [PATCH 49/86] use skynetlabs/skyd:1.6.2 --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8f2ef5af..0d78ab56 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,11 +15,11 @@ networks: services: sia: - build: - context: https://github.com/SkynetLabs/docker-skyd.git#main - dockerfile: scratch/Dockerfile - args: - branch: portal-latest + # uncomment "build" and comment out "image" to build from sources + # build: + # context: https://github.com/SkynetLabs/docker-skyd.git#main + # dockerfile: scratch/Dockerfile + image: skynetlabs/skyd:1.6.2 command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia restart: unless-stopped From a7c18b85c154174c7eaf2323002769af59737b49 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Mon, 1 Aug 2022 16:52:32 +0200 Subject: [PATCH 50/86] use skynetlabs/skyd:1.6.3 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0d78ab56..776461d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: # build: # context: https://github.com/SkynetLabs/docker-skyd.git#main # dockerfile: scratch/Dockerfile - image: skynetlabs/skyd:1.6.2 + image: skynetlabs/skyd:1.6.3 command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia restart: unless-stopped From 63465b930ebb98c176dc958831bc0cca636cf9b9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 21:02:43 +0000 Subject: [PATCH 51/86] chore(deps): update jaegertracing to v1.37.0 --- docker-compose.jaeger.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index 740da435..ac050923 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -21,7 +21,7 @@ services: - JAEGER_REPORTER_LOG_SPANS=false jaeger-agent: - image: jaegertracing/jaeger-agent:1.36.0 + image: jaegertracing/jaeger-agent:1.37.0 command: [ "--reporter.grpc.host-port=jaeger-collector:14250", @@ -43,7 +43,7 @@ services: - jaeger-collector jaeger-collector: - image: jaegertracing/jaeger-collector:1.36.0 + image: jaegertracing/jaeger-collector:1.37.0 entrypoint: /wait_to_start.sh container_name: jaeger-collector restart: on-failure @@ -68,7 +68,7 @@ services: - elasticsearch jaeger-query: - image: jaegertracing/jaeger-query:1.36.0 + image: jaegertracing/jaeger-query:1.37.0 entrypoint: /wait_to_start.sh container_name: jaeger-query restart: on-failure From c8ff1fb7f4791eb4f75ff98978c278a395dc69c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Fri, 5 Aug 2022 16:14:20 +0200 Subject: [PATCH 52/86] bump to v1.6.4 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 776461d4..6cf26660 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: # build: # context: https://github.com/SkynetLabs/docker-skyd.git#main # dockerfile: scratch/Dockerfile - image: skynetlabs/skyd:1.6.3 + image: skynetlabs/skyd:1.6.4 command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia restart: unless-stopped From d85f24428b7817ca1adbbcea9c712bd92c423134 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 14:24:13 +0000 Subject: [PATCH 53/86] chore(deps): update dependency skynetlabs/webportal-dnslink-api to v0.1.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 25c4209c..75b5f3f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -164,7 +164,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-dnslink-api.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-dnslink-api:0.1.1 + image: skynetlabs/webportal-dnslink-api:0.1.2 container_name: dnslink-api restart: unless-stopped logging: *default-logging From 7a34fc914db94d2732c30835f654d67a53af67ce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 14:24:20 +0000 Subject: [PATCH 54/86] chore(deps): update dependency skynetlabs/pinner to v0.6.0 --- 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 00948f1e..f50e998a 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.5.0 + image: skynetlabs/pinner:0.6.0 container_name: pinner restart: unless-stopped logging: *default-logging From 43d1da72fbfc27a70335fc35f889db48b3f528a1 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 9 Aug 2022 10:23:04 +0200 Subject: [PATCH 55/86] add args to skyd service example --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 75b5f3f6..b0362744 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,8 @@ services: # build: # context: https://github.com/SkynetLabs/docker-skyd.git#main # dockerfile: scratch/Dockerfile + # args: + # branch: master image: skynetlabs/skyd:1.6.4 command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia From 1b1ecb2c117eadeca9331336b078faa15f65d666 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 11:38:19 +0000 Subject: [PATCH 56/86] chore(deps): update dependency skynetlabs/webportal-nginx to v0.5.1 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index b0362744..f3c00815 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -78,7 +78,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-nginx.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-nginx:0.5.0 + image: skynetlabs/webportal-nginx:0.5.1 container_name: nginx restart: unless-stopped logging: *default-logging From 0a26516bdff050bde36f1865797ee4222b1fe7b9 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 9 Aug 2022 14:23:06 +0200 Subject: [PATCH 57/86] remove outdated blocklist scripts --- scripts/README.md | 4 - scripts/blocklist-skylink.sh | 49 --------- setup-scripts/README.md | 5 +- setup-scripts/blocklist-airtable.py | 161 ---------------------------- setup-scripts/support/crontab | 1 - 5 files changed, 1 insertion(+), 219 deletions(-) delete mode 100755 scripts/blocklist-skylink.sh delete mode 100755 setup-scripts/blocklist-airtable.py diff --git a/scripts/README.md b/scripts/README.md index e7b909b4..2bc32fbd 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -4,10 +4,6 @@ This package contains useful scripts for managing a Skynet Webportal. ## Available Scripts -**blocklist-skylink.sh**\ -The `blocklist-skylink.sh` script adds a skylink to the blocklist on all -servers. - **maintenance-upgrade.sh**\ The `maintenance-upgrade.sh` script upgrades the docker images for nodes on a maintenance server. diff --git a/scripts/blocklist-skylink.sh b/scripts/blocklist-skylink.sh deleted file mode 100755 index cb60bbdb..00000000 --- a/scripts/blocklist-skylink.sh +++ /dev/null @@ -1,49 +0,0 @@ -#! /usr/bin/env bash - -# This script is for manual skylink blocking. It accepts either a single -# skylink or a file containing list of skylinks. The script is intented -# for manual use and it should be run locally on each skynet webportal server. -# The automatic script that is used to continuously sync an Airtable sheet -# list with the blocklist on the web portals is /setup-scripts/blocklist-airtable.py - -set -e # exit on first error - -if [ -z "$1" ]; then - echo "Please provide either a skylink or a file with skylinks separated by new lines" && exit 1 -fi - -######################################################### -# read either a file containing skylinks separated by new -# lines or a single skylink and put them in an array -######################################################### -skylinks=() -if test -f "$1"; then - line_number=1 - - # Read file including the last line even when it doesn't end with newline - while IFS="" read -r line || [ -n "$line" ]; - do - if [[ $line =~ (^[a-zA-Z0-9_-]{46}$) ]]; then - skylinks+=("$line") - else - echo "Incorrect skylink at line ${line_number}: $line" && exit 1 - fi - let line_number+=1 - done < $1; -else - skylinks=("$1") # just single skylink passed as input argument -fi - -# get local skyd ip adress -ipaddress=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia) - -# get sia api password either from env variable if exists or from apipassword file in sia-data directory -apipassword=$(docker exec sia sh -c '[ ! -z "${SIA_API_PASSWORD}" ] && echo ${SIA_API_PASSWORD} || $(cat /sia-data/apipassword | tr -d '\n')') - -# iterate over provided skylinks and block them one by one -for skylink in "${skylinks[@]}"; do - echo "> Blocking ${skylink} ... " - - # POST /skynet/blocklist always returns 200 and in case of failure print error message - curl -A Sia-Agent -u "":${apipassword} --data "{\"add\":[\"$skylink\"]}" "http://${ipaddress}:9980/skynet/blocklist" -done diff --git a/setup-scripts/README.md b/setup-scripts/README.md index d5237e09..6fba56b1 100644 --- a/setup-scripts/README.md +++ b/setup-scripts/README.md @@ -1,8 +1,6 @@ # Skynet Portal Setup Scripts -> :warning: This documentation is outdated and should be used for reference -only. Portal setup documentation is located at -https://portal-docs.skynetlabs.com/. +> :warning: This documentation is outdated and should be used for reference only. Portal setup documentation is located at https://portal-docs.skynetlabs.com/. This directory contains a setup guide and scripts that will install and configure some basic requirements for running a Skynet Portal. The assumption is @@ -35,7 +33,6 @@ You may want to fork this repository and replace ssh keys in - [funds-checker](funds-checker.py): script that checks wallet balance and sends status messages to discord periodically - [health-checker](health-checker.py): script that monitors health-check service for server health issues and reports them to discord periodically - [log-checker](log-checker.py): script that scans siad logs for critical errors and reports them to discord periodically -- [blocklist-skylink](../scripts/blocklist-skylink.sh): script that can be run locally from a machine that has access to all your skynet portal servers that blocklists provided skylink and prunes nginx cache to ensure it's not available any more (that is a bit much but that's the best we can do right now without paid nginx version) - if you want to use it, make sure to adjust the server addresses ### Step 1: setting up server user diff --git a/setup-scripts/blocklist-airtable.py b/setup-scripts/blocklist-airtable.py deleted file mode 100755 index 8bd9d2dc..00000000 --- a/setup-scripts/blocklist-airtable.py +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/env python3 - -from bot_utils import get_api_password, setup, send_msg -from random import randint -from time import sleep - -import traceback -import os -import sys -import asyncio -import requests -import json - -from requests.auth import HTTPBasicAuth - -setup() - - -AIRTABLE_API_KEY = os.getenv("AIRTABLE_API_KEY") -AIRTABLE_BASE = os.getenv("AIRTABLE_BASE") -AIRTABLE_TABLE = os.getenv("AIRTABLE_TABLE") -AIRTABLE_FIELD = os.getenv("AIRTABLE_FIELD") - -# Check environment variables are defined -for value in [AIRTABLE_API_KEY, AIRTABLE_BASE, AIRTABLE_TABLE, AIRTABLE_FIELD]: - if not value: - sys.exit("Configuration error: Missing AirTable environment variable.") - - -async def run_checks(): - try: - await block_skylinks_from_airtable() - except: # catch all exceptions - trace = traceback.format_exc() - await send_msg("```\n{}\n```".format(trace), force_notify=True) - - -def exec(command): - return os.popen(command).read().strip() - - -async def block_skylinks_from_airtable(): - # Get sia IP before doing anything else. If this step fails we don't - # need to continue with the execution of the script. - ipaddress = exec( - "docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia" - ) - - if ipaddress == "": - print("Skyd IP could not be detected. Exiting.") - return - - print("Pulling blocked skylinks from Airtable via api integration") - headers = {"Authorization": "Bearer " + AIRTABLE_API_KEY} - skylinks = [] - offset = None - retry = 0 - while len(skylinks) == 0 or offset: - print( - "Requesting a batch of records from Airtable with " - + (offset if offset else "empty") - + " offset" - + (" (retry " + str(retry) + ")" if retry else "") - ) - query = "&".join( - ["fields%5B%5D=" + AIRTABLE_FIELD, ("offset=" + offset) if offset else ""] - ) - response = requests.get( - "https://api.airtable.com/v0/" - + AIRTABLE_BASE - + "/" - + AIRTABLE_TABLE - + "?" - + query, - headers=headers, - ) - - # rate limited - sleep for 2-10 secs and retry (up to 100 times, ~10 minutes) - # https://support.airtable.com/hc/en-us/articles/203313985-Public-REST-API - # > 5 requests per second, per base - if response.status_code == 429: - if retry < 100: - retry = retry + 1 - sleep(randint(1, 10)) - continue - else: - return await send_msg( - "Airtable: too many retries, aborting!", force_notify=True - ) - retry = 0 # reset retry counter - - if response.status_code != 200: - status_code = str(response.status_code) - response_text = response.text or "empty response" - message = ( - "Airtable blocklist integration responded with code " - + status_code - + ": " - + response_text - ) - return await send_msg(message, force_notify=False) - - data = response.json() - - if len(data["records"]) == 0: - return print( - "Airtable returned 0 records - make sure your configuration is correct" - ) - - skylinks = skylinks + [ - entry["fields"].get(AIRTABLE_FIELD, "") for entry in data["records"] - ] - skylinks = [ - skylink.strip() for skylink in skylinks if skylink - ] # filter empty skylinks, most likely empty rows, trim whitespace - - offset = data.get("offset") - - print( - "Sending /skynet/blocklist request with " - + str(len(skylinks)) - + " skylinks to siad" - ) - response = requests.post( - "http://" + ipaddress + ":9980/skynet/blocklist", - data=json.dumps({"add": skylinks}), - headers={"User-Agent": "Sia-Agent"}, - auth=HTTPBasicAuth("", get_api_password()), - ) - - if response.status_code != 200: - status_code = str(response.status_code) - response_text = response.text or "empty response" - message = ( - "Airtable blocklist request responded with code " - + status_code - + ": " - + response_text - ) - return await send_msg(message, force_notify=False) - - response_json = json.loads(response.text) - invalid_skylinks = response_json["invalids"] - - if invalid_skylinks is None: - return await send_msg("Blocklist successfully updated all skylinks") - return await send_msg( - "Blocklist responded ok but failed to update " - + str(len(invalid_skylinks)) - + " skylinks: " - + json.dumps(invalid_skylinks) - ) - - -loop = asyncio.get_event_loop() -loop.run_until_complete(run_checks()) - -# --- BASH EQUIVALENT -# skylinks=$(curl "https://api.airtable.com/v0/${AIRTABLE_BASE}/${AIRTABLE_TABLE}?fields%5B%5D=${AIRTABLE_FIELD}" -H "Authorization: Bearer ${AIRTABLE_KEY}" | python3 -c "import sys, json; print('[\"' + '\",\"'.join([entry['fields']['Link'] for entry in json.load(sys.stdin)['records']]) + '\"]')") -# ipaddress=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia) -# curl --data "{\"add\" : ${skylinks}}" "${ipaddress}:8000/skynet/blocklist" diff --git a/setup-scripts/support/crontab b/setup-scripts/support/crontab index 7fffdfb9..e8909134 100644 --- a/setup-scripts/support/crontab +++ b/setup-scripts/support/crontab @@ -1,7 +1,6 @@ 0 0,8,16 * * * /home/user/skynet-webportal/setup-scripts/funds-checker.py /home/user/skynet-webportal/.env 0 0,8,16 * * * /home/user/skynet-webportal/setup-scripts/log-checker.py /home/user/skynet-webportal/.env sia 8 0 * * * * /home/user/skynet-webportal/setup-scripts/health-checker.py /home/user/skynet-webportal/.env sia 1 -30 */4 * * * /home/user/skynet-webportal/setup-scripts/blocklist-airtable.py /home/user/skynet-webportal/.env 44 5 * * * /home/user/skynet-webportal/scripts/backup-aws-s3.sh 1>>/home/user/skynet-webportal/logs/backup-aws-s3.log 2>>/home/user/skynet-webportal/logs/backup-aws-s3.log 6 13 * * * /home/user/skynet-webportal/scripts/db_backup.sh 1>>/home/user/skynet-webportal/logs/db_backup.log 2>>/home/user/skynet-webportal/logs/db_backup.log 0 5 * * * /home/user/skynet-webportal/scripts/es_cleaner.py 1 http://localhost:9200 From 9e1a8600a5f458309f26dfd0bef1ed3b1d82a334 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 9 Aug 2022 15:05:11 +0200 Subject: [PATCH 58/86] Revert "remove outdated blocklist scripts" This reverts commit 0a26516bdff050bde36f1865797ee4222b1fe7b9. --- scripts/README.md | 4 + scripts/blocklist-skylink.sh | 49 +++++++++ setup-scripts/README.md | 5 +- setup-scripts/blocklist-airtable.py | 161 ++++++++++++++++++++++++++++ setup-scripts/support/crontab | 1 + 5 files changed, 219 insertions(+), 1 deletion(-) create mode 100755 scripts/blocklist-skylink.sh create mode 100755 setup-scripts/blocklist-airtable.py diff --git a/scripts/README.md b/scripts/README.md index 2bc32fbd..e7b909b4 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -4,6 +4,10 @@ This package contains useful scripts for managing a Skynet Webportal. ## Available Scripts +**blocklist-skylink.sh**\ +The `blocklist-skylink.sh` script adds a skylink to the blocklist on all +servers. + **maintenance-upgrade.sh**\ The `maintenance-upgrade.sh` script upgrades the docker images for nodes on a maintenance server. diff --git a/scripts/blocklist-skylink.sh b/scripts/blocklist-skylink.sh new file mode 100755 index 00000000..cb60bbdb --- /dev/null +++ b/scripts/blocklist-skylink.sh @@ -0,0 +1,49 @@ +#! /usr/bin/env bash + +# This script is for manual skylink blocking. It accepts either a single +# skylink or a file containing list of skylinks. The script is intented +# for manual use and it should be run locally on each skynet webportal server. +# The automatic script that is used to continuously sync an Airtable sheet +# list with the blocklist on the web portals is /setup-scripts/blocklist-airtable.py + +set -e # exit on first error + +if [ -z "$1" ]; then + echo "Please provide either a skylink or a file with skylinks separated by new lines" && exit 1 +fi + +######################################################### +# read either a file containing skylinks separated by new +# lines or a single skylink and put them in an array +######################################################### +skylinks=() +if test -f "$1"; then + line_number=1 + + # Read file including the last line even when it doesn't end with newline + while IFS="" read -r line || [ -n "$line" ]; + do + if [[ $line =~ (^[a-zA-Z0-9_-]{46}$) ]]; then + skylinks+=("$line") + else + echo "Incorrect skylink at line ${line_number}: $line" && exit 1 + fi + let line_number+=1 + done < $1; +else + skylinks=("$1") # just single skylink passed as input argument +fi + +# get local skyd ip adress +ipaddress=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia) + +# get sia api password either from env variable if exists or from apipassword file in sia-data directory +apipassword=$(docker exec sia sh -c '[ ! -z "${SIA_API_PASSWORD}" ] && echo ${SIA_API_PASSWORD} || $(cat /sia-data/apipassword | tr -d '\n')') + +# iterate over provided skylinks and block them one by one +for skylink in "${skylinks[@]}"; do + echo "> Blocking ${skylink} ... " + + # POST /skynet/blocklist always returns 200 and in case of failure print error message + curl -A Sia-Agent -u "":${apipassword} --data "{\"add\":[\"$skylink\"]}" "http://${ipaddress}:9980/skynet/blocklist" +done diff --git a/setup-scripts/README.md b/setup-scripts/README.md index 6fba56b1..d5237e09 100644 --- a/setup-scripts/README.md +++ b/setup-scripts/README.md @@ -1,6 +1,8 @@ # Skynet Portal Setup Scripts -> :warning: This documentation is outdated and should be used for reference only. Portal setup documentation is located at https://portal-docs.skynetlabs.com/. +> :warning: This documentation is outdated and should be used for reference +only. Portal setup documentation is located at +https://portal-docs.skynetlabs.com/. This directory contains a setup guide and scripts that will install and configure some basic requirements for running a Skynet Portal. The assumption is @@ -33,6 +35,7 @@ You may want to fork this repository and replace ssh keys in - [funds-checker](funds-checker.py): script that checks wallet balance and sends status messages to discord periodically - [health-checker](health-checker.py): script that monitors health-check service for server health issues and reports them to discord periodically - [log-checker](log-checker.py): script that scans siad logs for critical errors and reports them to discord periodically +- [blocklist-skylink](../scripts/blocklist-skylink.sh): script that can be run locally from a machine that has access to all your skynet portal servers that blocklists provided skylink and prunes nginx cache to ensure it's not available any more (that is a bit much but that's the best we can do right now without paid nginx version) - if you want to use it, make sure to adjust the server addresses ### Step 1: setting up server user diff --git a/setup-scripts/blocklist-airtable.py b/setup-scripts/blocklist-airtable.py new file mode 100755 index 00000000..8bd9d2dc --- /dev/null +++ b/setup-scripts/blocklist-airtable.py @@ -0,0 +1,161 @@ +#!/usr/bin/env python3 + +from bot_utils import get_api_password, setup, send_msg +from random import randint +from time import sleep + +import traceback +import os +import sys +import asyncio +import requests +import json + +from requests.auth import HTTPBasicAuth + +setup() + + +AIRTABLE_API_KEY = os.getenv("AIRTABLE_API_KEY") +AIRTABLE_BASE = os.getenv("AIRTABLE_BASE") +AIRTABLE_TABLE = os.getenv("AIRTABLE_TABLE") +AIRTABLE_FIELD = os.getenv("AIRTABLE_FIELD") + +# Check environment variables are defined +for value in [AIRTABLE_API_KEY, AIRTABLE_BASE, AIRTABLE_TABLE, AIRTABLE_FIELD]: + if not value: + sys.exit("Configuration error: Missing AirTable environment variable.") + + +async def run_checks(): + try: + await block_skylinks_from_airtable() + except: # catch all exceptions + trace = traceback.format_exc() + await send_msg("```\n{}\n```".format(trace), force_notify=True) + + +def exec(command): + return os.popen(command).read().strip() + + +async def block_skylinks_from_airtable(): + # Get sia IP before doing anything else. If this step fails we don't + # need to continue with the execution of the script. + ipaddress = exec( + "docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia" + ) + + if ipaddress == "": + print("Skyd IP could not be detected. Exiting.") + return + + print("Pulling blocked skylinks from Airtable via api integration") + headers = {"Authorization": "Bearer " + AIRTABLE_API_KEY} + skylinks = [] + offset = None + retry = 0 + while len(skylinks) == 0 or offset: + print( + "Requesting a batch of records from Airtable with " + + (offset if offset else "empty") + + " offset" + + (" (retry " + str(retry) + ")" if retry else "") + ) + query = "&".join( + ["fields%5B%5D=" + AIRTABLE_FIELD, ("offset=" + offset) if offset else ""] + ) + response = requests.get( + "https://api.airtable.com/v0/" + + AIRTABLE_BASE + + "/" + + AIRTABLE_TABLE + + "?" + + query, + headers=headers, + ) + + # rate limited - sleep for 2-10 secs and retry (up to 100 times, ~10 minutes) + # https://support.airtable.com/hc/en-us/articles/203313985-Public-REST-API + # > 5 requests per second, per base + if response.status_code == 429: + if retry < 100: + retry = retry + 1 + sleep(randint(1, 10)) + continue + else: + return await send_msg( + "Airtable: too many retries, aborting!", force_notify=True + ) + retry = 0 # reset retry counter + + if response.status_code != 200: + status_code = str(response.status_code) + response_text = response.text or "empty response" + message = ( + "Airtable blocklist integration responded with code " + + status_code + + ": " + + response_text + ) + return await send_msg(message, force_notify=False) + + data = response.json() + + if len(data["records"]) == 0: + return print( + "Airtable returned 0 records - make sure your configuration is correct" + ) + + skylinks = skylinks + [ + entry["fields"].get(AIRTABLE_FIELD, "") for entry in data["records"] + ] + skylinks = [ + skylink.strip() for skylink in skylinks if skylink + ] # filter empty skylinks, most likely empty rows, trim whitespace + + offset = data.get("offset") + + print( + "Sending /skynet/blocklist request with " + + str(len(skylinks)) + + " skylinks to siad" + ) + response = requests.post( + "http://" + ipaddress + ":9980/skynet/blocklist", + data=json.dumps({"add": skylinks}), + headers={"User-Agent": "Sia-Agent"}, + auth=HTTPBasicAuth("", get_api_password()), + ) + + if response.status_code != 200: + status_code = str(response.status_code) + response_text = response.text or "empty response" + message = ( + "Airtable blocklist request responded with code " + + status_code + + ": " + + response_text + ) + return await send_msg(message, force_notify=False) + + response_json = json.loads(response.text) + invalid_skylinks = response_json["invalids"] + + if invalid_skylinks is None: + return await send_msg("Blocklist successfully updated all skylinks") + return await send_msg( + "Blocklist responded ok but failed to update " + + str(len(invalid_skylinks)) + + " skylinks: " + + json.dumps(invalid_skylinks) + ) + + +loop = asyncio.get_event_loop() +loop.run_until_complete(run_checks()) + +# --- BASH EQUIVALENT +# skylinks=$(curl "https://api.airtable.com/v0/${AIRTABLE_BASE}/${AIRTABLE_TABLE}?fields%5B%5D=${AIRTABLE_FIELD}" -H "Authorization: Bearer ${AIRTABLE_KEY}" | python3 -c "import sys, json; print('[\"' + '\",\"'.join([entry['fields']['Link'] for entry in json.load(sys.stdin)['records']]) + '\"]')") +# ipaddress=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia) +# curl --data "{\"add\" : ${skylinks}}" "${ipaddress}:8000/skynet/blocklist" diff --git a/setup-scripts/support/crontab b/setup-scripts/support/crontab index e8909134..7fffdfb9 100644 --- a/setup-scripts/support/crontab +++ b/setup-scripts/support/crontab @@ -1,6 +1,7 @@ 0 0,8,16 * * * /home/user/skynet-webportal/setup-scripts/funds-checker.py /home/user/skynet-webportal/.env 0 0,8,16 * * * /home/user/skynet-webportal/setup-scripts/log-checker.py /home/user/skynet-webportal/.env sia 8 0 * * * * /home/user/skynet-webportal/setup-scripts/health-checker.py /home/user/skynet-webportal/.env sia 1 +30 */4 * * * /home/user/skynet-webportal/setup-scripts/blocklist-airtable.py /home/user/skynet-webportal/.env 44 5 * * * /home/user/skynet-webportal/scripts/backup-aws-s3.sh 1>>/home/user/skynet-webportal/logs/backup-aws-s3.log 2>>/home/user/skynet-webportal/logs/backup-aws-s3.log 6 13 * * * /home/user/skynet-webportal/scripts/db_backup.sh 1>>/home/user/skynet-webportal/logs/db_backup.log 2>>/home/user/skynet-webportal/logs/db_backup.log 0 5 * * * /home/user/skynet-webportal/scripts/es_cleaner.py 1 http://localhost:9200 From e53a8ba46a4bf98120fd7fd1265e7966bfffb4a0 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 9 Aug 2022 15:06:20 +0200 Subject: [PATCH 59/86] remove airtable blocklist scripts --- scripts/blocklist-skylink.sh | 2 - setup-scripts/blocklist-airtable.py | 161 ---------------------------- setup-scripts/support/crontab | 1 - 3 files changed, 164 deletions(-) delete mode 100755 setup-scripts/blocklist-airtable.py diff --git a/scripts/blocklist-skylink.sh b/scripts/blocklist-skylink.sh index cb60bbdb..385e7c2e 100755 --- a/scripts/blocklist-skylink.sh +++ b/scripts/blocklist-skylink.sh @@ -3,8 +3,6 @@ # This script is for manual skylink blocking. It accepts either a single # skylink or a file containing list of skylinks. The script is intented # for manual use and it should be run locally on each skynet webportal server. -# The automatic script that is used to continuously sync an Airtable sheet -# list with the blocklist on the web portals is /setup-scripts/blocklist-airtable.py set -e # exit on first error diff --git a/setup-scripts/blocklist-airtable.py b/setup-scripts/blocklist-airtable.py deleted file mode 100755 index 8bd9d2dc..00000000 --- a/setup-scripts/blocklist-airtable.py +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/env python3 - -from bot_utils import get_api_password, setup, send_msg -from random import randint -from time import sleep - -import traceback -import os -import sys -import asyncio -import requests -import json - -from requests.auth import HTTPBasicAuth - -setup() - - -AIRTABLE_API_KEY = os.getenv("AIRTABLE_API_KEY") -AIRTABLE_BASE = os.getenv("AIRTABLE_BASE") -AIRTABLE_TABLE = os.getenv("AIRTABLE_TABLE") -AIRTABLE_FIELD = os.getenv("AIRTABLE_FIELD") - -# Check environment variables are defined -for value in [AIRTABLE_API_KEY, AIRTABLE_BASE, AIRTABLE_TABLE, AIRTABLE_FIELD]: - if not value: - sys.exit("Configuration error: Missing AirTable environment variable.") - - -async def run_checks(): - try: - await block_skylinks_from_airtable() - except: # catch all exceptions - trace = traceback.format_exc() - await send_msg("```\n{}\n```".format(trace), force_notify=True) - - -def exec(command): - return os.popen(command).read().strip() - - -async def block_skylinks_from_airtable(): - # Get sia IP before doing anything else. If this step fails we don't - # need to continue with the execution of the script. - ipaddress = exec( - "docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia" - ) - - if ipaddress == "": - print("Skyd IP could not be detected. Exiting.") - return - - print("Pulling blocked skylinks from Airtable via api integration") - headers = {"Authorization": "Bearer " + AIRTABLE_API_KEY} - skylinks = [] - offset = None - retry = 0 - while len(skylinks) == 0 or offset: - print( - "Requesting a batch of records from Airtable with " - + (offset if offset else "empty") - + " offset" - + (" (retry " + str(retry) + ")" if retry else "") - ) - query = "&".join( - ["fields%5B%5D=" + AIRTABLE_FIELD, ("offset=" + offset) if offset else ""] - ) - response = requests.get( - "https://api.airtable.com/v0/" - + AIRTABLE_BASE - + "/" - + AIRTABLE_TABLE - + "?" - + query, - headers=headers, - ) - - # rate limited - sleep for 2-10 secs and retry (up to 100 times, ~10 minutes) - # https://support.airtable.com/hc/en-us/articles/203313985-Public-REST-API - # > 5 requests per second, per base - if response.status_code == 429: - if retry < 100: - retry = retry + 1 - sleep(randint(1, 10)) - continue - else: - return await send_msg( - "Airtable: too many retries, aborting!", force_notify=True - ) - retry = 0 # reset retry counter - - if response.status_code != 200: - status_code = str(response.status_code) - response_text = response.text or "empty response" - message = ( - "Airtable blocklist integration responded with code " - + status_code - + ": " - + response_text - ) - return await send_msg(message, force_notify=False) - - data = response.json() - - if len(data["records"]) == 0: - return print( - "Airtable returned 0 records - make sure your configuration is correct" - ) - - skylinks = skylinks + [ - entry["fields"].get(AIRTABLE_FIELD, "") for entry in data["records"] - ] - skylinks = [ - skylink.strip() for skylink in skylinks if skylink - ] # filter empty skylinks, most likely empty rows, trim whitespace - - offset = data.get("offset") - - print( - "Sending /skynet/blocklist request with " - + str(len(skylinks)) - + " skylinks to siad" - ) - response = requests.post( - "http://" + ipaddress + ":9980/skynet/blocklist", - data=json.dumps({"add": skylinks}), - headers={"User-Agent": "Sia-Agent"}, - auth=HTTPBasicAuth("", get_api_password()), - ) - - if response.status_code != 200: - status_code = str(response.status_code) - response_text = response.text or "empty response" - message = ( - "Airtable blocklist request responded with code " - + status_code - + ": " - + response_text - ) - return await send_msg(message, force_notify=False) - - response_json = json.loads(response.text) - invalid_skylinks = response_json["invalids"] - - if invalid_skylinks is None: - return await send_msg("Blocklist successfully updated all skylinks") - return await send_msg( - "Blocklist responded ok but failed to update " - + str(len(invalid_skylinks)) - + " skylinks: " - + json.dumps(invalid_skylinks) - ) - - -loop = asyncio.get_event_loop() -loop.run_until_complete(run_checks()) - -# --- BASH EQUIVALENT -# skylinks=$(curl "https://api.airtable.com/v0/${AIRTABLE_BASE}/${AIRTABLE_TABLE}?fields%5B%5D=${AIRTABLE_FIELD}" -H "Authorization: Bearer ${AIRTABLE_KEY}" | python3 -c "import sys, json; print('[\"' + '\",\"'.join([entry['fields']['Link'] for entry in json.load(sys.stdin)['records']]) + '\"]')") -# ipaddress=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sia) -# curl --data "{\"add\" : ${skylinks}}" "${ipaddress}:8000/skynet/blocklist" diff --git a/setup-scripts/support/crontab b/setup-scripts/support/crontab index 7fffdfb9..e8909134 100644 --- a/setup-scripts/support/crontab +++ b/setup-scripts/support/crontab @@ -1,7 +1,6 @@ 0 0,8,16 * * * /home/user/skynet-webportal/setup-scripts/funds-checker.py /home/user/skynet-webportal/.env 0 0,8,16 * * * /home/user/skynet-webportal/setup-scripts/log-checker.py /home/user/skynet-webportal/.env sia 8 0 * * * * /home/user/skynet-webportal/setup-scripts/health-checker.py /home/user/skynet-webportal/.env sia 1 -30 */4 * * * /home/user/skynet-webportal/setup-scripts/blocklist-airtable.py /home/user/skynet-webportal/.env 44 5 * * * /home/user/skynet-webportal/scripts/backup-aws-s3.sh 1>>/home/user/skynet-webportal/logs/backup-aws-s3.log 2>>/home/user/skynet-webportal/logs/backup-aws-s3.log 6 13 * * * /home/user/skynet-webportal/scripts/db_backup.sh 1>>/home/user/skynet-webportal/logs/db_backup.log 2>>/home/user/skynet-webportal/logs/db_backup.log 0 5 * * * /home/user/skynet-webportal/scripts/es_cleaner.py 1 http://localhost:9200 From ed8a2e1f1736db326ba955252e16f427a7495d95 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 14:06:38 +0000 Subject: [PATCH 60/86] chore(deps): update dependency skynetlabs/skyd to v1.6.5 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f3c00815..d681e840 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: # dockerfile: scratch/Dockerfile # args: # branch: master - image: skynetlabs/skyd:1.6.4 + image: skynetlabs/skyd:1.6.5 command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia restart: unless-stopped From ad423e9050e1fa40d868f632e254d2335ed49a3d Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 11 Aug 2022 23:13:03 +0200 Subject: [PATCH 61/86] upgrade to 3.8 --- docker-compose.abuse-scanner.yml | 2 +- docker-compose.accounts.yml | 2 +- docker-compose.blocker.yml | 2 +- docker-compose.jaeger.yml | 2 +- docker-compose.malware-scanner.yml | 2 +- docker-compose.mongodb.yml | 2 +- docker-compose.pinner.yml | 2 +- docker-compose.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.abuse-scanner.yml b/docker-compose.abuse-scanner.yml index 9234e563..0f178238 100644 --- a/docker-compose.abuse-scanner.yml +++ b/docker-compose.abuse-scanner.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" x-logging: &default-logging driver: json-file diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index e05d8b1f..80236631 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" x-logging: &default-logging driver: json-file diff --git a/docker-compose.blocker.yml b/docker-compose.blocker.yml index 09d3c835..a407a9e0 100644 --- a/docker-compose.blocker.yml +++ b/docker-compose.blocker.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" x-logging: &default-logging driver: json-file diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index ac050923..71840247 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" x-logging: &default-logging driver: json-file diff --git a/docker-compose.malware-scanner.yml b/docker-compose.malware-scanner.yml index ee3b6700..14f3f4e2 100644 --- a/docker-compose.malware-scanner.yml +++ b/docker-compose.malware-scanner.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" x-logging: &default-logging driver: json-file diff --git a/docker-compose.mongodb.yml b/docker-compose.mongodb.yml index 898365a4..58eff676 100644 --- a/docker-compose.mongodb.yml +++ b/docker-compose.mongodb.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" x-logging: &default-logging driver: json-file diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml index f50e998a..f25c218e 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" x-logging: &default-logging driver: json-file diff --git a/docker-compose.yml b/docker-compose.yml index d681e840..9dfd56d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" x-logging: &default-logging driver: json-file From 747bc1659a7fddc2bdf9a3b5de8f2bdd99856e8d Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 11 Aug 2022 23:29:27 +0200 Subject: [PATCH 62/86] allow relative call to dc script --- dc | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dc b/dc index de8f9e9a..5237ba48 100755 --- a/dc +++ b/dc @@ -5,56 +5,59 @@ # would use docker-compose with the only difference being that you don't need to specify compose files. For more # information you can run `./dc` or `./dc help`. -if [ -f .env ]; then +# get current working directory of this script +cwd="$(dirname -- "$0";)"; + +if [ -f ${cwd}/.env ]; then OLD_IFS=$IFS IFS=$'\n' - for x in $(grep -v '^#.*' .env); do export $x; done + for x in $(grep -v '^#.*' ${cwd}/.env); do export $x; done IFS=$OLD_IFS fi # include base docker compose file -COMPOSE_FILES="-f docker-compose.yml" +COMPOSE_FILES="-f ${cwd}/docker-compose.yml" for i in $(seq 1 ${#PORTAL_MODULES}); do # accounts module - alias "a" if [[ ${PORTAL_MODULES:i-1:1} == "a" ]]; then - COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.accounts.yml" + COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.accounts.yml" fi # blocker module - alias "b" if [[ ${PORTAL_MODULES:i-1:1} == "b" ]]; then - COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml" + COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.blocker.yml" fi # jaeger module - alias "j" if [[ ${PORTAL_MODULES:i-1:1} == "j" ]]; then - COMPOSE_FILES+=" -f docker-compose.jaeger.yml" + COMPOSE_FILES+=" -f ${cwd}/docker-compose.jaeger.yml" fi # malware-scanner module - alias "s" if [[ ${PORTAL_MODULES:i-1:1} == "s" ]]; then - COMPOSE_FILES+=" -f docker-compose.blocker.yml -f docker-compose.mongodb.yml -f docker-compose.malware-scanner.yml" + COMPOSE_FILES+=" -f ${cwd}/docker-compose.blocker.yml -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.malware-scanner.yml" fi # mongodb module - alias "m" if [[ ${PORTAL_MODULES:i-1:1} == "m" ]]; then - COMPOSE_FILES+=" -f docker-compose.mongodb.yml" + COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml" fi # abuse-scanner module - alias "u" 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" + COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.blocker.yml -f ${cwd}/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" + COMPOSE_FILES+=" -f ${cwd}/docker-compose.mongodb.yml -f ${cwd}/docker-compose.pinner.yml" fi done # override file if exists if [[ -f docker-compose.override.yml ]]; then - COMPOSE_FILES+=" -f docker-compose.override.yml" + COMPOSE_FILES+=" -f ${cwd}/docker-compose.override.yml" fi docker-compose $COMPOSE_FILES $@ From 063f0b0b7bcf483553fa2dc88e6e351ea631598b Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 12 Aug 2022 21:06:04 +0200 Subject: [PATCH 63/86] simplify script and add more information --- dc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dc b/dc index 5237ba48..7b2f6030 100755 --- a/dc +++ b/dc @@ -5,15 +5,13 @@ # would use docker-compose with the only difference being that you don't need to specify compose files. For more # information you can run `./dc` or `./dc help`. -# get current working directory of this script +# get current working directory of this script and prefix all files with it to +# be able to call this script from anywhere and not only root directory of +# skynet-webportal project cwd="$(dirname -- "$0";)"; -if [ -f ${cwd}/.env ]; then - OLD_IFS=$IFS - IFS=$'\n' - for x in $(grep -v '^#.*' ${cwd}/.env); do export $x; done - IFS=$OLD_IFS -fi +# get portal modules configuration from .env file (if defined more than once, the last one is used) +PORTAL_MODULES=$(grep -e "^PORTAL_MODULES=" ${cwd}.env | tail -1 | sed "s/PORTAL_MODULES=//") # include base docker compose file COMPOSE_FILES="-f ${cwd}/docker-compose.yml" From 350d2e30faeb542d1072aa42a8e1fa2f132f2e3d Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Mon, 15 Aug 2022 20:04:51 +0200 Subject: [PATCH 64/86] New pinner version. --- 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 f25c218e..037c9d62 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.6.0 + image: skynetlabs/pinner:0.7.0 container_name: pinner restart: unless-stopped logging: *default-logging From ab4468ebf5a603bcc74f7c8e0eda919cf8b80201 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Tue, 16 Aug 2022 10:12:11 +0200 Subject: [PATCH 65/86] Fix the path at which `dc` looks for `.env`. --- dc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dc b/dc index 7b2f6030..6f7a9d49 100755 --- a/dc +++ b/dc @@ -11,7 +11,7 @@ cwd="$(dirname -- "$0";)"; # get portal modules configuration from .env file (if defined more than once, the last one is used) -PORTAL_MODULES=$(grep -e "^PORTAL_MODULES=" ${cwd}.env | tail -1 | sed "s/PORTAL_MODULES=//") +PORTAL_MODULES=$(grep -e "^PORTAL_MODULES=" ${cwd}/.env | tail -1 | sed "s/PORTAL_MODULES=//") # include base docker compose file COMPOSE_FILES="-f ${cwd}/docker-compose.yml" From 169ca25d67ae492a2458f34f8975641972e9bee2 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 16 Aug 2022 10:36:54 +0200 Subject: [PATCH 66/86] do not report from dc when env file does not exist --- dc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dc b/dc index 6f7a9d49..b07b06ef 100755 --- a/dc +++ b/dc @@ -11,7 +11,9 @@ cwd="$(dirname -- "$0";)"; # get portal modules configuration from .env file (if defined more than once, the last one is used) -PORTAL_MODULES=$(grep -e "^PORTAL_MODULES=" ${cwd}/.env | tail -1 | sed "s/PORTAL_MODULES=//") +if [[ -f "${cwd}/.env" ]]; then + PORTAL_MODULES=$(grep -e "^PORTAL_MODULES=" ${cwd}/.env | tail -1 | sed "s/PORTAL_MODULES=//") +fi # include base docker compose file COMPOSE_FILES="-f ${cwd}/docker-compose.yml" From 8414d9b793bf4f1005f26d9971b50ce0eaf10b3c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Aug 2022 15:12:37 +0000 Subject: [PATCH 67/86] chore(deps): update skynetlabs/webportal-health-check docker tag to v0.4.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9dfd56d3..86281d66 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-health-check.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-health-check:0.3.0 + image: skynetlabs/webportal-health-check:0.4.0 container_name: health-check restart: unless-stopped logging: *default-logging From 36d65fadc8f5486ddc7c66b89fb5f34353915b35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Aug 2022 15:25:26 +0000 Subject: [PATCH 68/86] chore(deps): update skynetlabs/pinner docker tag to v0.7.1 --- 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 037c9d62..c25e15c2 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.7.0 + image: skynetlabs/pinner:0.7.1 container_name: pinner restart: unless-stopped logging: *default-logging From 61e9d3170d763c1029a7d8f792dbc6a3c26e4b3d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Aug 2022 15:43:16 +0000 Subject: [PATCH 69/86] chore(deps): update skynetlabs/skyd docker tag to v1.6.6 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 86281d66..20cf95cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: # dockerfile: scratch/Dockerfile # args: # branch: master - image: skynetlabs/skyd:1.6.5 + image: skynetlabs/skyd:1.6.6 command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia restart: unless-stopped From ffd9af803a3006de1ccab1256c4b30c48b953d4b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 17:21:19 +0000 Subject: [PATCH 70/86] chore(deps): update skynetlabs/webportal-handshake-api docker tag to v0.1.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 20cf95cb..ea22c1de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -142,7 +142,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-handshake-api.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-handshake-api:0.1.1 + image: skynetlabs/webportal-handshake-api:0.1.2 container_name: handshake-api restart: unless-stopped logging: *default-logging From d1e0ee0fe602ab6286d0e7dcbe4b7fdafa403dbc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 17:21:24 +0000 Subject: [PATCH 71/86] chore(deps): update skynetlabs/webportal-health-check docker tag to v0.5.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 20cf95cb..d9a1c4ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-health-check.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-health-check:0.4.0 + image: skynetlabs/webportal-health-check:0.5.0 container_name: health-check restart: unless-stopped logging: *default-logging From d24edc4285b2102d52fe88efef9483916b9ad2f6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Aug 2022 01:41:23 +0000 Subject: [PATCH 72/86] chore(deps): update mongo docker tag to v4.4.16 --- docker-compose.mongodb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.mongodb.yml b/docker-compose.mongodb.yml index 58eff676..80f86522 100644 --- a/docker-compose.mongodb.yml +++ b/docker-compose.mongodb.yml @@ -14,7 +14,7 @@ services: - MONGODB_PASSWORD=${SKYNET_DB_PASS} mongo: - image: mongo:4.4.15 + image: mongo:4.4.16 command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet} --setParameter ShardingTaskExecutorPoolMinSize=10 container_name: mongo restart: unless-stopped From 89f7b96d5e2a9b02ef0b47ccab99dd46c159e480 Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Mon, 22 Aug 2022 12:09:43 +0200 Subject: [PATCH 73/86] Replace our in-house Jaeger cleanup script with their own container that does that. --- scripts/es_cleaner.py | 164 ---------------------------------- setup-scripts/support/crontab | 2 +- 2 files changed, 1 insertion(+), 165 deletions(-) delete mode 100755 scripts/es_cleaner.py diff --git a/scripts/es_cleaner.py b/scripts/es_cleaner.py deleted file mode 100755 index 48f2a0f3..00000000 --- a/scripts/es_cleaner.py +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env python3 - -import curator -import elasticsearch -import os -import ssl -import sys - -TIMEOUT = 120 - - -def main(): - if len(sys.argv) != 3: - print( - 'USAGE: [INDEX_PREFIX=(default "")] [ARCHIVE=(default false)] ... {} NUM_OF_DAYS http://HOSTNAME[:PORT]'.format( - sys.argv[0] - ) - ) - print( - "NUM_OF_DAYS ... delete indices that are older than the given number of days." - ) - print( - "HOSTNAME ... specifies which Elasticsearch hosts URL to search and delete indices from." - ) - print( - "TIMEOUT ... number of seconds to wait for master node response, default: {}".format( - TIMEOUT - ) - ) - print("INDEX_PREFIX ... specifies index prefix.") - print("INDEX_DATE_SEPARATOR ... specifies index date separator.") - print( - "ARCHIVE ... specifies whether to remove archive indices (only works for rollover) (default false)." - ) - print( - "ROLLOVER ... specifies whether to remove indices created by rollover (default false)." - ) - print("ES_USERNAME ... The username required by Elasticsearch.") - print("ES_PASSWORD ... The password required by Elasticsearch.") - print("ES_TLS ... enable TLS (default false).") - print("ES_TLS_CA ... Path to TLS CA file.") - print("ES_TLS_CERT ... Path to TLS certificate file.") - print("ES_TLS_KEY ... Path to TLS key file.") - print( - "ES_TLS_SKIP_HOST_VERIFY ... (insecure) Skip server's certificate chain and host name verification." - ) - sys.exit(1) - - client = create_client( - os.getenv("ES_USERNAME"), - os.getenv("ES_PASSWORD"), - str2bool(os.getenv("ES_TLS", "false")), - os.getenv("ES_TLS_CA"), - os.getenv("ES_TLS_CERT"), - os.getenv("ES_TLS_KEY"), - str2bool(os.getenv("ES_TLS_SKIP_HOST_VERIFY", "false")), - ) - ilo = curator.IndexList(client) - empty_list(ilo, "Elasticsearch has no indices") - - prefix = os.getenv("INDEX_PREFIX", "") - if prefix != "": - prefix += "-" - separator = os.getenv("INDEX_DATE_SEPARATOR", "-") - - if str2bool(os.getenv("ARCHIVE", "false")): - filter_archive_indices_rollover(ilo, prefix) - else: - if str2bool(os.getenv("ROLLOVER", "false")): - filter_main_indices_rollover(ilo, prefix) - else: - filter_main_indices(ilo, prefix, separator) - - empty_list(ilo, "No indices to delete") - - for index in ilo.working_list(): - print("Removing", index) - timeout = int(os.getenv("TIMEOUT", TIMEOUT)) - delete_indices = curator.DeleteIndices(ilo, master_timeout=timeout) - delete_indices.do_action() - - -def filter_main_indices(ilo, prefix, separator): - date_regex = "\d{4}" + separator + "\d{2}" + separator + "\d{2}" - time_string = "%Y" + separator + "%m" + separator + "%d" - - ilo.filter_by_regex( - kind="regex", value=prefix + "jaeger-(span|service|dependencies)-" + date_regex - ) - empty_list(ilo, "No indices to delete") - # This excludes archive index as we use source='name' - # source `creation_date` would include archive index - ilo.filter_by_age( - source="name", - direction="older", - timestring=time_string, - unit="days", - unit_count=int(sys.argv[1]), - ) - - -def filter_main_indices_rollover(ilo, prefix): - ilo.filter_by_regex(kind="regex", value=prefix + "jaeger-(span|service)-\d{6}") - empty_list(ilo, "No indices to delete") - # do not remove active write indices - ilo.filter_by_alias(aliases=[prefix + "jaeger-span-write"], exclude=True) - empty_list(ilo, "No indices to delete") - ilo.filter_by_alias(aliases=[prefix + "jaeger-service-write"], exclude=True) - empty_list(ilo, "No indices to delete") - ilo.filter_by_age( - source="creation_date", - direction="older", - unit="days", - unit_count=int(sys.argv[1]), - ) - - -def filter_archive_indices_rollover(ilo, prefix): - # Remove only rollover archive indices - # Do not remove active write archive index - ilo.filter_by_regex(kind="regex", value=prefix + "jaeger-span-archive-\d{6}") - empty_list(ilo, "No indices to delete") - ilo.filter_by_alias(aliases=[prefix + "jaeger-span-archive-write"], exclude=True) - empty_list(ilo, "No indices to delete") - ilo.filter_by_age( - source="creation_date", - direction="older", - unit="days", - unit_count=int(sys.argv[1]), - ) - - -def empty_list(ilo, error_msg): - try: - ilo.empty_list_check() - except curator.NoIndices: - print(error_msg) - sys.exit(0) - - -def str2bool(v): - return v.lower() in ("true", "1") - - -def create_client(username, password, tls, ca, cert, key, skipHostVerify): - context = ssl.create_default_context() - if ca is not None: - context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=ca) - elif skipHostVerify: - context.check_hostname = False - context.verify_mode = ssl.CERT_NONE - if username is not None and password is not None: - return elasticsearch.Elasticsearch( - sys.argv[2:], http_auth=(username, password), ssl_context=context - ) - elif tls: - context.load_cert_chain(certfile=cert, keyfile=key) - return elasticsearch.Elasticsearch(sys.argv[2:], ssl_context=context) - else: - return elasticsearch.Elasticsearch(sys.argv[2:], ssl_context=context) - - -if __name__ == "__main__": - main() diff --git a/setup-scripts/support/crontab b/setup-scripts/support/crontab index e8909134..839636a0 100644 --- a/setup-scripts/support/crontab +++ b/setup-scripts/support/crontab @@ -3,4 +3,4 @@ 0 * * * * /home/user/skynet-webportal/setup-scripts/health-checker.py /home/user/skynet-webportal/.env sia 1 44 5 * * * /home/user/skynet-webportal/scripts/backup-aws-s3.sh 1>>/home/user/skynet-webportal/logs/backup-aws-s3.log 2>>/home/user/skynet-webportal/logs/backup-aws-s3.log 6 13 * * * /home/user/skynet-webportal/scripts/db_backup.sh 1>>/home/user/skynet-webportal/logs/db_backup.log 2>>/home/user/skynet-webportal/logs/db_backup.log -0 5 * * * /home/user/skynet-webportal/scripts/es_cleaner.py 1 http://localhost:9200 +0 5 * * * /usr/bin/docker run -it --rm --net=host -e ROLLOVER=true jaegertracing/jaeger-es-index-cleaner:latest 1 http://localhost:9200 From 4a7ea9307632f7d61c37c20bfdf6166756a8dfab Mon Sep 17 00:00:00 2001 From: Ivaylo Novakov Date: Mon, 22 Aug 2022 12:26:54 +0200 Subject: [PATCH 74/86] Cron is not a TTY. --- setup-scripts/support/crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-scripts/support/crontab b/setup-scripts/support/crontab index 839636a0..abcead71 100644 --- a/setup-scripts/support/crontab +++ b/setup-scripts/support/crontab @@ -3,4 +3,4 @@ 0 * * * * /home/user/skynet-webportal/setup-scripts/health-checker.py /home/user/skynet-webportal/.env sia 1 44 5 * * * /home/user/skynet-webportal/scripts/backup-aws-s3.sh 1>>/home/user/skynet-webportal/logs/backup-aws-s3.log 2>>/home/user/skynet-webportal/logs/backup-aws-s3.log 6 13 * * * /home/user/skynet-webportal/scripts/db_backup.sh 1>>/home/user/skynet-webportal/logs/db_backup.log 2>>/home/user/skynet-webportal/logs/db_backup.log -0 5 * * * /usr/bin/docker run -it --rm --net=host -e ROLLOVER=true jaegertracing/jaeger-es-index-cleaner:latest 1 http://localhost:9200 +0 5 * * * /usr/bin/docker run --rm --net=host -e ROLLOVER=true jaegertracing/jaeger-es-index-cleaner:latest 1 http://localhost:9200 From eacdd78cc1d96aae9b98f0c7a7a7c36c20028854 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 15:47:51 +0000 Subject: [PATCH 75/86] chore(deps): update docker.elastic.co/elasticsearch/elasticsearch docker tag to v7.17.6 --- docker-compose.jaeger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index 71840247..e4ec4d76 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -93,7 +93,7 @@ services: - elasticsearch elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6 container_name: elasticsearch restart: on-failure logging: *default-logging From 185fc811fbf32b89593d12ae8d4d8758de769389 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 15:48:04 +0000 Subject: [PATCH 76/86] chore(deps): update skynetlabs/pinner docker tag to v0.7.2 --- 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 c25e15c2..a06e05f7 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.7.1 + image: skynetlabs/pinner:0.7.2 container_name: pinner restart: unless-stopped logging: *default-logging From 0e841cacdac8a3c875719dad1dd87c70e3f917c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 15:48:09 +0000 Subject: [PATCH 77/86] chore(deps): update skynetlabs/webportal-nginx docker tag to v0.5.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 92a01591..450f3ca3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -78,7 +78,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-nginx.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-nginx:0.5.1 + image: skynetlabs/webportal-nginx:0.5.2 container_name: nginx restart: unless-stopped logging: *default-logging From 9964e276fcb93fd1086299df2b6d1ee7dc9df21d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 08:42:26 +0000 Subject: [PATCH 78/86] chore(deps): update skynetlabs/skyd docker tag to v1.6.7 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 450f3ca3..9f67b4bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: # dockerfile: scratch/Dockerfile # args: # branch: master - image: skynetlabs/skyd:1.6.6 + image: skynetlabs/skyd:1.6.7 command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia restart: unless-stopped From 500fb3bfd71649589e3f689099ee133261da56ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 11:35:12 +0000 Subject: [PATCH 79/86] chore(deps): update skynetlabs/pinner docker tag to v0.7.3 --- 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 a06e05f7..69a7a4e9 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.7.2 + image: skynetlabs/pinner:0.7.3 container_name: pinner restart: unless-stopped logging: *default-logging From 739b96cd5ae18245ae17fc894533ca185cb1646c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 14:47:45 +0000 Subject: [PATCH 80/86] chore(deps): update skynetlabs/webportal-website docker tag to v0.2.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9f67b4bc..004a16ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,7 +108,7 @@ services: # build: # context: https://github.com/SkynetLabs/webportal-website.git#main # dockerfile: Dockerfile - image: skynetlabs/webportal-website:0.2.1 + image: skynetlabs/webportal-website:0.2.2 container_name: website restart: unless-stopped logging: *default-logging From 9d728b18550c9084656ae167f2517139cd584b0f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 15:18:37 +0000 Subject: [PATCH 81/86] chore(deps): update skynetlabs/pinner docker tag to v0.7.4 --- 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 69a7a4e9..41fa33e7 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.7.3 + image: skynetlabs/pinner:0.7.4 container_name: pinner restart: unless-stopped logging: *default-logging From 7e0f429ec49bfae66b250f1a52cf6e1182377d55 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 12:05:23 +0000 Subject: [PATCH 82/86] chore(deps): update skynetlabs/pinner docker tag to v0.7.5 --- 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 41fa33e7..a235c8e9 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,7 +10,7 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.7.4 + image: skynetlabs/pinner:0.7.5 container_name: pinner restart: unless-stopped logging: *default-logging From be3db7aa0fef76688bac8d4aed6f9fd7238e907b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 15:41:47 +0000 Subject: [PATCH 83/86] chore(deps): update skynetlabs/skyd docker tag to v1.6.8 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 004a16ae..d5c508c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: # dockerfile: scratch/Dockerfile # args: # branch: master - image: skynetlabs/skyd:1.6.7 + image: skynetlabs/skyd:1.6.8 command: --disable-api-security --api-addr :9980 --modules gctwra container_name: sia restart: unless-stopped From 47175686db1090b58ac9888bea69e4e2a60cc9b0 Mon Sep 17 00:00:00 2001 From: PJ Date: Thu, 1 Sep 2022 12:54:03 +0200 Subject: [PATCH 84/86] Update docker-compose file --- docker-compose.abuse-scanner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.abuse-scanner.yml b/docker-compose.abuse-scanner.yml index 7a99ab81..275766e6 100644 --- a/docker-compose.abuse-scanner.yml +++ b/docker-compose.abuse-scanner.yml @@ -38,4 +38,4 @@ services: - blocker volumes: - /var/run/docker.sock:/var/run/docker.sock - - /tmp/abuse-scanner:/tmp + - /tmp:/tmp From 2de3d03cd0a7e003622fd318e450a67397c8ca9c Mon Sep 17 00:00:00 2001 From: PJ Date: Thu, 1 Sep 2022 14:58:21 +0200 Subject: [PATCH 85/86] Bump image tag --- docker-compose.abuse-scanner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.abuse-scanner.yml b/docker-compose.abuse-scanner.yml index 275766e6..e358f9ba 100644 --- a/docker-compose.abuse-scanner.yml +++ b/docker-compose.abuse-scanner.yml @@ -10,7 +10,7 @@ services: abuse-scanner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/abuse-scanner.git#main - image: skynetlabs/abuse-scanner:0.3.0 + image: skynetlabs/abuse-scanner:0.4.0 container_name: abuse-scanner restart: unless-stopped logging: *default-logging From 88bd55fe641fc0d4bac58a247c95873b1134622e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 20:33:02 +0000 Subject: [PATCH 86/86] chore(deps): update certbot/dns-route53 docker tag to v1.30.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d5c508c1..2b60f0af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,7 +60,7 @@ services: # # make sure that the file has 0400 permissions with: # chmod 0400 ./docker/data/certbot/cloudflare.ini - image: certbot/dns-route53:v1.29.0 + image: certbot/dns-route53:v1.30.0 entrypoint: sh /entrypoint.sh container_name: certbot restart: unless-stopped