Update docker base image ubuntu22 and nodejs version18; add README

Change-Id: Ia9eb2627984971e14d8f6afe62d30cf970b29c1b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/Dockerfile b/Dockerfile
index 5aa23bc..869ae70 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,14 +15,14 @@
 
 # This Dockerfile is intented for devops and deb package generation
 
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y git build-essential curl \
     && curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-    && echo "deb https://deb.nodesource.com/node_10.x bionic main" | tee -a /etc/apt/sources.list.d/nodesource.list \
-    && echo "deb-src https://deb.nodesource.com/node_10.x bionic main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+    && echo "deb https://deb.nodesource.com/node_18.x jammy main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+    && echo "deb-src https://deb.nodesource.com/node_18.x jammy main" | tee -a /etc/apt/sources.list.d/nodesource.list \
     && apt-get update && apt-get install -y nodejs
-RUN npm install --save @openapi-contrib/json-schema-to-openapi-schema
+#RUN npm install --save @openapi-contrib/json-schema-to-openapi-schema
 RUN npm install -g swagger-cli
 RUN npm install -g speccy
 

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..e3b0af5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,30 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+See the License for the specific language governing permissions and
+limitations under the License
+-->
+# SOL005
+
+OSM client library and console script
+
+## Build docker image to test OpenAPI spec
+
+```bash
+docker build -t osm/sol005-devel .
+```
+
+## Test OpenAPI spec with swagger-cli and speccy
+
+```bash
+docker run -it -v .:/root/SOL005 -w /root/SOL005 osm/sol005-devel /root/SOL005/devops-stages/stage-test.sh
+```
+

diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh
index b7693a7..7cf8518 100755 (executable)
--- a/devops-stages/stage-test.sh
+++ b/devops-stages/stage-test.sh
@@ -16,12 +16,16 @@
 specfiles=$(ls | egrep "^[^.]*.(json|yaml)")
 
 fres=0
+
+echo "Files: $specfiles"
 for i in $specfiles ; do
     echo "-- Validating and linting OpenAPI file $i..."
     swagger-cli validate "$i"
     res=$?
+    echo "Result swagger-cli validate: $res"
     speccy lint "$i" --skip openapi-tags-alphabetical
     res2=$?
+    echo "Result speccy lint: $res2"
     fres=$(($fres||$res||$res2))
     echo "--- Validator returned $res, linter returned $res2."
 done