Skip to content

Commit 2625e46

Browse files
committed
Updated, regenerated Dockerfiles for all images
1 parent bfbb68c commit 2625e46

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

build/arm-none-eabi-plugins/docker/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,13 @@ RUN set -ex \
143143
&& chown dev:nonroot /home/dev \
144144
&& chmod -R ug+rwx /home/dev \
145145
# Copy simple Z shell config file & give new user permissions
146-
&& cp /assets/base/shell/zshrc /home/dev/.zshrc \
146+
&& cp /assets/base/shell/zshrc-dev /home/dev/.zshrc \
147147
&& chown dev:nonroot /home/dev/.zshrc \
148148
# Copy welcome file & give new user permissions
149149
&& cp /assets/arm-none-eabi-plugins/shell/welcome /home/dev/.welcome \
150150
&& chown dev:nonroot /home/dev/.welcome \
151+
# Copy simple Z shell config file for root user (for running container as `-u root`)
152+
&& cp /assets/base/shell/zshrc-root /root/.zshrc \
151153
# Cleanup assets
152154
&& rm -rf /assets
153155

build/arm-none-eabi/docker/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,13 @@ RUN set -ex \
116116
&& chown dev:nonroot /home/dev \
117117
&& chmod -R ug+rwx /home/dev \
118118
# Copy simple Z shell config file & give new user permissions
119-
&& cp /assets/base/shell/zshrc /home/dev/.zshrc \
119+
&& cp /assets/base/shell/zshrc-dev /home/dev/.zshrc \
120120
&& chown dev:nonroot /home/dev/.zshrc \
121121
# Copy welcome file & give new user permissions
122122
&& cp /assets/arm-none-eabi/shell/welcome /home/dev/.welcome \
123123
&& chown dev:nonroot /home/dev/.welcome \
124+
# Copy simple Z shell config file for root user (for running container as `-u root`)
125+
&& cp /assets/base/shell/zshrc-root /root/.zshrc \
124126
# Cleanup assets
125127
&& rm -rf /assets
126128

build/plugins/docker/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,13 @@ RUN set -ex \
144144
&& chown dev:nonroot /home/dev \
145145
&& chmod -R ug+rwx /home/dev \
146146
# Copy simple Z shell config file & give new user permissions
147-
&& cp /assets/base/shell/zshrc /home/dev/.zshrc \
147+
&& cp /assets/base/shell/zshrc-dev /home/dev/.zshrc \
148148
&& chown dev:nonroot /home/dev/.zshrc \
149149
# Copy welcome file & give new user permissions
150150
&& cp /assets/plugins/shell/welcome /home/dev/.welcome \
151151
&& chown dev:nonroot /home/dev/.welcome \
152+
# Copy simple Z shell config file for root user (for running container as `-u root`)
153+
&& cp /assets/base/shell/zshrc-root /root/.zshrc \
152154
# Cleanup assets
153155
&& rm -rf /assets
154156

build/standard/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ FROM bitnami/minideb:bookworm
1313
ARG TARGETPLATFORM
1414

1515
# This build argument allows setting the image tag at build time to support CI-based builds
16+
# The command line must include `--build-arg CONTAINER_VERSION=<version>`
1617
ARG CONTAINER_VERSION
1718

1819
# Capture TARGETPLATFORM as an environment variable in the image
@@ -116,11 +117,13 @@ RUN set -ex \
116117
&& chown dev:nonroot /home/dev \
117118
&& chmod -R ug+rwx /home/dev \
118119
# Copy simple Z shell config file & give new user permissions
119-
&& cp /assets/base/shell/zshrc /home/dev/.zshrc \
120+
&& cp /assets/base/shell/zshrc-dev /home/dev/.zshrc \
120121
&& chown dev:nonroot /home/dev/.zshrc \
121122
# Copy welcome file & give new user permissions
122123
&& cp /assets/standard/shell/welcome /home/dev/.welcome \
123124
&& chown dev:nonroot /home/dev/.welcome \
125+
# Copy simple Z shell config file for root user (for running container as `-u root`)
126+
&& cp /assets/base/shell/zshrc-root /root/.zshrc \
124127
# Cleanup assets
125128
&& rm -rf /assets
126129

0 commit comments

Comments
 (0)