Skip to content

Modern Docker Management, Designed for Everyone

chore: update pr builds to use ci labels

Kyle Mendelleb1463f668bd
diff --git a/.github/workflows/build-pr-images.yml b/.github/workflows/build-pr-images.yml
index 75ead8bc3..e69d45e58 100644
--- a/.github/workflows/build-pr-images.yml
+++ b/.github/workflows/build-pr-images.yml
@@ -18,8 +18,12 @@ jobs:
build-pr-images:
# Only build if the PR is from a branch within the getarcaneapp organization
if: github.event.pull_request.head.repo.owner.login == 'getarcaneapp'
- runs-on: depot-ubuntu-24.04-16
- timeout-minutes: 60
+ runs-on: depot-ubuntu-24.04-32
+
+ env:
+ MANAGER_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/arcane
+ AGENT_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/arcane-headless
+
steps:
- name: Checkout code
uses: actions/checkout@v6
@@ -37,28 +41,43 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- - name: Resolve image names
- id: images
- run: |
- OWNER=${{ github.repository_owner }}
- echo "manager=ghcr.io/${OWNER,,}/arcane" >> "$GITHUB_OUTPUT"
- echo "agent=ghcr.io/${OWNER,,}/arcane-headless" >> "$GITHUB_OUTPUT"
-
- name: Manager image metadata
id: manager-meta
uses: docker/metadata-action@v5
with:
- images: ${{ steps.images.outputs.manager }}
+ images: ${{ env.MANAGER_IMAGE_NAME }}
tags: |
type=raw,value=pr-${{ github.event.pull_request.number }}
+ labels: |
+ org.opencontainers.image.authors=OFKM Technologies
+ org.opencontainers.image.url=https://github.com/getarcaneapp/arcane
+ org.opencontainers.image.documentation=https://github.com/getarcaneapp/arcane/blob/main/README.md
+ org.opencontainers.image.source=https://github.com/getarcaneapp/arcane
+ org.opencontainers.image.version=pr-${{ github.event.pull_request.number }}
+ org.opencontainers.image.revision=${{ github.event.pull_request.head.sha }}
+ org.opencontainers.image.licenses=BSD-3-Clause
+ org.opencontainers.image.ref.name=arcane
+ org.opencontainers.image.title=Arcane
+ org.opencontainers.image.description=Modern Docker Management, Made for Everyone
- name: Agent image metadata
id: agent-meta
uses: docker/metadata-action@v5
with:
- images: ${{ steps.images.outputs.agent }}
+ images: ${{ env.AGENT_IMAGE_NAME }}
tags: |
type=raw,value=pr-${{ github.event.pull_request.number }}
+ labels: |
+ org.opencontainers.image.authors=OFKM Technologies
+ org.opencontainers.image.url=https://github.com/getarcaneapp/arcane
+ org.opencontainers.image.documentation=https://github.com/getarcaneapp/arcane/blob/main/README.md
+ org.opencontainers.image.source=https://github.com/getarcaneapp/arcane
+ org.opencontainers.image.version=pr-${{ github.event.pull_request.number }}
+ org.opencontainers.image.revision=${{ github.event.pull_request.head.sha }}
+ org.opencontainers.image.licenses=BSD-3-Clause
+ org.opencontainers.image.ref.name=arcane-agent
+ org.opencontainers.image.title=Arcane Agent
+ org.opencontainers.image.description=Arcane Agent
- name: Build and push manager image
uses: depot/build-push-action@v1
@@ -105,10 +124,10 @@ jobs:
issue-number: ${{ github.event.pull_request.number }}
token: ${{ secrets.ARCANE_BOT_TOKEN }}
body: |
- Docker images for this PR have been built successfully!
+ Container images for this PR have been built successfully!
- - **Manager**: `${{ steps.images.outputs.manager }}:pr-${{ github.event.pull_request.number }}`
- - **Agent**: `${{ steps.images.outputs.agent }}:pr-${{ github.event.pull_request.number }}`
+ - **Manager**: `${{ env.MANAGER_IMAGE_NAME }}:pr-${{ github.event.pull_request.number }}`
+ - **Agent**: `${{ env.AGENT_IMAGE_NAME }}:pr-${{ github.event.pull_request.number }}`
Built from commit ${{ github.event.pull_request.head.sha }}
edit-mode: replace
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 640c49feb..6d3114ac1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -27,6 +27,8 @@ RUN pnpm -C frontend build
FROM --platform=$BUILDPLATFORM golang:1.25-trixie AS backend-builder
ARG TARGETARCH
ARG BUILD_TAGS
+ARG VERSION="dev"
+ARG REVISION="unknown"
WORKDIR /build
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl git tzdata jq \
@@ -43,8 +45,8 @@ COPY .arcane.json ../arcane.json
COPY --from=frontend-builder /build/frontend/dist ./frontend/dist
RUN --mount=type=cache,target=/root/.cache/go-build \
- VERSION=$(jq -r '.version // "dev"' ../arcane.json) && \
- REVISION=$(jq -r '.revision // "unknown"' ../arcane.json) && \
+ if [ "${VERSION}" = "dev" ]; then VERSION=$(jq -r '.version // "dev"' ../arcane.json); fi && \
+ if [ "${REVISION}" = "unknown" ]; then REVISION=$(jq -r '.revision // "unknown"' ../arcane.json); fi && \
BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ') && \
CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH \
go build \
@@ -57,8 +59,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
# Stage 3: Production Image
FROM debian:trixie-slim AS runner
ARG TARGETARCH
-ARG VERSION="dev"
-ARG REVISION="unknown"
+ARG VERSION
+ARG REVISION
RUN apt-get update \
&& apt-get install -y --no-install-recommends ca-certificates curl tzdata tar gzip \
diff --git a/docker/Dockerfile-agent b/docker/Dockerfile-agent
index 321935f13..5e75fafe9 100644
--- a/docker/Dockerfile-agent
+++ b/docker/Dockerfile-agent
@@ -5,6 +5,8 @@ ARG REVISION="unknown"
FROM --platform=$BUILDPLATFORM golang:1.25-trixie AS agent-builder
ARG TARGETARCH
ARG BUILD_TAGS="exclude_frontend"
+ARG VERSION="dev"
+ARG REVISION="unknown"
WORKDIR /build
RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates tzdata curl jq \
@@ -21,8 +23,8 @@ COPY backend ./
COPY .arcane.json ../arcane.json
RUN --mount=type=cache,target=/root/.cache/go-build \
- VERSION=$(jq -r '.version // "dev"' ../arcane.json) && \
- REVISION=$(jq -r '.revision // "unknown"' ../arcane.json) && \
+ if [ "${VERSION}" = "dev" ]; then VERSION=$(jq -r '.version // "dev"' ../arcane.json); fi && \
+ if [ "${REVISION}" = "unknown" ]; then REVISION=$(jq -r '.revision // "unknown"' ../arcane.json); fi && \
BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ') && \
CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH \
go build \