Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: shell script fixes
Kyle Mendell08c1f29e2de1
diff --git a/scripts/build-docker.sh b/scripts/build-docker.shindex 3862271cc..1f91add2c 100755--- a/scripts/build-docker.sh+++ b/scripts/build-docker.sh@@ -1,22 +1,27 @@#!/usr/bin/env bashset -euo pipefail-# Read version from .version file (trim whitespace), fallback to "dev"-VERSION=$(cat .version | sed 's/^\s*\|\s*$//g' || echo "dev")--# Get git revision (short commit hash), fallback to "unknown"+# Read version from .version file+VERSION=$(sed 's/^\s*\|\s*$//g' .version || echo "dev")+# Get git revision (short commit hash)REVISION=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")# Parse optional argumentsTAG="${1:-arcane:latest}"PULL="${2:---pull}"+# Split PULL into array to allow multiple flags while preventing globbing+PULL_ARGS=()+if [ -n "$PULL" ]; then+ IFS=' ' read -r -a PULL_ARGS <<< "$PULL"+fi+echo "Building Docker image: ${TAG}"echo " VERSION: ${VERSION}"echo " REVISION: ${REVISION}"echo ""-docker build ${PULL} --rm \+docker build "${PULL_ARGS[@]}" --rm \-f 'docker/Dockerfile' \--build-arg VERSION="${VERSION}" \--build-arg REVISION="${REVISION}" \diff --git a/scripts/github/build-binaries.sh b/scripts/github/build-binaries.shindex 463b8ed9b..d3fd13452 100755--- a/scripts/github/build-binaries.sh+++ b/scripts/github/build-binaries.sh@@ -5,10 +5,7 @@ cd backendmkdir -p .binHOST_OS="$(go env GOHOSTOS)"--# Read version from repo root .version (trim whitespace), fallback to "dev"--VERSION=${VERSION:-$(cat ../.version | sed 's/^\s*\|\s*$//g')}+VERSION=${VERSION:-$(sed 's/^\s*\|\s*$//g' ../.version)}REVISION=${REVISION:-$(cat ../.revision 2>/dev/null || git rev-parse --short HEAD 2>/dev/null || echo "unknown")}LDFLAGS="-w -s -buildid=${VERSION} \