From 7499e24519a8d071466b3b517d4b2d911b6666fe Mon Sep 17 00:00:00 2001
From: Aaron Kimbre <aronwk.aaron@gmail.com>
Date: Mon, 1 Jan 2024 21:30:01 -0600
Subject: [PATCH] fix typo add set -e to entrypoint better copy of
 entrypoint.sh and use proper entrypoint

---
 Dockerfile         | 7 ++++---
 README.md          | 4 ++--
 docker-compose.yml | 2 +-
 entrypoint.sh      | 2 ++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 63fab8b5..443b3d70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,10 +26,11 @@ COPY --from=build /app/build/vanity /app/default-vanity
 COPY --from=build /app/build/navmeshes /app/navmeshes
 COPY --from=build /app/build/migrations /app/migrations
 COPY --from=build /app/build/*.dcf /app/
-COPY ./entrypoint.sh /app/
+COPY --chmod=0500 ./entrypoint.sh /app/
 RUN ldconfig
+
 # needed as the container runs with the root user
 # and therefore sudo doesn't exist
 ENV USE_SUDO_AUTH=0
-RUN chmod +x entrypoint.sh
-CMD [ "/app/entrypoint.sh" ]
+
+ENTRYPOINT [ "/app/entrypoint.sh" ]
diff --git a/README.md b/README.md
index 0ce27fa9..278b5c39 100644
--- a/README.md
+++ b/README.md
@@ -353,7 +353,7 @@ Known good *SHA1* checksum of the Darkflame Universe client:
 ## Standalone
 
 For standalone deployment, you can use the image provided via Github's Container Repository:
-`ghcr.io/darkflameuniverse/darkfameserver`
+`ghcr.io/darkflameuniverse/darkflameserver`
 
 This assumes that you have a database deployed to your host or in another docker container.
 
@@ -371,7 +371,7 @@ docker run -it \
     -p 1001:1001/udp \
     -p 2005:2005/udp \
     -p 3000-3300:3000-3300/udp \
-ghcr.io/darkflameuniverse/darkfameserver:latest
+ghcr.io/darkflameuniverse/darkflameserver:latest
 ```
 You will need to replace the `/path/to/`'s to reflect the paths on your host.
 
diff --git a/docker-compose.yml b/docker-compose.yml
index fe8b3923..3f79784c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
   darkfameserver:
     networks:
       - darkflame
-    image: ghcr.io/darkflameuniverse/darkfameserver:latest
+    image: ghcr.io/darkflameuniverse/darkflameserver:latest
     volumes:
       - $HOST_CONFIG_DIR:/app/configs/
       - $HOST_CLIENT_LOCATION:$CLIENT_LOCATION:ro
diff --git a/entrypoint.sh b/entrypoint.sh
index fab0d786..e9e7c5fb 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -e
+
 mkdir -p /app/configs/
 cp -n /app/default-configs/* /app/configs/
 mkdir -p /app/vanity/