From e4b563276f294005d2bbabd366401708e77d8723 Mon Sep 17 00:00:00 2001 From: Bas van den Wollenberg Date: Wed, 22 Apr 2026 23:34:36 +0200 Subject: [PATCH] use consistent casing --- Dockerfile | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index e49956e..cd6eceb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,14 +7,14 @@ workdir /app run apk add git gcc musl-dev run git clone -b ${TAG} https://tangled.org/@tangled.org/core . -FROM builder AS build-knot -RUN go build -o /usr/bin/knot -ldflags '-s -w -extldflags "-static"' ./cmd/knot +from builder as build-knot +run go build -o /usr/bin/knot -ldflags '-s -w -extldflags "-static"' ./cmd/knot -FROM builder AS build-spindle -RUN go build -o /usr/bin/spindle ./cmd/spindle +from builder as build-spindle +run go build -o /usr/bin/spindle ./cmd/spindle -from alpine:latest AS knot -ENV KNOT_REPO_SCAN_PATH=/home/git/repositories +from alpine:latest as knot +env KNOT_REPO_SCAN_PATH=/home/git/repositories expose 5555 expose 22 @@ -28,12 +28,12 @@ label org.opencontainers.image.licenses='MIT' arg UID=1000 arg GID=1000 -copy rootfs . +copy rootfs / run chmod 755 /etc run chmod -R 755 /etc/s6-overlay run apk add shadow s6-overlay execline openssl openssh git curl bash run groupadd -g $GID -f git -run useradd -u $UID -g $GID -d /home/git git +run useradd -l -u $UID -g $GID -d /home/git git run openssl rand -hex 16 | passwd --stdin git run mkdir -p /home/git/repositories && chown -R git:git /home/git copy --from=build-knot /usr/bin/knot /usr/bin @@ -43,28 +43,28 @@ healthcheck --interval=60s --timeout=30s --start-period=5s --retries=3 \ cmd curl -f http://localhost:5555 || exit 1 entrypoint ["/init"] -FROM alpine:edge AS spindle -EXPOSE 6555 +from alpine:edge as spindle +expose 6555 -LABEL org.opencontainers.image.title="spindle" -LABEL org.opencontainers.image.description="ci server for tangled" -LABEL org.opencontainers.image.source="https://tangled.org/@tangled.org/knot-docker" -LABEL org.opencontainers.image.url="https://tangled.org" -LABEL org.opencontainers.image.vendor="tangled.org" -LABEL org.opencontainers.image.licenses="MIT" +label org.opencontainers.image.title="spindle" +label org.opencontainers.image.description="ci server for tangled" +label org.opencontainers.image.source="https://tangled.org/@tangled.org/knot-docker" +label org.opencontainers.image.url="https://tangled.org" +label org.opencontainers.image.vendor="tangled.org" +label org.opencontainers.image.licenses="MIT" -ARG UID=1000 -ARG GID=1000 +arg UID=1000 +arg GID=1000 run apk add curl bash -RUN adduser --system --uid $UID spindle -RUN addgroup --system --gid $UID spindle -RUN mkdir -p /app && chown -R spindle:spindle /app +run adduser --system --uid $UID spindle +run addgroup --system --gid $UID spindle +run mkdir -p /app && chown -R spindle:spindle /app -COPY --from=build-spindle /usr/bin/spindle /usr/bin +copy --from=build-spindle /usr/bin/spindle /usr/bin -WORKDIR /app -CMD ["spindle"] -VOLUME ["/app"] -HEALTHCHECK --interval=60s --timeout=30s --start-period=5s --retries=3 \ - CMD curl -f http://localhost:6555 || exit 1 +workdir /app +cmd ["spindle"] +volume ["/app"] +healthcheck --interval=60s --timeout=30s --start-period=5s --retries=3 \ + cmd curl -f http://localhost:6555 || exit 1 -- 2.51.2