diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-15 04:17:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 04:17:24 -0400 |
| commit | c2690c24530d202c5fef07bc8ef7b3d3c5ad747c (patch) | |
| tree | ec4439f0fbb516eee51b2619ea08689eb7ce2c18 | |
| parent | 3f026eb6a682a68e69f9376b72157a8f084e575c (diff) | |
| parent | 7f586a47d02bfbda7d0dc362651fb06e5347ac39 (diff) | |
| download | podman-c2690c24530d202c5fef07bc8ef7b3d3c5ad747c.tar.gz podman-c2690c24530d202c5fef07bc8ef7b3d3c5ad747c.tar.bz2 podman-c2690c24530d202c5fef07bc8ef7b3d3c5ad747c.zip | |
Merge pull request #6576 from cevich/fix_in_podman
Fix missing code during in_podman build
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index 623747295..16552e6b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,7 @@ ENV SCRIPT_BASE=./contrib/cirrus ENV PACKER_BASE=$SCRIPT_BASE/packer # Only add minimal tooling necessary to complete setup. -ADD /$SCRIPT_BASE $GOSRC/$SCRIPT_BASE -ADD /hack/install_catatonit.sh $GOSRC/hack/ -ADD /cni/*.conflist $GOSRC/cni/ -ADD /test/*.json $GOSRC/test/ -ADD /test/*.conf $GOSRC/test/ +ADD / $GOSRC WORKDIR $GOSRC # Re-use repositories and package setup as in VMs under CI |