diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-15 10:35:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 10:35:31 -0400 |
| commit | 81f41ca0d2a0acd9896bb60b1096baa236725dec (patch) | |
| tree | 241e977b225718d34afd71979142c83e1958a415 /test/buildah-bud/buildah-tests.diff | |
| parent | 4b6ffda31c258aadcbc6171a7dd745d0fb17393c (diff) | |
| parent | 962675c1482abc3a8458ef060552687a784282a6 (diff) | |
| download | podman-81f41ca0d2a0acd9896bb60b1096baa236725dec.tar.gz podman-81f41ca0d2a0acd9896bb60b1096baa236725dec.tar.bz2 podman-81f41ca0d2a0acd9896bb60b1096baa236725dec.zip | |
Merge pull request #11585 from flouthoc/bump-buildah-1-23-0
vendor: Bump github.com/containers/buildah from 1.22.3 to 1.23.0
Diffstat (limited to 'test/buildah-bud/buildah-tests.diff')
| -rw-r--r-- | test/buildah-bud/buildah-tests.diff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff index bb28e11c9..87923484f 100644 --- a/test/buildah-bud/buildah-tests.diff +++ b/test/buildah-bud/buildah-tests.diff @@ -70,7 +70,7 @@ index 166316d5..775d7c9b 100644 + local podman_or_buildah=${BUILDAH_BINARY} + local _opts="${ROOTDIR_OPTS} ${BUILDAH_REGISTRY_OPTS}" -+ if [[ $1 == "bud" || $1 == "build-using-dockerfile" ]]; then ++ if [[ $1 == "build" || $1 == "build-using-dockerfile" ]]; then + shift + # podman defaults to --layers=true; buildah to --false. + # If command line includes explicit --layers, leave it untouched, |