From ed1667456b7cd26b42a29b5e92f381b3a8528f43 Mon Sep 17 00:00:00 2001 From: Giacomo Bernini Date: Thu, 28 May 2020 15:32:02 +0200 Subject: [PATCH] fixed dockerfile and jenkins validation script --- docker/Dockerfile | 8 ++++---- docker/validate-in-docker.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5d7ff5d7..9b3d8380 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ # Copyright ETSI 2017 # See: https://forge.etsi.org/etsi-forge-copyright-statement.txt -FROM alpine:3.6 +FROM alpine:3.10.0 RUN env RUN apk update @@ -16,9 +16,9 @@ RUN gem install rdoc --pre || gem install rdoc --pre RUN gem install asciidoctor-pdf-cjk RUN wget https://forge.etsi.org/swagger2markup-cli-1.3.2.jar RUN npm config set proxy $http_proxy -RUN npm install -g swagger-tools@0.10.3 -RUN npm install -g json-refs@3.0.4 -RUN npm install -g yamljs@0.3.0 +RUN npm install -g swagger-cli +RUN npm install -g json-refs +RUN npm install -g yamljs ADD validate-in-docker.sh /validate-in-docker.sh RUN chmod +x /validate-in-docker.sh diff --git a/docker/validate-in-docker.sh b/docker/validate-in-docker.sh index 716291a1..c9d54f73 100755 --- a/docker/validate-in-docker.sh +++ b/docker/validate-in-docker.sh @@ -32,7 +32,7 @@ function validate_api () { mv "${deliverable}-${api}-API.pdf" "../build/" echo "--- Validating ${merged_file}" - swagger-tools validate "${merged_file}" + swagger-cli validate "${merged_file}" vres=$? echo "--- Validation done ($vres)." -- GitLab