diff options
| author | Xe Iaso <me@xeiaso.net> | 2025-04-27 09:38:34 -0400 |
|---|---|---|
| committer | Xe Iaso <me@xeiaso.net> | 2025-04-27 09:38:34 -0400 |
| commit | 404cc05b0db49f5d80a60e5d936b5af122f01242 (patch) | |
| tree | 5f8b219bf10b5d5c9157eee5fdae4e87732e4a8f | |
| parent | 2bcca657bbb814a0e02b2e175ee6900eddeba625 (diff) | |
| download | xesite-404cc05b0db49f5d80a60e5d936b5af122f01242.tar.xz xesite-404cc05b0db49f5d80a60e5d936b5af122f01242.zip | |
chore(docker): fix buildx bake
Signed-off-by: Xe Iaso <me@xeiaso.net>
| -rw-r--r-- | .github/workflows/earthly.yml | 2 | ||||
| -rw-r--r-- | docker-bake.hcl | 4 | ||||
| -rw-r--r-- | docker/xesite.Dockerfile | 8 |
3 files changed, 1 insertions, 13 deletions
diff --git a/.github/workflows/earthly.yml b/.github/workflows/earthly.yml index f33f0ed..06cac02 100644 --- a/.github/workflows/earthly.yml +++ b/.github/workflows/earthly.yml @@ -45,7 +45,7 @@ jobs: uses: docker/bake-action@v6 with: source: . - push: true + push: false set: | patreon-saasproxy.tags=ghcr.io/xe/site/patreon-saasproxy:latest xesite.tags=ghcr.io/xe/site/bin:latest diff --git a/docker-bake.hcl b/docker-bake.hcl index 1867bf5..5b67582 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -32,15 +32,11 @@ target "patreon-saasproxy" { target "xesite" { args = { ALPINE_VERSION = null - DENO_SHA = null DENO_VERSION = null DHALL_VERSION = null DHALL_JSON_VERSION = null - DHALL_JSON_SHA = null FONTS_VERSION = null - FONTS_SHA = null GO_VERSION = null - TYPST_SHA = null TYPST_VERSION = null UBUNTU_VERSION = "24.04" } diff --git a/docker/xesite.Dockerfile b/docker/xesite.Dockerfile index a2029c0..fb77a5e 100644 --- a/docker/xesite.Dockerfile +++ b/docker/xesite.Dockerfile @@ -22,49 +22,41 @@ RUN --mount=type=cache,target=/root/.cache GOOS=${TARGETOS} GOARCH=${TARGETARCH} # Iosevka for the resume FROM --platform=${BUILDPLATFORM} alpine:${ALPINE_VERSION} AS fonts ARG FONTS_VERSION=20250421 -ARG FONTS_SHA=2d96002c16d611fe8498a71c0b44362b4a98e18023cce34e7e37f581f34def22 WORKDIR /fonts RUN set -x \ && apk add -U unzip ca-certificates curl \ && curl -Lo iosevka.zip https://files.xeiaso.net/dl/iosevka-${FONTS_VERSION}.zip \ - && echo "${FONTS_SHA} iosevka.zip" | sha256sum -c -s \ && unzip -d /fonts iosevka.zip # dhall-json for configuration building FROM --platform=${BUILDPLATFORM} alpine:${ALPINE_VERSION} AS dhall-json ARG DHALL_VERSION=1.42.2 ARG DHALL_JSON_VERSION=1.7.12 -ARG DHALL_JSON_SHA=acbada5e29ecc9b6a723c3f390beb76b9db26df81546d1f472415a2f387bc457 RUN mkdir -p /app WORKDIR /app RUN set -x \ && apk add -U curl bzip2 ca-certificates \ && curl -L -o dhall-linux.tar.bz2 https://github.com/dhall-lang/dhall-haskell/releases/download/${DHALL_VERSION}/dhall-json-${DHALL_JSON_VERSION}-x86_64-linux.tar.bz2 \ - && echo "${DHALL_JSON_SHA} dhall-linux.tar.bz2" | sha256sum -c -s \ && tar -xvjf dhall-linux.tar.bz2 \ && mv bin/dhall-to-json . # deno FROM alpine:${ALPINE_VERSION} AS deno ARG DENO_VERSION=2.2.11 -ARG DENO_SHA=6ef38d16cbe99c3d610576b56aaa9ede9d988e8a2e5c1ed9c9d502e3167ef758 RUN mkdir -p /app WORKDIR /app RUN apk add -U curl unzip ca-certificates \ && curl -sSLo deno.zip https://github.com/denoland/deno/releases/download/v${DENO_VERSION}/deno-$(uname -m)-unknown-linux-gnu.zip \ - && echo "${DENO_SHA} deno.zip" | sha256sum -c -s \ && unzip deno.zip # typst FROM alpine:${ALPINE_VERSION} AS typst ARG TYPST_VERSION=0.13.1 -ARG TYPST_SHA=7d214bfeffc2e585dc422d1a09d2b144969421281e8c7f5d784b65fc69b5673f RUN mkdir -p /app WORKDIR /app RUN set -x \ && apk add -U curl xz ca-certificates \ && curl -sSLo typst.tar.xz https://github.com/typst/typst/releases/download/v${TYPST_VERSION}/typst-$(uname -m)-unknown-linux-musl.tar.xz \ - && echo "${TYPST_SHA} typst.tar.xz" | sha256sum -c -s \ && tar xJf typst.tar.xz -C . \ && mv typst-$(uname -m)-unknown-linux-musl/typst . |