gen-swagger-docs now uses local swagger spec

This commit is contained in:
Chao Xu 2015-10-19 16:57:38 -07:00
parent 0d7b53a201
commit b47ea12a99
3 changed files with 12 additions and 7 deletions

View File

@ -12,6 +12,10 @@ COPY gen-swagger-docs.sh build/
#run the script once to download the dependent java libraries into the image #run the script once to download the dependent java libraries into the image
RUN mkdir /output 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"] ENTRYPOINT ["build/gen-swagger-docs.sh"]

View File

@ -22,8 +22,10 @@ set -o pipefail
cd /build/ cd /build/
wget "$2" -O input.json wget "$2" -O register.go
wget "$3" -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 ./gradle-2.5/bin/gradle gendocs --info

View File

@ -21,15 +21,14 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
V1_PATH="$PWD/${KUBE_ROOT}/docs/api-reference/v1/" V1_PATH="$PWD/${KUBE_ROOT}/docs/api-reference/v1/"
V1BETA1_PATH="$PWD/${KUBE_ROOT}/docs/api-reference/extensions/v1beta1" V1BETA1_PATH="$PWD/${KUBE_ROOT}/docs/api-reference/extensions/v1beta1"
SWAGGER_PATH="$PWD/${KUBE_ROOT}/api/swagger-spec/"
mkdir -p $V1_PATH mkdir -p $V1_PATH
mkdir -p $V1BETA1_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 \ 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 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 \ 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 https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/apis/extensions/v1beta1/register.go