Browse code

go-swagger: fix panic

This is an attempt to fix go-swagger panic under Golang 1.13.

Details:
* https://github.com/go-openapi/jsonpointer/pull/4
* https://github.com/go-swagger/go-swagger/pull/2059

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 93f9b902af89f82367d750aa871d40f25ccd99ca)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Kir Kolyshkin authored on 2019/10/04 10:57:29
Showing 1 changed files
... ...
@@ -80,10 +80,12 @@ RUN set -x \
80 80
 
81 81
 FROM base AS swagger
82 82
 # Install go-swagger for validating swagger.yaml
83
-ENV GO_SWAGGER_COMMIT c28258affb0b6251755d92489ef685af8d4ff3eb
83
+# This is https://github.com/kolyshkin/go-swagger/tree/golang-1.13-fix
84
+# TODO: move to under moby/ or fix upstream go-swagger to work for us.
85
+ENV GO_SWAGGER_COMMIT 5793aa66d4b4112c2602c716516e24710e4adbb5
84 86
 RUN set -x \
85 87
 	&& export GOPATH="$(mktemp -d)" \
86
-	&& git clone https://github.com/go-swagger/go-swagger.git "$GOPATH/src/github.com/go-swagger/go-swagger" \
88
+	&& git clone https://github.com/kolyshkin/go-swagger.git "$GOPATH/src/github.com/go-swagger/go-swagger" \
87 89
 	&& (cd "$GOPATH/src/github.com/go-swagger/go-swagger" && git checkout -q "$GO_SWAGGER_COMMIT") \
88 90
 	&& go build -o /build/swagger github.com/go-swagger/go-swagger/cmd/swagger \
89 91
 	&& rm -rf "$GOPATH"