Explicitly set an alpine build version + install tar into build env

This commit is contained in:
Gabe Kangas 2022-08-04 13:55:32 -07:00
parent 0a48492462
commit 2402914000
No known key found for this signature in database
GPG Key ID: 9A56337728BC81EA

View File

@ -1,6 +1,6 @@
VERSION --new-platform 0.6 VERSION --new-platform 0.6
FROM --platform=linux/amd64 alpine:latest FROM --platform=linux/amd64 alpine:3.15.5
ARG version=develop ARG version=develop
WORKDIR /build WORKDIR /build
@ -17,8 +17,10 @@ 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 curl -sfL "https://musl.cc/armv7l-linux-musleabihf-cross.tgz" | tar zxf - -C /usr/ --strip-components=1 RUN apk add --update --no-cache tar gzip >> /dev/null
RUN curl -sfL "https://musl.cc/i686-linux-musl-cross.tgz" | tar zxf - -C /usr/ --strip-components=1 # 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 curl -sfL "https://musl.cc/x86_64-linux-musl-cross.tgz" | tar zxf - -C /usr/ --strip-components=1
code: code:
@ -119,7 +121,7 @@ docker:
ARG image=ghcr.io/owncast/owncast ARG image=ghcr.io/owncast/owncast
ARG tag=develop ARG tag=develop
ARG TARGETPLATFORM ARG TARGETPLATFORM
FROM --platform=$TARGETPLATFORM alpine:latest FROM --platform=$TARGETPLATFORM alpine:3.15.5
RUN apk update && apk add --no-cache ffmpeg ffmpeg-libs ca-certificates unzip && update-ca-certificates RUN apk update && apk add --no-cache ffmpeg ffmpeg-libs ca-certificates unzip && update-ca-certificates
WORKDIR /app WORKDIR /app
COPY --platform=$TARGETPLATFORM +package/owncast.zip /app COPY --platform=$TARGETPLATFORM +package/owncast.zip /app