From f14aa9057945ca468e3cabc84bf4a2ff588991af Mon Sep 17 00:00:00 2001
From: Joe Corall <jjc223@lehigh.edu>
Date: Thu, 8 Aug 2024 09:32:06 -0400
Subject: [PATCH] lint

---
 Dockerfile | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5af1c8f..1e45ac4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,26 @@
 FROM golang:1.22-alpine
 
+SHELL ["/bin/ash", "-o", "pipefail", "-c"]
+
 ENV GOSU_VERSION 1.17
-RUN set -eux; \
-	\
-	apk add --no-cache --virtual .gosu-deps \
+RUN apk add --no-cache --virtual .gosu-deps \
 		ca-certificates==20240705-r0 \
 		dpkg==1.22.6-r1 \
 		gnupg==2.4.5-r0 && \
 	dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \
-	wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
-	wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
-	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
-	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
-	gpgconf --kill all; \
-	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
-	apk del --no-network .gosu-deps; \
-	chmod +x /usr/local/bin/gosu; \
-	gosu --version; \
-	gosu nobody true
+	wget -q -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" && \
+	wget -q -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" && \
+	GNUPGHOME="$(mktemp -d)" && \
+	export GNUPGHOME && \
+	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
+	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
+	gpgconf --kill all && \
+	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
+	apk del --no-network .gosu-deps && \
+	chmod +x /usr/local/bin/gosu
 
 WORKDIR /app
 
-SHELL ["/bin/ash", "-o", "pipefail", "-c"]
-
 RUN adduser -S -G nobody scyllaridae
 
 RUN apk update && \