Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: pass version arguments to next build
Kyle Mendellbe7222ae7eb7
diff --git a/.github/workflows/build-next-images.yml b/.github/workflows/build-next-images.ymlindex 2ea6f1906..2f1df245e 100644--- a/.github/workflows/build-next-images.yml+++ b/.github/workflows/build-next-images.yml@@ -61,8 +61,15 @@ jobs:- name: Build frontendrun: pnpm --filter arcane-frontend build+ - name: Get short SHA+ id: sha+ run: echo "short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT+- name: Build binariesrun: bash scripts/github/build-binaries.sh --docker+ env:+ VERSION: next+ REVISION: ${{ steps.sha.outputs.short }}- name: Build and push container imageid: build-push-image@@ -118,8 +125,15 @@ jobs:username: ${{ github.repository_owner }}password: ${{ secrets.GITHUB_TOKEN }}+ - name: Get short SHA+ id: sha+ run: echo "short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT+- name: Build agent binariesrun: bash scripts/github/build-binaries.sh --docker --agent+ env:+ VERSION: next+ REVISION: ${{ steps.sha.outputs.short }}- name: Build and push agent imageid: build-push-imagediff --git a/scripts/build-docker-next.sh b/scripts/build-docker-next.shdeleted file mode 100644index cff1bd629..000000000--- a/scripts/build-docker-next.sh+++ /dev/null@@ -1,31 +0,0 @@-#!/usr/bin/env bash-set -euo pipefail--# Build script for "next" images on main branch-# Usage: ./scripts/build-docker-next.sh [TAG] [PULL]-# Example: ./scripts/build-docker-next.sh arcane:next --pull--# Get the current git revision (short commit hash)-REVISION=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")--# For next builds, version is always "next"-VERSION="next"--# Parse optional arguments-TAG="${1:-arcane:next}"-PULL="${2:---pull}"--echo "Building Docker image: ${TAG}"-echo " VERSION: ${VERSION}"-echo " REVISION: ${REVISION}"-echo ""--docker build ${PULL} --rm \- -f 'docker/Dockerfile' \- --build-arg VERSION="${VERSION}" \- --build-arg REVISION="${REVISION}" \- -t "${TAG}" \- .--echo ""-echo "✓ Build complete: ${TAG}"diff --git a/scripts/github/build-binaries.sh b/scripts/github/build-binaries.shindex 3a6f38f22..463b8ed9b 100755--- a/scripts/github/build-binaries.sh+++ b/scripts/github/build-binaries.sh@@ -4,15 +4,16 @@ set -euo pipefailcd backendmkdir -p .bin-HOST_OS="$(go env GOHOSTOS)" # added+HOST_OS="$(go env GOHOSTOS)"# Read version from repo root .version (trim whitespace), fallback to "dev"-VERSION=$(cat ../.version | sed 's/^\s*\|\s*$//g')-REVISION=$(cat ../.revision 2>/dev/null || git rev-parse --short HEAD 2>/dev/null || echo "unknown")++VERSION=${VERSION:-$(cat ../.version | sed 's/^\s*\|\s*$//g')}+REVISION=${REVISION:-$(cat ../.revision 2>/dev/null || git rev-parse --short HEAD 2>/dev/null || echo "unknown")}LDFLAGS="-w -s -buildid=${VERSION} \-X github.com/ofkm/arcane-backend/internal/config.Version=${VERSION} \- -X github.com/ofkm/arcane-backend/internal/config.Revision=${REVISION}"+ -X github.com/ofkm/arcane-backend/internal/config.Revision=${REVISION}"DOCKER_ONLY=falseAGENT_BUILD=false@@ -92,4 +93,4 @@ elsebuild_platform "macos-arm64" "darwin" "arm64"fi-echo "Compilation done"\ No newline at end of file+echo "Compilation done"