From b47ea12a990c9c22fe471ac7e849ea8a3712721e Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Mon, 19 Oct 2015 16:57:38 -0700 Subject: [PATCH] gen-swagger-docs now uses local swagger spec --- hack/gen-swagger-doc/Dockerfile | 6 +++++- hack/gen-swagger-doc/gen-swagger-docs.sh | 6 ++++-- hack/gen-swagger-doc/run-gen-swagger-docs.sh | 7 +++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hack/gen-swagger-doc/Dockerfile b/hack/gen-swagger-doc/Dockerfile index b5144bc65a2..27e2d3b9b13 100644 --- a/hack/gen-swagger-doc/Dockerfile +++ b/hack/gen-swagger-doc/Dockerfile @@ -12,6 +12,10 @@ COPY gen-swagger-docs.sh build/ #run the script once to download the dependent java libraries into the image RUN mkdir /output -RUN build/gen-swagger-docs.sh v1 https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/api/swagger-spec/v1.json https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/pkg/api/v1/register.go +RUN mkdir /swagger-source +RUN wget https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/swagger-spec/v1.json -O /swagger-source/v1.json +RUN build/gen-swagger-docs.sh v1 https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/pkg/api/v1/register.go +RUN rm /output/* +RUN rm /swagger-source/* ENTRYPOINT ["build/gen-swagger-docs.sh"] diff --git a/hack/gen-swagger-doc/gen-swagger-docs.sh b/hack/gen-swagger-doc/gen-swagger-docs.sh index fffd8e790b5..3ed3a9c0e33 100755 --- a/hack/gen-swagger-doc/gen-swagger-docs.sh +++ b/hack/gen-swagger-doc/gen-swagger-docs.sh @@ -22,8 +22,10 @@ set -o pipefail cd /build/ -wget "$2" -O input.json -wget "$3" -O register.go +wget "$2" -O register.go + +# gendocs takes "input.json" as the input swagger spec. +cp /swagger-source/"$1".json input.json ./gradle-2.5/bin/gradle gendocs --info diff --git a/hack/gen-swagger-doc/run-gen-swagger-docs.sh b/hack/gen-swagger-doc/run-gen-swagger-docs.sh index 356b2c5864f..e7109d362c9 100755 --- a/hack/gen-swagger-doc/run-gen-swagger-docs.sh +++ b/hack/gen-swagger-doc/run-gen-swagger-docs.sh @@ -21,15 +21,14 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. V1_PATH="$PWD/${KUBE_ROOT}/docs/api-reference/v1/" V1BETA1_PATH="$PWD/${KUBE_ROOT}/docs/api-reference/extensions/v1beta1" +SWAGGER_PATH="$PWD/${KUBE_ROOT}/api/swagger-spec/" mkdir -p $V1_PATH mkdir -p $V1BETA1_PATH -docker run -v $V1_PATH:/output gcr.io/google_containers/gen-swagger-docs:v2 \ +docker run -v $V1_PATH:/output -v ${SWAGGER_PATH}:/swagger-source gcr.io/google_containers/gen-swagger-docs:v3 \ v1 \ - https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/swagger-spec/v1.json \ https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/api/v1/register.go -docker run -v $V1BETA1_PATH:/output gcr.io/google_containers/gen-swagger-docs:v2 \ +docker run -v $V1BETA1_PATH:/output -v ${SWAGGER_PATH}:/swagger-source gcr.io/google_containers/gen-swagger-docs:v3 \ v1beta1 \ - https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/swagger-spec/v1beta1.json \ https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/apis/extensions/v1beta1/register.go