Skip to content

Commit 7cdef7a

Browse files
mkarleskymkarlesky
committed
🐛 Regenerated files after content fixes
1 parent 495dbe8 commit 7cdef7a

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ FROM bitnami/minideb:bookworm
1212
# recognized platform string (e.g. "linux/amd64").
1313
ARG TARGETPLATFORM
1414

15+
# Docker image name used for Metadata, set via Docker build argument
16+
# The command line must include `--build-arg IMAGE_NAME=<name>` <org>/<name>
17+
ARG IMAGE_NAME
18+
1519
# This build argument allows setting the image tag at build time to support CI-based builds
1620
# The command line must include `--build-arg CONTAINER_VERSION=<version>`
1721
ARG CONTAINER_VERSION
1822

1923
# Capture TARGETPLATFORM as an environment variable in the image
2024
ENV CONTAINER_PLATFORM=$TARGETPLATFORM
2125

22-
# Docker image name used for Metadata, set via Docker build argument
23-
# The command line must include `--build-arg IMAGE_NAME=<name>`
24-
ENV MADSCIENCELAB_IMAGE_NAME=$IMAGE_NAME
25-
2626
# Docker image tag for internal container use, set via Docker build argument
2727
ENV MADSCIENCELAB_VERSION=$CONTAINER_VERSION
2828

@@ -33,7 +33,7 @@ ENV MADSCIENCELAB_VERSION=$CONTAINER_VERSION
3333

3434
## Metadata
3535
LABEL org.opencontainers.image.source=https://github.com/ThrowTheSwitch/MadScienceLabDocker/releases
36-
LABEL org.opencontainers.image.url=https://hub.docker.com/r/throwtheswitch/$MADSCIENCELAB_IMAGE_NAME
36+
LABEL org.opencontainers.image.url=https://hub.docker.com/r/$IMAGE_NAME
3737
LABEL org.opencontainers.image.base.name=docker.io/bitnami/minideb
3838
LABEL org.opencontainers.image.title="Mad Science Lab"
3939
LABEL org.opencontainers.image.description="Contains Ceedling, supporting frameworks, and GNU C toolchain to provide a unit testing and build system environment for C projects"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ FROM bitnami/minideb:bookworm
1212
# recognized platform string (e.g. "linux/amd64").
1313
ARG TARGETPLATFORM
1414

15+
# Docker image name used for Metadata, set via Docker build argument
16+
# The command line must include `--build-arg IMAGE_NAME=<name>` <org>/<name>
17+
ARG IMAGE_NAME
18+
1519
# This build argument allows setting the image tag at build time to support CI-based builds
1620
# The command line must include `--build-arg CONTAINER_VERSION=<version>`
1721
ARG CONTAINER_VERSION
1822

1923
# Capture TARGETPLATFORM as an environment variable in the image
2024
ENV CONTAINER_PLATFORM=$TARGETPLATFORM
2125

22-
# Docker image name used for Metadata, set via Docker build argument
23-
# The command line must include `--build-arg IMAGE_NAME=<name>`
24-
ENV MADSCIENCELAB_IMAGE_NAME=$IMAGE_NAME
25-
2626
# Docker image tag for internal container use, set via Docker build argument
2727
ENV MADSCIENCELAB_VERSION=$CONTAINER_VERSION
2828

@@ -33,7 +33,7 @@ ENV MADSCIENCELAB_VERSION=$CONTAINER_VERSION
3333

3434
## Metadata
3535
LABEL org.opencontainers.image.source=https://github.com/ThrowTheSwitch/MadScienceLabDocker/releases
36-
LABEL org.opencontainers.image.url=https://hub.docker.com/r/throwtheswitch/$MADSCIENCELAB_IMAGE_NAME
36+
LABEL org.opencontainers.image.url=https://hub.docker.com/r/$IMAGE_NAME
3737
LABEL org.opencontainers.image.base.name=docker.io/bitnami/minideb
3838
LABEL org.opencontainers.image.title="Mad Science Lab"
3939
LABEL org.opencontainers.image.description="Contains Ceedling, supporting frameworks, and GNU C toolchain to provide a unit testing and build system environment for C projects"

‎build/plugins/assets/shell/welcome‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * Essential Unix utilities";
88
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * Essential build tools (make, etc.)"; fi
99
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * nano for simple text editing"; fi
1010
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * The GNU Compiler Collection (gcc, etc.)"; fi
11-
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * Standard C libraries and multilib support"; fi
11+
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * Standard C libraries"; fi
12+
if [[ "$CONTAINER_PLATFORM" == linux/amd64 ]]; then echo " * GCC Multilib support for platform architectures"; fi
1213
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * The GNU Debugger (gdb) for Ceedling's backtrace feature"; fi
1314
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * gcovr for use by GCov plugin"; fi
1415
if [[ "$CONTAINER_PLATFORM" == linux/amd64 ]]; then echo " * reportgenerator for use by GCov plugin"; fi

