diff options
| -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 |