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 }} 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 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 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 diff --git a/docker-compose.pinner.yml b/docker-compose.pinner.yml index 19bacc5e..ee863911 100644 --- a/docker-compose.pinner.yml +++ b/docker-compose.pinner.yml @@ -10,12 +10,14 @@ services: pinner: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/pinner.git#main - image: skynetlabs/pinner:0.3.1 + image: skynetlabs/pinner:0.4.0 container_name: pinner restart: unless-stopped logging: *default-logging env_file: - .env + volumes: + - ./docker/data/pinner/logs:/logs environment: - PINNER_LOG_LEVEL=${PINNER_LOG_LEVEL:-info} expose: diff --git a/docker-compose.yml b/docker-compose.yml index 9083d9e0..ad3a6828 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,16 +16,16 @@ 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 + 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} @@ -58,7 +58,7 @@ services: # # make sure that the file has 0400 permissions with: # chmod 0400 ./docker/data/certbot/cloudflare.ini - image: certbot/dns-route53:v1.28.0 + image: certbot/dns-route53:v1.29.0 entrypoint: sh /entrypoint.sh container_name: certbot restart: unless-stopped 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 diff --git a/setup-scripts/support/authorized_keys b/setup-scripts/support/authorized_keys index b2848d66..b5132b0d 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-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHptEpqs57lhnHkfa+0SQgXQ4A63/YGV2cNTcGMQW+Jt david@skynetlabs.com