Updated, regenerated Dockerfiles for all images

ThrowTheSwitch · Nov 29, 2024 · 2625e46 · 2625e46
1 parent bfbb68c
commit 2625e46
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/build/arm-none-eabi-plugins/docker/Dockerfile b/build/arm-none-eabi-plugins/docker/Dockerfile
@@ -143,11 +143,13 @@ RUN set -ex \
   && chown dev:nonroot /home/dev \
   && chmod -R ug+rwx /home/dev \
   # Copy simple Z shell config file & give new user permissions
-  && cp /assets/base/shell/zshrc /home/dev/.zshrc \
+  && cp /assets/base/shell/zshrc-dev /home/dev/.zshrc \
   && chown dev:nonroot /home/dev/.zshrc \
   # Copy welcome file & give new user permissions
   && cp /assets/arm-none-eabi-plugins/shell/welcome /home/dev/.welcome \
   && chown dev:nonroot /home/dev/.welcome \
+  # Copy simple Z shell config file for root user (for running container as `-u root`)
+  && cp /assets/base/shell/zshrc-root /root/.zshrc \
   # Cleanup assets
   && rm -rf /assets
 

diff --git a/build/arm-none-eabi/docker/Dockerfile b/build/arm-none-eabi/docker/Dockerfile
@@ -116,11 +116,13 @@ RUN set -ex \
   && chown dev:nonroot /home/dev \
   && chmod -R ug+rwx /home/dev \
   # Copy simple Z shell config file & give new user permissions
-  && cp /assets/base/shell/zshrc /home/dev/.zshrc \
+  && cp /assets/base/shell/zshrc-dev /home/dev/.zshrc \
   && chown dev:nonroot /home/dev/.zshrc \
   # Copy welcome file & give new user permissions
   && cp /assets/arm-none-eabi/shell/welcome /home/dev/.welcome \
   && chown dev:nonroot /home/dev/.welcome \
+  # Copy simple Z shell config file for root user (for running container as `-u root`)
+  && cp /assets/base/shell/zshrc-root /root/.zshrc \
   # Cleanup assets
   && rm -rf /assets
 

diff --git a/build/plugins/docker/Dockerfile b/build/plugins/docker/Dockerfile
@@ -144,11 +144,13 @@ RUN set -ex \
   && chown dev:nonroot /home/dev \
   && chmod -R ug+rwx /home/dev \
   # Copy simple Z shell config file & give new user permissions
-  && cp /assets/base/shell/zshrc /home/dev/.zshrc \
+  && cp /assets/base/shell/zshrc-dev /home/dev/.zshrc \
   && chown dev:nonroot /home/dev/.zshrc \
   # Copy welcome file & give new user permissions
   && cp /assets/plugins/shell/welcome /home/dev/.welcome \
   && chown dev:nonroot /home/dev/.welcome \
+  # Copy simple Z shell config file for root user (for running container as `-u root`)
+  && cp /assets/base/shell/zshrc-root /root/.zshrc \
   # Cleanup assets
   && rm -rf /assets
 

diff --git a/build/standard/docker/Dockerfile b/build/standard/docker/Dockerfile
@@ -13,6 +13,7 @@ FROM bitnami/minideb:bookworm
 ARG TARGETPLATFORM
 
 # This build argument allows setting the image tag at build time to support CI-based builds
+# The command line must include `--build-arg CONTAINER_VERSION=<version>`
 ARG CONTAINER_VERSION
 
 # Capture TARGETPLATFORM as an environment variable in the image
@@ -116,11 +117,13 @@ RUN set -ex \
   && chown dev:nonroot /home/dev \
   && chmod -R ug+rwx /home/dev \
   # Copy simple Z shell config file & give new user permissions
-  && cp /assets/base/shell/zshrc /home/dev/.zshrc \
+  && cp /assets/base/shell/zshrc-dev /home/dev/.zshrc \
   && chown dev:nonroot /home/dev/.zshrc \
   # Copy welcome file & give new user permissions
   && cp /assets/standard/shell/welcome /home/dev/.welcome \
   && chown dev:nonroot /home/dev/.welcome \
+  # Copy simple Z shell config file for root user (for running container as `-u root`)
+  && cp /assets/base/shell/zshrc-root /root/.zshrc \
   # Cleanup assets
   && rm -rf /assets