mchus/jukebox_maker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ops: simplify to single Image prompt instead of registry+owner

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Michael Chus
2026-04-23 21:47:35 +03:00
parent 0df89bdff0
commit 7b68c66725
2 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ops/build-image.sh
View File

@@ -5,7 +5,10 @@
# ./ops/build-image.sh # ./ops/build-image.sh
# #
# Usage (non-interactive — all values as positional args): # Usage (non-interactive — all values as positional args):
# ./ops/build-image.sh <tag> <registry> <owner> # ./ops/build-image.sh <tag> <image>
#
# Example:
# ./ops/build-image.sh v1.0 registry.example.com/myorg/myapp
set -eu set -eu
@@ -16,7 +19,6 @@ command -v docker >/dev/null 2>&1 || { echo "error: docker not found in PATH" >&
DEFAULT_TAG=$(git -C "${ROOT_DIR}" rev-parse --short HEAD 2>/dev/null || echo dev) DEFAULT_TAG=$(git -C "${ROOT_DIR}" rev-parse --short HEAD 2>/dev/null || echo dev)
ask() { ask() {
# $1 = variable name, $2 = prompt, $3 = default
if [ -n "$3" ]; then if [ -n "$3" ]; then
printf "%s [%s]: " "$2" "$3" >&2 printf "%s [%s]: " "$2" "$3" >&2
else else
@@ -26,26 +28,20 @@ ask() {
eval "$1=\"\${_val:-$3}\"" eval "$1=\"\${_val:-$3}\""
} }
if [ $# -ge 3 ]; then if [ $# -ge 2 ]; then
IMAGE_TAG="$1" IMAGE_TAG="$1"
REGISTRY="$2" IMAGE="$2"
OWNER="$3"
elif [ $# -ge 1 ]; then elif [ $# -ge 1 ]; then
IMAGE_TAG="$1" IMAGE_TAG="$1"
ask REGISTRY "Registry" "" ask IMAGE "Image" ""
ask OWNER "Owner" ""
else else
ask IMAGE_TAG "Tag" "${DEFAULT_TAG}" ask IMAGE_TAG "Tag" "${DEFAULT_TAG}"
ask REGISTRY "Registry" "" ask IMAGE "Image" ""
ask OWNER "Owner" ""
fi fi
IMAGE_NAME="${IMAGE_NAME:-jukebox-maker}" echo "building ${IMAGE}:${IMAGE_TAG}"
FULL_IMAGE="${REGISTRY}/${OWNER}/${IMAGE_NAME}"
echo "building ${FULL_IMAGE}:${IMAGE_TAG}"
docker build \ docker build \
-f "${ROOT_DIR}/Dockerfile" \ -f "${ROOT_DIR}/Dockerfile" \
-t "${FULL_IMAGE}:${IMAGE_TAG}" \ -t "${IMAGE}:${IMAGE_TAG}" \
-t "${FULL_IMAGE}:latest" \ -t "${IMAGE}:latest" \
"${ROOT_DIR}" "${ROOT_DIR}"

35
ops/push-image.sh
View File

@@ -5,7 +5,10 @@
# ./ops/push-image.sh # ./ops/push-image.sh
# #
# Usage (non-interactive — all values as positional args): # Usage (non-interactive — all values as positional args):
# ./ops/push-image.sh <tag> <registry> <owner> # ./ops/push-image.sh <tag> <image>
#
# Example:
# ./ops/push-image.sh v1.0 registry.example.com/myorg/myapp
# #
# Assumes docker is already logged in to the target registry. # Assumes docker is already logged in to the target registry.
@@ -20,9 +23,9 @@ command -v git >/dev/null 2>&1 || die "git not found in PATH"
docker buildx version >/dev/null 2>&1 || die "docker buildx not available" docker buildx version >/dev/null 2>&1 || die "docker buildx not available"
DEFAULT_TAG=$(git -C "${ROOT_DIR}" rev-parse --short HEAD 2>/dev/null || echo dev) DEFAULT_TAG=$(git -C "${ROOT_DIR}" rev-parse --short HEAD 2>/dev/null || echo dev)
PLATFORMS="${PLATFORMS:-linux/amd64,linux/arm64}"
ask() { ask() {
# $1 = variable name, $2 = prompt, $3 = default
if [ -n "$3" ]; then if [ -n "$3" ]; then
printf "%s [%s]: " "$2" "$3" >&2 printf "%s [%s]: " "$2" "$3" >&2
else else
@@ -32,27 +35,19 @@ ask() {
eval "$1=\"\${_val:-$3}\"" eval "$1=\"\${_val:-$3}\""
} }
if [ $# -ge 3 ]; then if [ $# -ge 2 ]; then
IMAGE_TAG="$1" IMAGE_TAG="$1"
REGISTRY="$2" IMAGE="$2"
OWNER="$3"
elif [ $# -ge 1 ]; then elif [ $# -ge 1 ]; then
IMAGE_TAG="$1" IMAGE_TAG="$1"
ask REGISTRY "Registry" "" ask IMAGE "Image" ""
ask OWNER "Owner" ""
else else
ask IMAGE_TAG "Tag" "${DEFAULT_TAG}" ask IMAGE_TAG "Tag" "${DEFAULT_TAG}"
ask REGISTRY "Registry" "" ask IMAGE "Image" ""
ask OWNER "Owner" ""
fi fi
IMAGE_NAME="${IMAGE_NAME:-jukebox-maker}"
PLATFORMS="${PLATFORMS:-linux/amd64,linux/arm64}"
FULL_IMAGE="${REGISTRY}/${OWNER}/${IMAGE_NAME}"
echo "" echo ""
echo "registry : ${REGISTRY}" echo "image : ${IMAGE}"
echo "image : ${FULL_IMAGE}"
echo "tag : ${IMAGE_TAG}" echo "tag : ${IMAGE_TAG}"
echo "platforms: ${PLATFORMS}" echo "platforms: ${PLATFORMS}"
echo "" echo ""
@@ -70,12 +65,12 @@ docker buildx use "${BUILDER_NAME}"
docker buildx build \ docker buildx build \
--platform "${PLATFORMS}" \ --platform "${PLATFORMS}" \
--file "${ROOT_DIR}/Dockerfile" \ --file "${ROOT_DIR}/Dockerfile" \
-t "${FULL_IMAGE}:${IMAGE_TAG}" \ -t "${IMAGE}:${IMAGE_TAG}" \
-t "${FULL_IMAGE}:latest" \ -t "${IMAGE}:latest" \
--push \ --push \
"${ROOT_DIR}" "${ROOT_DIR}"
echo "" echo ""
echo "pushed:" echo "pushed:"
echo " ${FULL_IMAGE}:${IMAGE_TAG}" echo " ${IMAGE}:${IMAGE_TAG}"
echo " ${FULL_IMAGE}:latest" echo " ${IMAGE}:latest"