updating redocly docker tools

Author: sebastian-iancu

.redocly.yaml

@@ -2,17 +2,18 @@
 
 
 # https://redocly.com/docs/api-reference-docs/configuration/functionality/#featuresopenapi-schema
-features.openapi:
-  showObjectSchemaExamples: false
-  schemaExpansionLevel: 0
-  scrollYOffset: 72
-  nativeScrollbars: true
-  htmlTemplate: development/redoc-template.html
-  hideDownloadButton: true
-  # https://redocly.com/docs/api-reference-docs/configuration/theming/
-  theme:
-    colors:
-      tonalOffset: 0.1
-    sidebar:
-      width: "300px"
-      textColor: "#000000"
+theme:
+  openapi:
+    showObjectSchemaExamples: false
+    schemaExpansionLevel: 0
+    scrollYOffset: 72
+    nativeScrollbars: true
+    htmlTemplate: development/redoc-template.html
+    hideDownloadButton: true
+    # https://redocly.com/docs/api-reference-docs/configuration/theming/
+    theme:
+      colors:
+        tonalOffset: 0.1
+      sidebar:
+        width: "300px"
+        textColor: "#000000"

development/bundle.sh

@@ -1,15 +1,15 @@
 cd ..
 
 function render() {
-    docker run --rm -u 1000 -v "$(pwd):/spec" redocly/openapi-cli bundle specifications/"$1".openapi.yaml -o computable/OAS/"$1".openapi.json
+    docker run --rm -u 1000 -v "$(pwd):/spec" redocly/cli bundle specifications/"$1".openapi.yaml -o computable/OAS/"$1".openapi.json
     echo "Creating json files..."
     cd development
     docker-compose run php /app/bin/run computable/OAS/"$1".openapi.json
     cd ..
-    docker run --rm -u 1000 -v "$(pwd):/spec" redocly/openapi-cli bundle computable/OAS/"$1"-codegen.openapi.json --remove-unused-components -o computable/OAS/"$1"-codegen.openapi.yaml
-    docker run --rm -u 1000 -v "$(pwd):/spec" redocly/openapi-cli bundle computable/OAS/"$1"-validation.openapi.json -o computable/OAS/"$1"-validation.openapi.yaml
+    docker run --rm -u 1000 -v "$(pwd):/spec" redocly/cli bundle computable/OAS/"$1"-codegen.openapi.json --remove-unused-components -o computable/OAS/"$1"-codegen.openapi.yaml
+    docker run --rm -u 1000 -v "$(pwd):/spec" redocly/cli bundle computable/OAS/"$1"-validation.openapi.json -o computable/OAS/"$1"-validation.openapi.yaml
     echo "Generating HTML file..."
-    docker run --rm --env NODE_OPTIONS="--max-old-space-size=4048" -u 1000 -v "$(pwd):/spec" redocly/openapi-cli build-docs computable/OAS/"$1"-html.openapi.json --cdn -o docs/"$1".html -t development/redoc-template.html --templateOptions.page_"$1"
+    docker run --rm --env NODE_OPTIONS="--max-old-space-size=4048" -u 1000 -v "$(pwd):/spec" redocly/cli build-docs computable/OAS/"$1"-html.openapi.json --cdn -o docs/"$1".html -t development/redoc-template.html --templateOptions.page_"$1"
     echo "Removing json files..."
     rm -rfv computable/OAS/*.json
 }

development/validate.sh

@@ -2,10 +2,10 @@ cd ..
 
 function validate() {
   echo "Validating specifications/"$1".openapi.yaml with openapi-cli.."
-  docker run --rm -u 1000 -v "$(pwd):/spec" redocly/openapi-cli lint specifications/"$1".openapi.yaml
+  docker run --rm -u 1000 -v "$(pwd):/spec" redocly/cli lint specifications/"$1".openapi.yaml
   echo "Validating computable/OAS/"$1"-(validation|codegen).openapi.yaml with openapi-cli.."
-  docker run --rm -u 1000 -v "$(pwd):/spec" redocly/openapi-cli lint computable/OAS/"$1"-validation.openapi.yaml
-  docker run --rm -u 1000 -v "$(pwd):/spec" redocly/openapi-cli lint computable/OAS/"$1"-codegen.openapi.yaml
+  docker run --rm -u 1000 -v "$(pwd):/spec" redocly/cli lint computable/OAS/"$1"-validation.openapi.yaml
+  docker run --rm -u 1000 -v "$(pwd):/spec" redocly/cli lint computable/OAS/"$1"-codegen.openapi.yaml
   echo "Validating computable/OAS/"$1"-(validation|codegen).openapi.yaml with swagger.."
   docker run --rm -u 1000 -v "$(pwd):/data" swagger-cli validate computable/OAS/"$1"-validation.openapi.yaml
   docker run --rm -u 1000 -v "$(pwd):/data" swagger-cli validate computable/OAS/"$1"-codegen.openapi.yaml

development/watch.sh

@@ -2,7 +2,7 @@ cd ../specifications
 
 case "${1:-}" in
 		overview|ehr|query|definition)
-			docker run -d --rm -v "$(pwd):/spec" -p 80:80 -p 32201:32201 redocly/openapi-cli preview-docs "$1".openapi.yaml -h 0.0.0.0 -p 80
+			docker run -d --rm -v "$(pwd):/spec" -p 80:80 -p 32201:32201 redocly/cli preview-docs "$1".openapi.yaml -h 0.0.0.0 -p 80
 			;;
 		"")
 			echo "Usage: watch.sh [overview|ehr|query|definition]"