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.yml b/docker-compose.yml index dced9c07..584c7cf8 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} 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