6 Commits
Author SHA1 Message Date
mchusandClaude Sonnet 4.6 f2a7505378 ops: merge build and push into single build-image.sh
Если указан image — собирает мультиарч и пушит.
Если image пустой — локальная сборка без пуша.
push-image.sh удалён.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-23 21:48:52 +03:00
mchusandClaude Sonnet 4.6 7b68c66725 ops: simplify to single Image prompt instead of registry+owner
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-23 21:47:35 +03:00
mchusandClaude Sonnet 4.6 0df89bdff0 ops: fix interactive prompts (printf to stderr, no subshell)
printf шёл в stdout внутри $(...), поэтому prompt не выводился
и read висел. Теперь prompt идёт в stderr напрямую.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-23 21:46:07 +03:00
mchusandClaude Sonnet 4.6 83d6ad5134 ops: remove hardcoded registry and owner from scripts
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-23 21:43:32 +03:00
mchusandClaude Sonnet 4.6 2355d32766 ops: add registry prefix to build-image, add push-image script
build-image.sh теперь тегирует как git.mchus.pro/reanimator/jukebox-maker.
push-image.sh собирает мультиарч образ и пушит в Gitea registry.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-23 21:41:14 +03:00
mchusandClaude Sonnet 4.6 28ca583073 Fix Dockerfile: bump builder to golang:1.25-alpine
go.mod requires go 1.25.0 (generated by local go 1.26).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-23 21:35:16 +03:00
2 changed files with 84 additions and 13 deletions

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine AS builder FROM golang:1.25-alpine AS builder
WORKDIR /src WORKDIR /src
COPY go.mod go.sum ./ COPY go.mod go.sum ./
+83 -12
View File
@@ -1,20 +1,91 @@
#!/bin/sh #!/bin/sh
# Build a Docker image. If an image name is provided, builds multi-arch and pushes to registry.
# Otherwise builds locally for the current platform only.
#
# Usage (interactive):
# ./ops/build-image.sh
#
# Usage (non-interactive):
# ./ops/build-image.sh <tag> [image]
#
# Examples:
# ./ops/build-image.sh # prompts for tag and image
# ./ops/build-image.sh v1.0 # prompts for image
# ./ops/build-image.sh v1.0 registry.example.com/org/myapp # local only (no push)
# ./ops/build-image.sh v1.0 "" # local build, no push
set -eu set -eu
ROOT_DIR=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd) ROOT_DIR=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
if ! command -v docker >/dev/null 2>&1; then die() { echo "error: $*" >&2; exit 1; }
echo "docker not found in PATH" >&2
exit 1 command -v docker >/dev/null 2>&1 || die "docker not found in PATH"
DEFAULT_TAG=$(git -C "${ROOT_DIR}" rev-parse --short HEAD 2>/dev/null || echo dev)
ask() {
# $1=varname $2=prompt $3=default
if [ -n "$3" ]; then
printf "%s [%s]: " "$2" "$3" >&2
else
printf "%s (leave empty to build locally only): " "$2" >&2
fi
read -r _val
eval "$1=\"\${_val:-$3}\""
}
if [ $# -ge 2 ]; then
IMAGE_TAG="$1"
IMAGE="$2"
elif [ $# -ge 1 ]; then
IMAGE_TAG="$1"
ask IMAGE "Image" ""
else
ask IMAGE_TAG "Tag" "${DEFAULT_TAG}"
ask IMAGE "Image" ""
fi fi
IMAGE_NAME=${IMAGE_NAME:-jukebox-maker} if [ -n "${IMAGE}" ]; then
DEFAULT_TAG=$(git -C "${ROOT_DIR}" rev-parse --short HEAD 2>/dev/null || echo dev) # multi-arch build + push
IMAGE_TAG=${1:-${IMAGE_TAG:-${DEFAULT_TAG}}} docker buildx version >/dev/null 2>&1 || die "docker buildx not available"
echo "building ${IMAGE_NAME}:${IMAGE_TAG}" PLATFORMS="${PLATFORMS:-linux/amd64,linux/arm64}"
docker build \ BUILDER_NAME="jukebox-multiarch"
-f "${ROOT_DIR}/Dockerfile" \
-t "${IMAGE_NAME}:${IMAGE_TAG}" \ if ! docker buildx inspect "${BUILDER_NAME}" >/dev/null 2>&1; then
-t "${IMAGE_NAME}:latest" \ echo "creating buildx builder: ${BUILDER_NAME}"
"${ROOT_DIR}" docker buildx create \
--name "${BUILDER_NAME}" \
--driver docker-container \
--bootstrap
fi
docker buildx use "${BUILDER_NAME}"
echo "building and pushing ${IMAGE}:${IMAGE_TAG} (${PLATFORMS})"
docker buildx build \
--platform "${PLATFORMS}" \
--file "${ROOT_DIR}/Dockerfile" \
-t "${IMAGE}:${IMAGE_TAG}" \
-t "${IMAGE}:latest" \
--push \
"${ROOT_DIR}"
echo ""
echo "pushed:"
echo " ${IMAGE}:${IMAGE_TAG}"
echo " ${IMAGE}:latest"
else
# local build only
echo "building locally (no push)"
docker build \
--file "${ROOT_DIR}/Dockerfile" \
-t "jukebox-maker:${IMAGE_TAG}" \
-t "jukebox-maker:latest" \
"${ROOT_DIR}"
echo ""
echo "built:"
echo " jukebox-maker:${IMAGE_TAG}"
echo " jukebox-maker:latest"
fi