Skip to content

Commit e93f9c2

Browse files
jlebondustymabe
authored andcommitted
cmd-podman-build: stop passing the git yum repos
This goes together with Jonathan's commit in openshift/os#1498 titled "build-node-image.sh: include yum repos from git as part of build". There's no point in adding the repo files already in the git repo into the secret; the node and extension builds already have access to those. So we'd just be duplicating them. Another way to think of this is that the secret injection we do here should be considered equivalent to `get-ocp-repo.sh` in OpenShift CI in terms of what repos get injected.
1 parent 710e574 commit e93f9c2

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/cmd-podman-build

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ case "${target}" in
4040
esac
4141
shift
4242

43-
repos_file="tmp/all.repo"
44-
cat src/config/*.repo > "$repos_file"
43+
echo > tmp/all.repo
4544
if [ -d src/yumrepos ]; then
46-
cat src/yumrepos/*.repo >> "$repos_file"
45+
cat src/yumrepos/*.repo >> tmp/all.repo
4746
fi
4847

4948
if [ "${PRINT_ARGS_AND_EXIT:-}" == "1" ]; then
@@ -56,6 +55,6 @@ fi
5655
$cmd --from "$from" \
5756
-t "${tag}" \
5857
-f "${containerfile}" \
59-
--secret id=yumrepos,src="$repos_file" \
58+
--secret id=yumrepos,src=tmp/all.repo \
6059
-v /etc/pki/ca-trust:/etc/pki/ca-trust:ro \
6160
--security-opt label=disable src/config "$@"

0 commit comments

Comments
 (0)