Revert "Change how musl is downloaded/unarchived" as the problem is a

Github problem.

This reverts commit 59fab1b137.
This commit is contained in:
Gabe Kangas 2022-08-04 15:18:42 -07:00
parent 59fab1b137
commit c7a35e9d02
No known key found for this signature in database
GPG Key ID: 9A56337728BC81EA
2 changed files with 7 additions and 7 deletions

View File

@ -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

View File

@ -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 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
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" | tar xf - -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
code:
FROM --platform=linux/amd64 +crosscompiler