Change how musl is downloaded/unarchived

This commit is contained in:
Gabe Kangas
2022-08-04 14:26:04 -07:00
parent 2402914000
commit 59fab1b137
2 changed files with 7 additions and 7 deletions

View File

@@ -6,7 +6,7 @@ name: Build nightly docker
on: on:
workflow_dispatch: workflow_dispatch:
schedule: schedule:
- cron: '0 2 * * *' - cron: "0 2 * * *"
jobs: jobs:
Docker: Docker:
@@ -14,7 +14,7 @@ jobs:
steps: steps:
- uses: earthly/actions-setup@v1 - uses: earthly/actions-setup@v1
with: 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 - name: Earthly version
run: earthly --version run: earthly --version

View File

@@ -17,11 +17,11 @@ docker-all:
crosscompiler: crosscompiler:
# This image is missing a few platforms, so we'll add them locally # This image is missing a few platforms, so we'll add them locally
FROM --platform=linux/amd64 bdwyertech/go-crosscompile FROM --platform=linux/amd64 bdwyertech/go-crosscompile
RUN apk add --update --no-cache tar gzip >> /dev/null RUN apk add --update --no-cache wget tar gzip >> /dev/null
# RUN curl -sfL "https://musl.cc/armv7l-linux-musleabihf-cross.tgz" | tar xf - -C /usr/ --strip-components=1 RUN curl https://httpbin.org/get
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 wget "https://musl.cc/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 wget "https://musl.cc/i686-linux-musl-cross.tgz" && tar zxf i686-linux-musl-cross.tgz -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 wget "https://musl.cc/x86_64-linux-musl-cross.tgz" && tar zxf x86_64-linux-musl-cross.tgz -C /usr/ --strip-components=1
code: code:
FROM --platform=linux/amd64 +crosscompiler FROM --platform=linux/amd64 +crosscompiler