Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/cmd-build-with-buildah
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Usage: coreos-assembler build-with-buildah
--autolock=VERSION If no base lockfile used, create one from any arch build of `VERSION`.
Note this is automatically enabled when adding to an existing multi-arch
non-strict build.
--skip-prune Skip prunning previous builds
--skip-prune Skip prunning previous builds.
--strict Only allow installing locked packages when using lockfiles.
--parent-build=VERSION This option does nothing and is provided for backwards compatibility.
--force This option does nothing and is provided for backwards compatibility.
EOF
Expand All @@ -31,8 +32,9 @@ VERSIONARY=
DIRECT=
AUTOLOCK_VERSION=
SKIP_PRUNE=
STRICT=
rc=0
options=$(getopt --options h,d --longoptions help,version:,versionary,direct,autolock:,skip-prune,parent-build:,force -- "$@") || rc=$?
options=$(getopt --options h,d --longoptions help,version:,versionary,direct,autolock:,skip-prune,parent-build:,force,strict -- "$@") || rc=$?
[ $rc -eq 0 ] || {
print_help
exit 1
Expand Down Expand Up @@ -61,6 +63,9 @@ while true; do
--skip-prune)
SKIP_PRUNE=1
;;
--strict)
STRICT=1
;;
--parent-build)
shift
;;
Expand Down Expand Up @@ -161,6 +166,10 @@ build_with_buildah() {
-v /etc/pki/ca-trust:/etc/pki/ca-trust:ro
fi

if [ -n "${STRICT}" ]; then
set -- "$@" --build-arg STRICT_MODE=1
fi

if [ -d overrides ]; then
if [ -d overrides/rpm ]; then
# Clean up any previous repo metadata
Expand Down
Loading