Skip to content

Commit 9506173

Browse files
travierdebarshiray
authored andcommitted
images: Don't leak NAME and VERSION into the Toolbx container
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
1 parent fc5f568 commit 9506173

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

images/fedora/f36/Containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM registry.fedoraproject.org/fedora:36
22

3-
ENV NAME=fedora-toolbox VERSION=36
3+
ARG NAME=fedora-toolbox
4+
ARG VERSION=36
45
LABEL com.github.containers.toolbox="true" \
56
com.redhat.component="$NAME" \
67
name="$NAME" \

images/fedora/f37/Containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM registry.fedoraproject.org/fedora:37
22

3-
ENV NAME=fedora-toolbox VERSION=37
3+
ARG NAME=fedora-toolbox
4+
ARG VERSION=37
45
LABEL com.github.containers.toolbox="true" \
56
com.redhat.component="$NAME" \
67
name="$NAME" \

images/fedora/f38/Containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM registry.fedoraproject.org/fedora:38
22

3-
ENV NAME=fedora-toolbox VERSION=38
3+
ARG NAME=fedora-toolbox
4+
ARG VERSION=38
45
LABEL com.github.containers.toolbox="true" \
56
com.redhat.component="$NAME" \
67
name="$NAME" \

images/fedora/f39/Containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM registry.fedoraproject.org/fedora:39
22

3-
ENV NAME=fedora-toolbox VERSION=39
3+
ARG NAME=fedora-toolbox
4+
ARG VERSION=39
45
LABEL com.github.containers.toolbox="true" \
56
com.redhat.component="$NAME" \
67
name="$NAME" \

0 commit comments

Comments
 (0)