From ea23621c70e660ec3f0ed97a1a44b7922bee5c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 7 May 2018 18:32:28 +0200 Subject: [PATCH] Fix test suite failures with go >= 1.10 The hack/common.sh script contains local go_version go_version=($(go version)) if [[ "${go_version[2]}" < "go1.5" ]]; then # fail fi which does a lexicographic string comparison, and fails with 1.10. Just drop it, the fedora:latest image is not likely to revert to 1.5. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index ce9dbcc6..980f50a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,8 @@ RUN set -x \ RUN set -x \ && export GOPATH=$(mktemp -d) \ && git clone --depth 1 -b v1.5.0-alpha.3 git://github.com/openshift/origin "$GOPATH/src/github.com/openshift/origin" \ + # The sed edits out a "go < 1.5" check which works incorrectly with go ≥ 1.10. \ + && sed -i -e 's/\[\[ "\${go_version\[2]}" < "go1.5" ]]/false/' "$GOPATH/src/github.com/openshift/origin/hack/common.sh" \ && (cd "$GOPATH/src/github.com/openshift/origin" && make clean build && make all WHAT=cmd/dockerregistry) \ && cp -a "$GOPATH/src/github.com/openshift/origin/_output/local/bin/linux"/*/* /usr/local/bin \ && cp "$GOPATH/src/github.com/openshift/origin/images/dockerregistry/config.yml" /atomic-registry-config.yml \