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 | |
| 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
| -rw-r--r-- | .papr_prepare.sh | 2 | ||||
| -rw-r--r-- | Dockerfile.CentOS (renamed from Dockerfile.CentOSDev) | 0 | ||||
| -rw-r--r-- | Makefile | 9 |
3 files changed, 6 insertions, 5 deletions
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.CentOSDev b/Dockerfile.CentOS index 217837ce0..217837ce0 100644 --- a/Dockerfile.CentOSDev +++ b/Dockerfile.CentOS @@ -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 |