diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-21 09:53:29 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-22 13:19:08 +0000 |
| commit | 2c81a756e310d59702b52ffc30d84aa9e11a8dbd (patch) | |
| tree | dccca49fc4638f9739a0baf2682808b15aa51bb4 /Dockerfile.Fedora | |
| parent | 4ad7e7368140f4677f8919f647cd5d6951d7e60e (diff) | |
| download | podman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.tar.gz podman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.tar.bz2 podman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.zip | |
Update the version of conmon used in test
Also start using podmin in /usr/libexec/podman rather then crio.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #979
Approved by: baude
Diffstat (limited to 'Dockerfile.Fedora')
| -rw-r--r-- | Dockerfile.Fedora | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora index f75074213..589180beb 100644 --- a/Dockerfile.Fedora +++ b/Dockerfile.Fedora @@ -8,6 +8,7 @@ RUN dnf -y install btrfs-progs-devel \ findutils \ git \ glib2-devel \ + glibc-static \ gnupg \ golang \ golang-github-cpuguy83-go-md2man \ @@ -58,16 +59,16 @@ RUN set -x \ && go get github.com/onsi/gomega/... # Install conmon -ENV CRIO_COMMIT 814c6ab0913d827543696b366048056a31d9529c +ENV CRIO_COMMIT 66788a10e57f42faf741c2f149d0ee6635063014 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/kubernetes-incubator/cri-o.git "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ && cd "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \ && git fetch origin --tags \ && git checkout -q "$CRIO_COMMIT" \ - && mkdir bin \ - && make conmon \ - && install -D -m 755 bin/conmon /usr/libexec/crio/conmon \ + && make \ + && make bin/conmon \ + && install -D -m 755 bin/conmon /usr/libexec/podman/conmon \ && rm -rf "$GOPATH" # Install cni config |