diff options
| author | baude <bbaude@redhat.com> | 2018-02-09 12:31:47 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-02-10 11:24:16 +0000 |
| commit | 773aa61f6622f52696434d883bb82c7d25125fd8 (patch) | |
| tree | 87bd714d009eb5ef34019c939b897f353092b51b /Dockerfile.CentOSDev | |
| parent | b07c8d6a734577318a4f147be8acd35a6deb54ae (diff) | |
| download | podman-773aa61f6622f52696434d883bb82c7d25125fd8.tar.gz podman-773aa61f6622f52696434d883bb82c7d25125fd8.tar.bz2 podman-773aa61f6622f52696434d883bb82c7d25125fd8.zip | |
Revert to md2man master
Upstream md2man is working again. We can revert to using it instead
of a specific commit id.
Also, add make integration.CentOS for testing
Signed-off-by: baude <bbaude@redhat.com>
Closes: #320
Approved by: rhatdan
Diffstat (limited to 'Dockerfile.CentOSDev')
| -rw-r--r-- | Dockerfile.CentOSDev | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/Dockerfile.CentOSDev b/Dockerfile.CentOSDev deleted file mode 100644 index 217837ce0..000000000 --- a/Dockerfile.CentOSDev +++ /dev/null @@ -1,71 +0,0 @@ -FROM registry.centos.org/centos/centos:7 - -RUN yum -y install btrfs-progs-devel \ - atomic-registries \ - bzip2 \ - device-mapper-devel \ - findutils \ - git \ - glib2-devel \ - gnupg \ - golang \ - gpgme-devel \ - libassuan-devel \ - libseccomp-devel \ - libselinux-devel \ - skopeo-containers \ - runc \ - make \ - ostree-devel \ - python \ - which\ - golang-github-cpuguy83-go-md2man \ - iptables && yum clean all - -# Install CNI plugins -ENV CNI_COMMIT 7480240de9749f9a0a5c8614b17f1f03e0c06ab9 -RUN set -x \ - && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/containernetworking/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \ - && cd "$GOPATH/src/github.com/containernetworking/plugins" \ - && git checkout -q "$CNI_COMMIT" \ - && ./build.sh \ - && mkdir -p /usr/libexec/cni \ - && cp bin/* /usr/libexec/cni \ - && rm -rf "$GOPATH" - -# Install ginkgo -RUN set -x \ - && export GOPATH=/go \ - && go get -u github.com/onsi/ginkgo/ginkgo \ - && install -D -m 755 "$GOPATH"/bin/ginkgo /usr/bin/ - -# Install gomega -RUN set -x \ - && export GOPATH=/go \ - && go get github.com/onsi/gomega/... - -# Install conmon -ENV CRIO_COMMIT 814c6ab0913d827543696b366048056a31d9529c -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 \ - && rm -rf "$GOPATH" - -# Install cni config -#RUN make install.cni -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 -COPY test/policy.json /etc/containers/policy.json -COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml - -WORKDIR /go/src/github.com/projectatomic/libpod |