diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-15 07:53:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 07:53:28 -0400 |
| commit | 5262c53598ea579db0487587f60f088c68dc1190 (patch) | |
| tree | 4acfcbf240b01297adeb9f90b381c5e11d52c5de /contrib | |
| parent | 373ba8c017a0b5d298a0f53e60bd2069df0173a6 (diff) | |
| parent | 660208cea38fdebb302f674b40bfd755f02def2d (diff) | |
| download | podman-5262c53598ea579db0487587f60f088c68dc1190.tar.gz podman-5262c53598ea579db0487587f60f088c68dc1190.tar.bz2 podman-5262c53598ea579db0487587f60f088c68dc1190.zip | |
Merge pull request #6921 from vrothberg/2.0-wildcard-search
[2.0] search: allow wildcards
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/lib.sh | 1 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index a048a3068..c77eaca12 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -392,7 +392,6 @@ install_test_configs() { # as the default). This config prevents allocation of network address space used # by default in google cloud. https://cloud.google.com/vpc/docs/vpc#ip-ranges install -v -D -m 644 $SCRIPT_BASE/99-do-not-use-google-subnets.conflist /etc/cni/net.d/ - install -v -D -m 644 ./test/policy.json /etc/containers/ install -v -D -m 644 ./test/registries.conf /etc/containers/ } diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index 657b5accf..9568038bb 100644 --- a/contrib/gate/Dockerfile +++ b/contrib/gate/Dockerfile @@ -27,7 +27,6 @@ RUN set -x && \ # Install cni config COPY cni/87-podman-bridge.conflist /etc/cni/net.d/87-podman-bridge.conflist # Make sure we have some policy for pulling images -COPY test/policy.json /etc/containers/policy.json COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml WORKDIR "$GOSRC" |