Skip to content

Commit

Permalink
build(docker): update dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
ReenigneArcher committed Aug 25, 2024
1 parent 6593fa5 commit c4c55e0
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions docker/archlinux.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1.4
# syntax=docker/dockerfile:1
# artifacts: true
# platforms: linux/amd64
# archlinux does not have an arm64 base image
Expand All @@ -17,7 +17,7 @@ pacman -Syu --disable-download-timeout --noconfirm
pacman -Scc --noconfirm
_DEPS

FROM sunshine-base as sunshine-build
FROM sunshine-base AS sunshine-build

ARG BRANCH
ARG BUILD_VERSION
Expand Down Expand Up @@ -111,12 +111,12 @@ rm -f /build/sunshine/pkg/sunshine-debug*.pkg.tar.zst
ls -a
_PKGBUILD

FROM scratch as artifacts
FROM scratch AS artifacts

COPY --link --from=sunshine-build /build/sunshine/pkg/sunshine*.pkg.tar.zst /sunshine.pkg.tar.zst
COPY --link --from=sunshine-build /build/sunshine/sunshine.pkg.tar.gz /sunshine.pkg.tar.gz

FROM sunshine-base as sunshine
FROM sunshine-base AS sunshine

COPY --link --from=artifacts /sunshine.pkg.tar.zst /

Expand Down
4 changes: 2 additions & 2 deletions docker/clion-toolchain.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1.4
# syntax=docker/dockerfile:1
# artifacts: false
# platforms: linux/amd64
# platforms_pr: linux/amd64
Expand All @@ -9,7 +9,7 @@ FROM ${BASE}:${TAG} AS toolchain-base

ENV DEBIAN_FRONTEND=noninteractive

FROM toolchain-base as toolchain
FROM toolchain-base AS toolchain

ARG TARGETPLATFORM
RUN echo "target_platform: ${TARGETPLATFORM}"
Expand Down
6 changes: 3 additions & 3 deletions docker/debian-bookworm.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1.4
# syntax=docker/dockerfile:1
# artifacts: true
# platforms: linux/amd64,linux/arm64/v8
# platforms_pr: linux/amd64
Expand All @@ -9,7 +9,7 @@ FROM ${BASE}:${TAG} AS sunshine-base

ENV DEBIAN_FRONTEND=noninteractive

FROM sunshine-base as sunshine-build
FROM sunshine-base AS sunshine-build

ARG BRANCH
ARG BUILD_VERSION
Expand Down Expand Up @@ -57,7 +57,7 @@ ARG TAG
ARG TARGETARCH
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /sunshine-${BASE}-${TAG}-${TARGETARCH}.deb

FROM sunshine-base as sunshine
FROM sunshine-base AS sunshine

# copy deb from builder
COPY --link --from=artifacts /sunshine*.deb /sunshine.deb
Expand Down
6 changes: 3 additions & 3 deletions docker/fedora-39.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1.4
# syntax=docker/dockerfile:1
# artifacts: true
# platforms: linux/amd64
# platforms_pr: linux/amd64
Expand All @@ -7,7 +7,7 @@ ARG BASE=fedora
ARG TAG=39
FROM ${BASE}:${TAG} AS sunshine-base

FROM sunshine-base as sunshine-build
FROM sunshine-base AS sunshine-build

ARG BRANCH
ARG BUILD_VERSION
Expand Down Expand Up @@ -55,7 +55,7 @@ ARG TAG
ARG TARGETARCH
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.rpm /sunshine-${BASE}-${TAG}-${TARGETARCH}.rpm

FROM sunshine-base as sunshine
FROM sunshine-base AS sunshine

# copy deb from builder
COPY --link --from=artifacts /sunshine*.rpm /sunshine.rpm
Expand Down
6 changes: 3 additions & 3 deletions docker/fedora-40.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1.4
# syntax=docker/dockerfile:1
# artifacts: true
# platforms: linux/amd64
# platforms_pr: linux/amd64
Expand All @@ -7,7 +7,7 @@ ARG BASE=fedora
ARG TAG=40
FROM ${BASE}:${TAG} AS sunshine-base

FROM sunshine-base as sunshine-build
FROM sunshine-base AS sunshine-build

ARG BRANCH
ARG BUILD_VERSION
Expand Down Expand Up @@ -55,7 +55,7 @@ ARG TAG
ARG TARGETARCH
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.rpm /sunshine-${BASE}-${TAG}-${TARGETARCH}.rpm

FROM sunshine-base as sunshine
FROM sunshine-base AS sunshine

# copy deb from builder
COPY --link --from=artifacts /sunshine*.rpm /sunshine.rpm
Expand Down
6 changes: 3 additions & 3 deletions docker/ubuntu-22.04.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1.4
# syntax=docker/dockerfile:1
# artifacts: true
# platforms: linux/amd64,linux/arm64/v8
# platforms_pr: linux/amd64
Expand All @@ -9,7 +9,7 @@ FROM ${BASE}:${TAG} AS sunshine-base

ENV DEBIAN_FRONTEND=noninteractive

FROM sunshine-base as sunshine-build
FROM sunshine-base AS sunshine-build

ARG BRANCH
ARG BUILD_VERSION
Expand Down Expand Up @@ -57,7 +57,7 @@ ARG TAG
ARG TARGETARCH
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /sunshine-${BASE}-${TAG}-${TARGETARCH}.deb

FROM sunshine-base as sunshine
FROM sunshine-base AS sunshine

# copy deb from builder
COPY --link --from=artifacts /sunshine*.deb /sunshine.deb
Expand Down
6 changes: 3 additions & 3 deletions docker/ubuntu-24.04.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1.4
# syntax=docker/dockerfile:1
# artifacts: true
# platforms: linux/amd64,linux/arm64/v8
# platforms_pr: linux/amd64
Expand All @@ -9,7 +9,7 @@ FROM ${BASE}:${TAG} AS sunshine-base

ENV DEBIAN_FRONTEND=noninteractive

FROM sunshine-base as sunshine-build
FROM sunshine-base AS sunshine-build

ARG BRANCH
ARG BUILD_VERSION
Expand Down Expand Up @@ -57,7 +57,7 @@ ARG TAG
ARG TARGETARCH
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /sunshine-${BASE}-${TAG}-${TARGETARCH}.deb

FROM sunshine-base as sunshine
FROM sunshine-base AS sunshine

# copy deb from builder
COPY --link --from=artifacts /sunshine*.deb /sunshine.deb
Expand Down

0 comments on commit c4c55e0

Please sign in to comment.