From 7e7d340ab82e13ed7353ac6a3edbca03193df447 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Thu, 26 Oct 2023 12:26:31 +0200
Subject: [PATCH] ntfy : hadolint Containerfile

---
 podman-ntfy/container/Containerfile | 32 +++++++++++------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/podman-ntfy/container/Containerfile b/podman-ntfy/container/Containerfile
index b03f7b9..ea00f16 100644
--- a/podman-ntfy/container/Containerfile
+++ b/podman-ntfy/container/Containerfile
@@ -3,34 +3,26 @@ FROM docker.io/library/golang:1.20-alpine3.17 AS build-env
 
 ARG NTFY_VERSION
 
-#Build deps
-RUN apk --no-cache add build-base git nodejs npm upx py3-pip
-
-#Install gorealeaser
-RUN go install github.com/goreleaser/goreleaser@latest
-
-#Setup repo
-RUN git clone --depth=1 -b "${NTFY_VERSION}" https://github.com/binwiederhier/ntfy.git
-
-#Build
-RUN cd ntfy && make web && make docs && make cli-linux-amd64
+RUN apk --no-cache add build-base git nodejs npm upx py3-pip \
+    && go install github.com/goreleaser/goreleaser@latest \
+    && git clone --depth=1 -b "${NTFY_VERSION}" https://github.com/binwiederhier/ntfy.git /ntfybuild
+WORKDIR /ntfybuild
+RUN make web && make docs && make cli-linux-amd64
 
 FROM docker.io/library/alpine:3.17
 LABEL maintainer="contact@garbaye.fr"
 
 EXPOSE 80/tcp
 
-RUN apk add --no-cache tzdata && \
-adduser \
-    -S -H -D \
-    ntfy && \
-mkdir /etc/ntfy && \
-chown ntfy:nogroup /etc/ntfy && \
-mkdir /var/cache/ntfy && \
-chown ntfy:nogroup /var/cache/ntfy
+RUN apk add --no-cache tzdata \
+    && adduser -S -H -D ntfy \
+    && mkdir /etc/ntfy \
+    && chown ntfy:nogroup /etc/ntfy \
+    && mkdir /var/cache/ntfy \
+    && chown ntfy:nogroup /var/cache/ntfy
 
 USER ntfy
 
 ENTRYPOINT ["ntfy"]
 
-COPY --from=build-env /go/ntfy/dist/ntfy_linux_amd64_linux_amd64_v1/ntfy /usr/bin/ntfy
+COPY --from=build-env /ntfybuild/dist/ntfy_linux_amd64_linux_amd64_v1/ntfy /usr/bin/ntfy