From 943d9df7742764f8be0377b37be3ba34a74b1185 Mon Sep 17 00:00:00 2001
From: marco <marco@crowdsec.net>
Date: Wed, 17 Jul 2024 12:41:46 +0200
Subject: [PATCH] lint: dockerfiles

---
 Dockerfile        |  8 ++++----
 Dockerfile.debian | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 45443e971ac..e035b678a30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ ENV BUILD_VERSION=${BUILD_VERSION}
 
 # wizard.sh requires GNU coreutils
 RUN apk add --no-cache git g++ gcc libc-dev make bash gettext binutils-gold coreutils pkgconfig && \
-    wget https://github.com/google/re2/archive/refs/tags/${RE2_VERSION}.tar.gz && \
+    wget -q https://github.com/google/re2/archive/refs/tags/${RE2_VERSION}.tar.gz && \
     tar -xzf ${RE2_VERSION}.tar.gz && \
     cd re2-${RE2_VERSION} && \
     make install && \
@@ -32,7 +32,7 @@ RUN make clean release DOCKER_BUILD=1 BUILD_STATIC=1 CGO_CFLAGS="-D_LARGEFILE64_
     # In case we need to remove agents here..
     # cscli machines list -o json | yq '.[].machineId' | xargs -r cscli machines delete
 
-FROM alpine:latest as slim
+FROM alpine:latest AS slim
 
 RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community tzdata bash rsync && \
     mkdir -p /staging/etc/crowdsec && \
@@ -47,9 +47,9 @@ COPY --from=build /go/src/crowdsec/docker/config.yaml /staging/etc/crowdsec/conf
 COPY --from=build /var/lib/crowdsec /staging/var/lib/crowdsec
 RUN yq -n '.url="http://0.0.0.0:8080"' | install -m 0600 /dev/stdin /staging/etc/crowdsec/local_api_credentials.yaml
 
-ENTRYPOINT /bin/bash /docker_start.sh
+ENTRYPOINT ["/bin/bash", "/docker_start.sh"]
 
-FROM slim as full
+FROM slim AS full
 
 # Due to the wizard using cp -n, we have to copy the config files directly from the source as -n does not exist in busybox cp
 # The files are here for reference, as users will need to mount a new version to be actually able to use notifications
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 6fc5a15f766..ec0e6fd030f 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -37,7 +37,7 @@ RUN make clean release DOCKER_BUILD=1 BUILD_STATIC=1 && \
     # In case we need to remove agents here..
     # cscli machines list -o json | yq '.[].machineId' | xargs -r cscli machines delete
 
-FROM debian:bookworm-slim as slim
+FROM debian:bookworm-slim AS slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBCONF_NOWARNINGS="yes"
@@ -63,9 +63,9 @@ COPY --from=build /go/src/crowdsec/docker/config.yaml /staging/etc/crowdsec/conf
 RUN yq -n '.url="http://0.0.0.0:8080"' | install -m 0600 /dev/stdin /staging/etc/crowdsec/local_api_credentials.yaml && \
     yq eval -i ".plugin_config.group = \"nogroup\"" /staging/etc/crowdsec/config.yaml
 
-ENTRYPOINT /bin/bash docker_start.sh
+ENTRYPOINT ["/bin/bash", "docker_start.sh"]
 
-FROM slim as plugins
+FROM slim AS plugins
 
 # Due to the wizard using cp -n, we have to copy the config files directly from the source as -n does not exist in busybox cp
 # The files are here for reference, as users will need to mount a new version to be actually able to use notifications
@@ -79,10 +79,10 @@ COPY --from=build \
 
 COPY --from=build /usr/local/lib/crowdsec/plugins /usr/local/lib/crowdsec/plugins
 
-FROM slim as geoip
+FROM slim AS geoip
 
 COPY --from=build /var/lib/crowdsec /staging/var/lib/crowdsec
 
-FROM plugins as full
+FROM plugins AS full
 
 COPY --from=build /var/lib/crowdsec /staging/var/lib/crowdsec