From e273491360d3471521f96a3c3a212485976d72a4 Mon Sep 17 00:00:00 2001 From: Matthew Sevey Date: Sat, 25 Jun 2022 23:48:35 -0400 Subject: [PATCH 01/13] 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 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 02/13] 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 03/13] 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 04/13] 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 05/13] 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 06/13] 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 07/13] 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 08/13] 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 09/13] 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 10/13] 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 11/13] 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 12/13] 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 13/13] 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}