Skip to content

Commit

Permalink
images: Don't leak NAME and VERSION into the Toolbx container
Browse files Browse the repository at this point in the history
Note that there can be only one ARG per line.  Otherwise, the build may
fail with some build systems.  eg., Fedora's [1], which uses Docker, not
Podman.

Only the images for currently maintained Fedoras (ie., 36, 37, 38 & 39)
were updated.

[1] https://koji.fedoraproject.org/koji/taskinfo?taskID=98150241

#188
  • Loading branch information
travier authored and debarshiray committed Mar 1, 2023
1 parent fc5f568 commit 9506173
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion images/fedora/f36/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM registry.fedoraproject.org/fedora:36

ENV NAME=fedora-toolbox VERSION=36
ARG NAME=fedora-toolbox
ARG VERSION=36
LABEL com.github.containers.toolbox="true" \
com.redhat.component="$NAME" \
name="$NAME" \
Expand Down
3 changes: 2 additions & 1 deletion images/fedora/f37/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM registry.fedoraproject.org/fedora:37

ENV NAME=fedora-toolbox VERSION=37
ARG NAME=fedora-toolbox
ARG VERSION=37
LABEL com.github.containers.toolbox="true" \
com.redhat.component="$NAME" \
name="$NAME" \
Expand Down
3 changes: 2 additions & 1 deletion images/fedora/f38/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM registry.fedoraproject.org/fedora:38

ENV NAME=fedora-toolbox VERSION=38
ARG NAME=fedora-toolbox
ARG VERSION=38
LABEL com.github.containers.toolbox="true" \
com.redhat.component="$NAME" \
name="$NAME" \
Expand Down
3 changes: 2 additions & 1 deletion images/fedora/f39/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM registry.fedoraproject.org/fedora:39

ENV NAME=fedora-toolbox VERSION=39
ARG NAME=fedora-toolbox
ARG VERSION=39
LABEL com.github.containers.toolbox="true" \
com.redhat.component="$NAME" \
name="$NAME" \
Expand Down

0 comments on commit 9506173

Please sign in to comment.