containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
baude 2018-02-09 12:31:47 -06:00 committed by Atomic Bot
parent b07c8d6a73
commit 773aa61f66
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.papr_prepare.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -xeuo pipefail set -xeuo pipefail
DIST=$(cat /etc/redhat-release | awk '{print $1}') DIST=${DIST:=Fedora}
IMAGE=fedorapodmanbuild IMAGE=fedorapodmanbuild
PYTHON=python3 PYTHON=python3
if [[ ${DIST} != "Fedora" ]]; then if [[ ${DIST} != "Fedora" ]]; then

0
Dockerfile.CentOSDev → Dockerfile.CentOS
View File

9
Makefile
View File

@ -112,6 +112,10 @@ integration: libpodimage
integration.fedora: integration.fedora:
DIST=Fedora sh .papr_prepare.sh DIST=Fedora sh .papr_prepare.sh
integration.centos:
DIST=CentOS sh .papr_prepare.sh
testunit: testunit:
$(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES) $(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES)
@ -193,10 +197,7 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
.install.md2man: .gopathok .install.md2man: .gopathok
if [ ! -x "$(GOPATH)/bin/go-md2man" ]; then \ if [ ! -x "$(GOPATH)/bin/go-md2man" ]; then \
go get -d github.com/cpuguy83/go-md2man; \ go get -u github.com/cpuguy83/go-md2man; \
cd $(GOPATH)/src/github.com/cpuguy83/go-md2man; \
git checkout 20f5889cbdc3c73dbd2862796665e7c465ade7d1; \
go install github.com/cpuguy83/go-md2man; \
fi fi
.install.ostree: .gopathok .install.ostree: .gopathok