change

syncthing/Dockerfile.test

@@ -12,62 +12,52 @@ ARG BUILD_USER
 ARG BUILD_HOST
 ARG TARGETARCH
 
-
-WORKDIR /src
-
 ADD https://github.com/syncthing/syncthing/archive/refs/heads/main.zip /tmp/
 
 RUN apt-get update && \
     apt-get install unzip git -y && \
-    ls -la /tmp && \
-    unzip /tmp/main.zip -d /src && \
+    unzip /tmp/main.zip -d /tmp && \
+    mv /tmp/syncthing-main /src && \
     ls -la /src
 
-#COPY . .
-# RUN set -ex && \
-#     apk add git build-base && \
-#     git clone --depth 1 --branch dev-next https://github.com/syncthing/syncthing.git . && \
-#     go build
-
-# RUN ls -la /src/
-
-# ENV CGO_ENABLED=0
-# RUN if [ ! -f syncthing-linux-$TARGETARCH ] ; then \
-#     go run build.go -no-upgrade build syncthing ; \
-#     mv syncthing syncthing-linux-$TARGETARCH ; \
-#   fi
+WORKDIR /src
+ENV CGO_ENABLED=0
+RUN if [ ! -f syncthing-linux-$TARGETARCH ] ; then \
+    go run build.go -no-upgrade build syncthing ; \
+    mv syncthing syncthing-linux-$TARGETARCH ; \
+  fi
 
 #
 # The rest of the Dockerfile uses the binary from the builder, prebuilt or
 # not.
 #
 
-# FROM alpine
-# ARG TARGETARCH
+FROM alpine
+ARG TARGETARCH
 
-# LABEL org.opencontainers.image.authors="The Syncthing Project" \
-#       org.opencontainers.image.url="https://syncthing.net" \
-#       org.opencontainers.image.documentation="https://docs.syncthing.net" \
-#       org.opencontainers.image.source="https://github.com/syncthing/syncthing" \
-#       org.opencontainers.image.vendor="The Syncthing Project" \
-#       org.opencontainers.image.licenses="MPL-2.0" \
-#       org.opencontainers.image.title="Syncthing"
+LABEL org.opencontainers.image.authors="The Syncthing Project" \
+      org.opencontainers.image.url="https://syncthing.net" \
+      org.opencontainers.image.documentation="https://docs.syncthing.net" \
+      org.opencontainers.image.source="https://github.com/syncthing/syncthing" \
+      org.opencontainers.image.vendor="The Syncthing Project" \
+      org.opencontainers.image.licenses="MPL-2.0" \
+      org.opencontainers.image.title="Syncthing"
 
-# EXPOSE 8384 22000/tcp 22000/udp 21027/udp
+EXPOSE 8384 22000/tcp 22000/udp 21027/udp
 
-# VOLUME ["/var/syncthing"]
+VOLUME ["/var/syncthing"]
 
-# RUN apk add --no-cache ca-certificates curl libcap su-exec tzdata
+RUN apk add --no-cache ca-certificates curl libcap su-exec tzdata
 
-# COPY --from=builder /src/syncthing-linux-$TARGETARCH /bin/syncthing
-# COPY --from=builder /src/script/docker-entrypoint.sh /bin/entrypoint.sh
+COPY --from=builder /src/syncthing-linux-$TARGETARCH /bin/syncthing
+COPY --from=builder /src/script/docker-entrypoint.sh /bin/entrypoint.sh
 
-# ENV PUID=1000 PGID=1000 HOME=/var/syncthing
+ENV PUID=1000 PGID=1000 HOME=/var/syncthing
 
-# HEALTHCHECK --interval=1m --timeout=10s \
-#   CMD curl -fkLsS -m 2 127.0.0.1:8384/rest/noauth/health | grep -o --color=never OK || exit 1
+HEALTHCHECK --interval=1m --timeout=10s \
+  CMD curl -fkLsS -m 2 127.0.0.1:8384/rest/noauth/health | grep -o --color=never OK || exit 1
 
-# ENV STGUIADDRESS=0.0.0.0:8384
-# ENV STHOMEDIR=/var/syncthing/config
-# RUN chmod 755 /bin/entrypoint.sh
-# ENTRYPOINT ["/bin/entrypoint.sh", "/bin/syncthing"]
+ENV STGUIADDRESS=0.0.0.0:8384
+ENV STHOMEDIR=/var/syncthing/config
+RUN chmod 755 /bin/entrypoint.sh
+ENTRYPOINT ["/bin/entrypoint.sh", "/bin/syncthing"]