‎build/plugins/docker/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ FROM bitnami/minideb:bookworm
1212
# recognized platform string (e.g. "linux/amd64").
1313
ARG TARGETPLATFORM
1414

15+
# Docker image name used for Metadata, set via Docker build argument
16+
# The command line must include `--build-arg IMAGE_NAME=<name>` <org>/<name>
17+
ARG IMAGE_NAME
18+
1519
# This build argument allows setting the image tag at build time to support CI-based builds
1620
# The command line must include `--build-arg CONTAINER_VERSION=<version>`
1721
ARG CONTAINER_VERSION
1822

1923
# Capture TARGETPLATFORM as an environment variable in the image
2024
ENV CONTAINER_PLATFORM=$TARGETPLATFORM
2125

22-
# Docker image name used for Metadata, set via Docker build argument
23-
# The command line must include `--build-arg IMAGE_NAME=<name>`
24-
ENV MADSCIENCELAB_IMAGE_NAME=$IMAGE_NAME
25-
2626
# Docker image tag for internal container use, set via Docker build argument
2727
ENV MADSCIENCELAB_VERSION=$CONTAINER_VERSION
2828

@@ -33,7 +33,7 @@ ENV MADSCIENCELAB_VERSION=$CONTAINER_VERSION
3333

3434
## Metadata
3535
LABEL org.opencontainers.image.source=https://github.com/ThrowTheSwitch/MadScienceLabDocker/releases
36-
LABEL org.opencontainers.image.url=https://hub.docker.com/r/throwtheswitch/$MADSCIENCELAB_IMAGE_NAME
36+
LABEL org.opencontainers.image.url=https://hub.docker.com/r/$IMAGE_NAME
3737
LABEL org.opencontainers.image.base.name=docker.io/bitnami/minideb
3838
LABEL org.opencontainers.image.title="Mad Science Lab"
3939
LABEL org.opencontainers.image.description="Contains Ceedling, supporting frameworks, and GNU C toolchain to provide a unit testing and build system environment for C projects"

‎build/standard/assets/shell/welcome‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * Essential Unix utilities";
88
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * Essential build tools (make, etc.)"; fi
99
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * nano for simple text editing"; fi
1010
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * The GNU Compiler Collection (gcc, etc.)"; fi
11-
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * Standard C libraries and multilib support"; fi
11+
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * Standard C libraries"; fi
12+
if [[ "$CONTAINER_PLATFORM" == linux/amd64 ]]; then echo " * GCC Multilib support for platform architectures"; fi
1213
if [[ "$CONTAINER_PLATFORM" == * ]]; then echo " * The GNU Debugger (gdb) for Ceedling's backtrace feature"; fi
1314
echo "\e[0m"
1415
echo " NOTICE: Container user \`$(whoami)\` lacks root priveleges as a security best practice."

‎build/standard/docker/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ FROM bitnami/minideb:bookworm
1212
# recognized platform string (e.g. "linux/amd64").
1313
ARG TARGETPLATFORM
1414

15+
# Docker image name used for Metadata, set via Docker build argument
16+
# The command line must include `--build-arg IMAGE_NAME=<name>` <org>/<name>
17+
ARG IMAGE_NAME
18+
1519
# This build argument allows setting the image tag at build time to support CI-based builds
1620
# The command line must include `--build-arg CONTAINER_VERSION=<version>`
1721
ARG CONTAINER_VERSION
1822

1923
# Capture TARGETPLATFORM as an environment variable in the image
2024
ENV CONTAINER_PLATFORM=$TARGETPLATFORM
2125

22-
# Docker image name used for Metadata, set via Docker build argument
23-
# The command line must include `--build-arg IMAGE_NAME=<name>`
24-
ENV MADSCIENCELAB_IMAGE_NAME=$IMAGE_NAME
25-
2626
# Docker image tag for internal container use, set via Docker build argument
2727
ENV MADSCIENCELAB_VERSION=$CONTAINER_VERSION
2828

@@ -33,7 +33,7 @@ ENV MADSCIENCELAB_VERSION=$CONTAINER_VERSION
3333

3434
## Metadata
3535
LABEL org.opencontainers.image.source=https://github.com/ThrowTheSwitch/MadScienceLabDocker/releases
36-
LABEL org.opencontainers.image.url=https://hub.docker.com/r/throwtheswitch/$MADSCIENCELAB_IMAGE_NAME
36+
LABEL org.opencontainers.image.url=https://hub.docker.com/r/$IMAGE_NAME
3737
LABEL org.opencontainers.image.base.name=docker.io/bitnami/minideb
3838
LABEL org.opencontainers.image.title="Mad Science Lab"
3939
LABEL org.opencontainers.image.description="Contains Ceedling, supporting frameworks, and GNU C toolchain to provide a unit testing and build system environment for C projects"

0 commit comments

Comments
 (0)