Merge branch 'master' into tini

java/16j9/Dockerfile

@@ -3,12 +3,24 @@ FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-16-jdk
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
-						&& useradd -d /home/container -m container
+            && apt install -y \
+                curl \
+                lsof \
+                ca-certificates \
+                openssl \
+                git \
+                tar \
+                sqlite3 \
+                fontconfig \
+                tzdata \
+                iproute2 \
+                libfreetype6 \
+                tini
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
 STOPSIGNAL SIGINT
@@ -17,3 +29,4 @@ COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
 RUN         chmod +x /entrypoint.sh
 ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
 CMD         ["/entrypoint.sh"]
+