Skip to content

Modern Docker Management, Designed for Everyone

chore: tweak dockerfile

Kyle Mendelle6404392c811
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 79634bbd6..66767974f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,5 @@
# Tags passed to "go build"
ARG BUILD_TAGS=""
-ARG VERSION="dev"
-ARG REVISION="unknown"
# Stage 1: Build Frontend
FROM node:24-alpine AS frontend-builder
@@ -10,8 +8,8 @@ WORKDIR /build
COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./
COPY frontend/package.json ./frontend/package.json
COPY frontend ./frontend
-
RUN --mount=type=cache,target=/root/.pnpm-store pnpm -C frontend install --frozen-lockfile
+
ENV BUILD_PATH=dist
RUN pnpm -C frontend build
@@ -26,7 +24,6 @@ COPY ./backend/go.mod ./backend/go.sum ./
RUN --mount=type=cache,target=/go/pkg/mod go mod download
COPY ./backend ./
COPY --from=frontend-builder /build/frontend/dist ./frontend/dist
-
RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 \
GOOS=linux \
go build \
@@ -38,39 +35,31 @@ RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 \
# Stage 3: Production Image
FROM alpine:3 AS runner
-RUN apk upgrade && apk --no-cache add ca-certificates tzdata curl shadow su-exec
+ARG VERSION="dev"
+ARG REVISION="unknown"
+RUN apk upgrade && apk --no-cache add ca-certificates curl shadow su-exec tzdata
RUN delgroup ping && apk del iputils || true
-
ENV DOCKER_GID=998 PUID=2000 PGID=2000
ENV GIN_MODE=release
ENV PORT=3552
ENV ENVIRONMENT=production
-
WORKDIR /app
RUN mkdir -p /app/data && chmod 755 /app/data
-
COPY --from=backend-builder /build/arcane .
-COPY --chmod=755 ../scripts/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
-
+COPY --chmod=755 scripts/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
EXPOSE 3552
VOLUME ["/app/data"]
-
-ARG VERSION="dev"
-ARG REVISION="unknown"
-
-LABEL org.opencontainers.image.authors="OFKM Technologies"
-LABEL org.opencontainers.image.url="https://github.com/ofkm/arcane"
-LABEL org.opencontainers.image.documentation="https://github.com/ofkm/arcane/blob/main/README.md"
-LABEL org.opencontainers.image.source="https://github.com/ofkm/arcane"
-LABEL org.opencontainers.image.version=$VERSION
-LABEL org.opencontainers.image.revision=$REVISION
-LABEL org.opencontainers.image.licenses="BSD-3-Clause"
-LABEL org.opencontainers.image.ref.name="arcane"
-LABEL org.opencontainers.image.title="Arcane"
-LABEL org.opencontainers.image.description="Modern Docker Management, Made for Everyone"
-
-LABEL com.ofkm.arcane.updater="false"
-LABEL com.ofkm.arcane.server="true"
-
+LABEL org.opencontainers.image.authors="OFKM Technologies" \
+org.opencontainers.image.url="https://github.com/ofkm/arcane" \
+org.opencontainers.image.documentation="https://github.com/ofkm/arcane/blob/main/README.md" \
+org.opencontainers.image.source="https://github.com/ofkm/arcane" \
+org.opencontainers.image.version=${VERSION} \
+org.opencontainers.image.revision=${REVISION} \
+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" \
+com.ofkm.arcane.updater="false" \
+com.ofkm.arcane.server="true"
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
CMD ["./arcane"]
\ No newline at end of file
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
new file mode 100755
index 000000000..3862271cc
--- /dev/null
+++ b/scripts/build-docker.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -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"
+REVISION=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+
+# Parse optional arguments
+TAG="${1:-arcane:latest}"
+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}"