From 59fab1b137effbb69386de188e1b4b80afe79fc8 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Thu, 4 Aug 2022 14:26:04 -0700 Subject: [PATCH] Change how musl is downloaded/unarchived --- .github/workflows/docker-nightly.yaml | 4 ++-- Earthfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-nightly.yaml b/.github/workflows/docker-nightly.yaml index 171c33491..d825555d9 100644 --- a/.github/workflows/docker-nightly.yaml +++ b/.github/workflows/docker-nightly.yaml @@ -6,7 +6,7 @@ name: Build nightly docker on: workflow_dispatch: schedule: - - cron: '0 2 * * *' + - cron: "0 2 * * *" jobs: Docker: @@ -14,7 +14,7 @@ jobs: steps: - uses: earthly/actions-setup@v1 with: - version: 'latest' # or pin to an specific version, e.g. "v0.6.10" + version: "latest" # or pin to an specific version, e.g. "v0.6.10" - name: Earthly version run: earthly --version diff --git a/Earthfile b/Earthfile index 221cd7d92..cbfb1fef6 100644 --- a/Earthfile +++ b/Earthfile @@ -17,11 +17,11 @@ docker-all: crosscompiler: # This image is missing a few platforms, so we'll add them locally FROM --platform=linux/amd64 bdwyertech/go-crosscompile - RUN apk add --update --no-cache tar gzip >> /dev/null - # RUN curl -sfL "https://musl.cc/armv7l-linux-musleabihf-cross.tgz" | tar xf - -C /usr/ --strip-components=1 - RUN curl -fL "https://musl.cc/armv7l-linux-musleabihf-cross.tgz" -o armv7l-linux-musleabihf-cross.tgz && tar zxf armv7l-linux-musleabihf-cross.tgz -C /usr/ --strip-components=1 - RUN curl -sfL "https://musl.cc/i686-linux-musl-cross.tgz" | tar xf - -C /usr/ --strip-components=1 - RUN curl -sfL "https://musl.cc/x86_64-linux-musl-cross.tgz" | tar zxf - -C /usr/ --strip-components=1 + RUN apk add --update --no-cache wget tar gzip >> /dev/null + RUN curl https://httpbin.org/get + RUN wget "https://musl.cc/armv7l-linux-musleabihf-cross.tgz" && tar zxf armv7l-linux-musleabihf-cross.tgz -C /usr/ --strip-components=1 + RUN wget "https://musl.cc/i686-linux-musl-cross.tgz" && tar zxf i686-linux-musl-cross.tgz -C /usr/ --strip-components=1 + RUN wget "https://musl.cc/x86_64-linux-musl-cross.tgz" && tar zxf x86_64-linux-musl-cross.tgz -C /usr/ --strip-components=1 code: FROM --platform=linux/amd64 +crosscompiler