From 773aa61f6622f52696434d883bb82c7d25125fd8 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 9 Feb 2018 12:31:47 -0600 Subject: 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 Closes: #320 Approved by: rhatdan --- .papr_prepare.sh | 2 +- Dockerfile.CentOS | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile.CentOSDev | 71 ---------------------------------------------------- Makefile | 9 ++++--- 4 files changed, 77 insertions(+), 76 deletions(-) create mode 100644 Dockerfile.CentOS delete mode 100644 Dockerfile.CentOSDev diff --git a/.papr_prepare.sh b/.papr_prepare.sh index 730cd6540..b30abfc66 100644 --- a/.papr_prepare.sh +++ b/.papr_prepare.sh @@ -1,7 +1,7 @@ #!/bin/bash set -xeuo pipefail -DIST=$(cat /etc/redhat-release | awk '{print $1}') +DIST=${DIST:=Fedora} IMAGE=fedorapodmanbuild PYTHON=python3 if [[ ${DIST} != "Fedora" ]]; then diff --git a/Dockerfile.CentOS b/Dockerfile.CentOS new file mode 100644 index 000000000..217837ce0 --- /dev/null +++ b/Dockerfile.CentOS @@ -0,0 +1,71 @@ +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 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 diff --git a/Makefile b/Makefile index bb5779d25..3e337a431 100644 --- a/Makefile +++ b/Makefile @@ -112,6 +112,10 @@ integration: libpodimage integration.fedora: DIST=Fedora sh .papr_prepare.sh + +integration.centos: + DIST=CentOS sh .papr_prepare.sh + testunit: $(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES) @@ -193,10 +197,7 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.md2man: .gopathok if [ ! -x "$(GOPATH)/bin/go-md2man" ]; then \ - go get -d github.com/cpuguy83/go-md2man; \ - cd $(GOPATH)/src/github.com/cpuguy83/go-md2man; \ - git checkout 20f5889cbdc3c73dbd2862796665e7c465ade7d1; \ - go install github.com/cpuguy83/go-md2man; \ + go get -u github.com/cpuguy83/go-md2man; \ fi .install.ostree: .gopathok -- cgit v1.2.3-54-g00ecf