From 325e9325734f5e8542775e9d733dce3d34c69e99 Mon Sep 17 00:00:00 2001
From: Aleksey Shundrik <al.shundrik@insspring.com>
Date: Thu, 5 Nov 2020 14:37:50 +0300
Subject: [PATCH 1/4] rl-492/openapi-generator OpenapiGenerator: - add ability
 to run v5.0.0-beta openapi generator version - add ability to run
 update-models.sh without DOCS_DEFINITION_FOLDER environment

---
 dev.md           | 6 +-----
 update-models.sh | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dev.md b/dev.md
index 6dc721e..5c4e28a 100644
--- a/dev.md
+++ b/dev.md
@@ -1,11 +1,7 @@
 # Development
 
 To regenerate models, clone [latest OpenAPI definitions](https://github.com/regulaforensics/DocumentReader-web-openapi)
-and set `DEFINITION_FOLDER` as path to cloned directory, for example:
-```bash
-export DOCS_DEFINITION_FOLDER="/home/user/projects/DocumentReader-web-openapi"
-```
-Then use next command from the project root:
+and use next command from the project root:
 ```bash
 ./update-models.sh
 ```
diff --git a/update-models.sh b/update-models.sh
index 95db73e..4d1a439 100755
--- a/update-models.sh
+++ b/update-models.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
-openapitools/openapi-generator-cli generate -g python \
+docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${PWD}/../DocumentReader-web-openapi:/definitions" \
+openapitools/openapi-generator-cli:v5.0.0-beta generate -g python \
 -i /definitions/index.yml -o /client -c /client/generator-config.json \
 -t /client/generator-templates

From effed5a5a8974ab278df4e3e3a7d7efff369fc55 Mon Sep 17 00:00:00 2001
From: Aleksey Shundrik <al.shundrik@insspring.com>
Date: Thu, 5 Nov 2020 14:45:26 +0300
Subject: [PATCH 2/4] rl-492/openapi-generator OpenapiGenerator: - add
 DOCS_DEFINITION_FOLDER variable into update-models.sh

---
 update-models.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/update-models.sh b/update-models.sh
index 4d1a439..81c76d2 100755
--- a/update-models.sh
+++ b/update-models.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${PWD}/../DocumentReader-web-openapi:/definitions" \
+DOCS_DEFINITION_FOLDER="${PWD}/../DocumentReader-web-openapi" \
+\
+&& docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
 openapitools/openapi-generator-cli:v5.0.0-beta generate -g python \
 -i /definitions/index.yml -o /client -c /client/generator-config.json \
 -t /client/generator-templates

From 0b687c7c0e8036a92742bf4f7e2be7c401958577 Mon Sep 17 00:00:00 2001
From: Aleksey Shundrik <al.shundrik@insspring.com>
Date: Thu, 5 Nov 2020 14:49:16 +0300
Subject: [PATCH 3/4] rl-492/openapi-generator OpenapiGenerator: - rm {} for
 DOCS_DEFINITION_FOLDER variable into update-models.sh

---
 update-models.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update-models.sh b/update-models.sh
index 81c76d2..f7f263b 100755
--- a/update-models.sh
+++ b/update-models.sh
@@ -2,7 +2,7 @@
 
 DOCS_DEFINITION_FOLDER="${PWD}/../DocumentReader-web-openapi" \
 \
-&& docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
+&& docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "$DOCS_DEFINITION_FOLDER:/definitions" \
 openapitools/openapi-generator-cli:v5.0.0-beta generate -g python \
 -i /definitions/index.yml -o /client -c /client/generator-config.json \
 -t /client/generator-templates

From 5d92aac47a15a86553dd475d9e2bba72901b9759 Mon Sep 17 00:00:00 2001
From: Aleksey Shundrik <al.shundrik@insspring.com>
Date: Thu, 5 Nov 2020 16:46:59 +0300
Subject: [PATCH 4/4] rl-492/openapi-generator OpenapiGenerator: - change
 openapi generator tag: v5.0.0-beta -> v5.0.0-beta2

---
 update-models.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update-models.sh b/update-models.sh
index f7f263b..62a4bd4 100755
--- a/update-models.sh
+++ b/update-models.sh
@@ -3,6 +3,6 @@
 DOCS_DEFINITION_FOLDER="${PWD}/../DocumentReader-web-openapi" \
 \
 && docker run --user "$(id -u):$(id -g)" --rm -v "${PWD}:/client" -v "$DOCS_DEFINITION_FOLDER:/definitions" \
-openapitools/openapi-generator-cli:v5.0.0-beta generate -g python \
+openapitools/openapi-generator-cli:v5.0.0-beta2 generate -g python \
 -i /definitions/index.yml -o /client -c /client/generator-config.json \
 -t /client/generator-templates