Commit 3cf16c22 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed dockerfile and jenkins validation script

parent 65793fe5

docker/Dockerfile

+4 −4
Original line number Diff line number Diff line 
# 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.2

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

docker/validate-in-docker.sh

+1 −1
Original line number Diff line number Diff line
@@ -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)."