From e1b83d612fab5fbb908596b96972e320eef0b93d Mon Sep 17 00:00:00 2001
From: Dan Rose <DanOfTheRoses@gmail.com>
Date: Thu, 3 Oct 2024 12:09:59 -0500
Subject: [PATCH] Address all changes suggested by docker build checks See
 https://docs.docker.com/reference/build-checks/ for a list of checks

---
 bootstrap/Dockerfile |  2 +-
 core/Dockerfile      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bootstrap/Dockerfile b/bootstrap/Dockerfile
index edfa8136e9..5d733084c3 100644
--- a/bootstrap/Dockerfile
+++ b/bootstrap/Dockerfile
@@ -4,4 +4,4 @@ COPY startup.json.default bootstrap/ /bootstrap/
 COPY main.py /
 COPY pip.conf /etc/
 RUN python3 bootstrap/setup.py install
-ENTRYPOINT /main.py
+ENTRYPOINT ["/main.py"]
\ No newline at end of file
diff --git a/core/Dockerfile b/core/Dockerfile
index e5b85a5fc0..0f4732f3cf 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -1,5 +1,5 @@
 # Build frontend
-FROM --platform=$BUILDPLATFORM oven/bun:1.0.3-slim AS frontendBuilder
+FROM --platform=$BUILDPLATFORM oven/bun:1.0.3-slim AS frontend-builder
 
 ARG VITE_APP_GIT_DESCRIBE
 ENV VITE_APP_GIT_DESCRIBE=${VITE_APP_GIT_DESCRIBE:-none/none-0-g00000000}
@@ -23,10 +23,10 @@ set -e
 
 EOF
 
-FROM bluerobotics/blueos-base:0.2.1 as base
+FROM bluerobotics/blueos-base:0.2.1 AS base
 
 # Download binaries
-FROM base as downloadBinaries
+FROM base AS download-binaries
 COPY tools /home/pi/tools
 RUN /home/pi/tools/install-static-binaries.sh
 
@@ -80,8 +80,8 @@ RUN /home/pi/services/install-services.sh
 COPY start-blueos-core /usr/bin/start-blueos-core
 COPY run-service.sh /usr/bin/run-service
 
-# Copy binaries and necessary folders from downloadBinaries to this stage
-COPY --from=downloadBinaries \
+# Copy binaries and necessary folders from download-binaries to this stage
+COPY --from=download-binaries \
     /usr/bin/blueos_startup_update.py \
     /usr/bin/bridges \
     /usr/bin/machineid-cli \
@@ -92,8 +92,8 @@ COPY --from=downloadBinaries \
     /usr/bin/ttyd \
     /usr/bin/
 
-# Copy frontend built on frontendBuild to this stage
-COPY --from=frontendBuilder /home/pi/frontend/dist /home/pi/frontend
+# Copy frontend built on frontend-builder to this stage
+COPY --from=frontend-builder /home/pi/frontend/dist /home/pi/frontend
 
 RUN <<-EOF
 set -e
@@ -132,4 +132,4 @@ set -e
 EOF
 
 # Start
-CMD /bin/bash -i /usr/bin/start-blueos-core && sleep infinity
+CMD ["/bin/bash", "-i", "-c", "/usr/bin/start-blueos-core && sleep infinity"]