diff options
| author | baude <bbaude@redhat.com> | 2018-01-30 13:19:01 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-31 20:23:31 +0000 |
| commit | 3c044f9267f62b8f7f88c7395ad325df3bf420f5 (patch) | |
| tree | d868f625ff78b5403fa82b9e7f51ffdaa953356a /Dockerfile | |
| parent | ecb74aa40641cd322112401a593eaf26458e9d24 (diff) | |
| download | podman-3c044f9267f62b8f7f88c7395ad325df3bf420f5.tar.gz podman-3c044f9267f62b8f7f88c7395ad325df3bf420f5.tar.bz2 podman-3c044f9267f62b8f7f88c7395ad325df3bf420f5.zip | |
Ginkgo Tests: ps, pull, push and rm
Migrate ps, pull, push, and rm from bats to ginkgo.
Also, fixed a conditional issue with adding ports
when an image defines the port and the user wants
to override it.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #277
Approved by: baude
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index affcf8b39..42eb00d5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -120,7 +120,8 @@ RUN mkdir -p /etc/cni/net.d/ COPY cni/87-podman-bridge.conflist /etc/cni/net.d/87-podman-bridge.conflist # Make sure we have some policy for pulling images -RUN mkdir -p /etc/containers +RUN mkdir -p /etc/containers && curl https://raw.githubusercontent.com/projectatomic/registries/master/registries.fedora -o /etc/containers/registries.conf + COPY test/policy.json /etc/containers/policy.json COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml |