From 68247e908cc78a591b486eb48448975e223916e9 Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 07:16:34 +0200
Subject: [PATCH 01/13] =?UTF-8?q?=D0=A1=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2=201=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 70c5925..613bc88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,9 +10,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy: 
-      matrix:
-        dir: [ 'jdk', 'oscript' ]
 
     steps:
     - name: Checkout repository
@@ -25,5 +22,14 @@ jobs:
       uses: docker/setup-buildx-action@v2
 
     - name: Build Docker images
+      env:
+        DOCKER_REGISTRY_URL: 'localhost:5000'
+        DOCKER_LOGIN: ""
+        DOCKER_PASSWORD: ""
+        ONEC_USERNAME: ${{ secrets.ONEC_USERNAME}}
+        ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD}}
+        ONEC_VERSION: '8.3.18.1520'
       run: |
-        docker build -t oscript:latest -f ${{ matrix.dir }}/Dockerfile .
+        docker run -d -p 5000:5000 --name registry registry:2
+        ./build-base-swarm-jenkins-agent.sh
+        

From c5e52b99cff0c7c7ec91428700048f01d8a7d6c9 Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 07:33:43 +0200
Subject: [PATCH 02/13] No login if no credentials provided

---
 build-base-swarm-jenkins-agent.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build-base-swarm-jenkins-agent.sh b/build-base-swarm-jenkins-agent.sh
index 1dd9e13..6a7c14d 100755
--- a/build-base-swarm-jenkins-agent.sh
+++ b/build-base-swarm-jenkins-agent.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ $DOCKER_LOGIN != '' ] ; then
+    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+fi
 
 if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
     docker system prune -af

From 4576846cdb0a0097d7e30e969f1026a32b4401fb Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 08:02:51 +0200
Subject: [PATCH 03/13] Update build.yml

---
 .github/workflows/build.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 613bc88..a16e693 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy: 
+      matrix:
+        script: [ 'build-base-k8s-jenkins-agent.sh', 'build-base-k8s-jenkins-agent.sh', 'build-crs.sh', 'build-edt-k8s-agent.sh', 'build-edt-swarm-agent.sh', 'build-oscript-k8s-agent.sh', 'build-oscript-swarm-agent.sh', 'build-server.sh' ]
 
     steps:
     - name: Checkout repository
@@ -28,8 +31,8 @@ jobs:
         DOCKER_PASSWORD: ""
         ONEC_USERNAME: ${{ secrets.ONEC_USERNAME}}
         ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD}}
-        ONEC_VERSION: '8.3.18.1520'
+        ONEC_VERSION: '8.3.24.1624'
       run: |
         docker run -d -p 5000:5000 --name registry registry:2
-        ./build-base-swarm-jenkins-agent.sh
+        ./${{ matrix.script }}
         

From 801720b7fa1fe8bbac25ae061f964c464e4bb20b Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 06:07:17 +0000
Subject: [PATCH 04/13] Wrap docker login

---
 build-base-k8s-jenkins-agent.sh | 4 +++-
 build-crs.sh                    | 4 +++-
 build-edt-k8s-agent.sh          | 4 +++-
 build-edt-swarm-agent.sh        | 4 +++-
 build-oscript-k8s-agent.sh      | 4 +++-
 build-oscript-swarm-agent.sh    | 4 +++-
 build-server.sh                 | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/build-base-k8s-jenkins-agent.sh b/build-base-k8s-jenkins-agent.sh
index 226c770..1f299bf 100755
--- a/build-base-k8s-jenkins-agent.sh
+++ b/build-base-k8s-jenkins-agent.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ $DOCKER_LOGIN != '' ] ; then
+    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+fi
 
 if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
     docker system prune -af
diff --git a/build-crs.sh b/build-crs.sh
index cb47d8e..78d63be 100755
--- a/build-crs.sh
+++ b/build-crs.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ $DOCKER_LOGIN != '' ] ; then
+    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+fi
 
 if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
     docker system prune -af
diff --git a/build-edt-k8s-agent.sh b/build-edt-k8s-agent.sh
index 198fa80..ed3f5b1 100755
--- a/build-edt-k8s-agent.sh
+++ b/build-edt-k8s-agent.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ $DOCKER_LOGIN != '' ] ; then
+    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+fi
 
 if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
     docker system prune -af
diff --git a/build-edt-swarm-agent.sh b/build-edt-swarm-agent.sh
index 594ea19..26b1aec 100755
--- a/build-edt-swarm-agent.sh
+++ b/build-edt-swarm-agent.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ $DOCKER_LOGIN != '' ] ; then
+    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+fi
 
 if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
     docker system prune -af
diff --git a/build-oscript-k8s-agent.sh b/build-oscript-k8s-agent.sh
index 9fd593d..e9755ca 100755
--- a/build-oscript-k8s-agent.sh
+++ b/build-oscript-k8s-agent.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ $DOCKER_LOGIN != '' ] ; then
+    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+fi
 
 if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
     docker system prune -af
diff --git a/build-oscript-swarm-agent.sh b/build-oscript-swarm-agent.sh
index 1a44166..2289739 100755
--- a/build-oscript-swarm-agent.sh
+++ b/build-oscript-swarm-agent.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ $DOCKER_LOGIN != '' ] ; then
+    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+fi
 
 if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
     docker system prune -af
diff --git a/build-server.sh b/build-server.sh
index bdbbc61..fd1a61b 100755
--- a/build-server.sh
+++ b/build-server.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
 
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ $DOCKER_LOGIN != '' ] ; then
+    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+fi
 
 if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
     docker system prune -af

From 5947641afc1ea2f569c12ee9927ef636649c3a7b Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 08:12:26 +0200
Subject: [PATCH 05/13] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B5=D0=B4=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a16e693..2f3174e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,6 +32,7 @@ jobs:
         ONEC_USERNAME: ${{ secrets.ONEC_USERNAME}}
         ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD}}
         ONEC_VERSION: '8.3.24.1624'
+        EDT_VERSION: '2021.2.7'
       run: |
         docker run -d -p 5000:5000 --name registry registry:2
         ./${{ matrix.script }}

From 40b32ced8f88d34bbdfc569fcc604997a715f381 Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 08:19:20 +0200
Subject: [PATCH 06/13] DOWNLOADER_REGISTRY_URL

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2f3174e..53a02f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,6 +27,7 @@ jobs:
     - name: Build Docker images
       env:
         DOCKER_REGISTRY_URL: 'localhost:5000'
+        DOWNLOADER_REGISTRY_URL: 'localhost:5000'
         DOCKER_LOGIN: ""
         DOCKER_PASSWORD: ""
         ONEC_USERNAME: ${{ secrets.ONEC_USERNAME}}

From 717e0bdb5d63bb0fc96dd0945f3a23070d4e0792 Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 08:24:09 +0200
Subject: [PATCH 07/13] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D1=82=20=D1=83?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8=D1=8F=20DOWNLOADER=5FREGIS?=
 =?UTF-8?q?TRY=5FURL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 53a02f2..2f3174e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,6 @@ jobs:
     - name: Build Docker images
       env:
         DOCKER_REGISTRY_URL: 'localhost:5000'
-        DOWNLOADER_REGISTRY_URL: 'localhost:5000'
         DOCKER_LOGIN: ""
         DOCKER_PASSWORD: ""
         ONEC_USERNAME: ${{ secrets.ONEC_USERNAME}}

From 271eb065889c47a7e33483bfe70d44536e918b4b Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 08:25:01 +0200
Subject: [PATCH 08/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20?=
 =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build-edt-k8s-agent.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-edt-k8s-agent.sh b/build-edt-k8s-agent.sh
index ed3f5b1..0f01f8f 100755
--- a/build-edt-k8s-agent.sh
+++ b/build-edt-k8s-agent.sh
@@ -32,7 +32,7 @@ docker build \
     --build-arg ONEC_USERNAME=$ONEC_USERNAME \
     --build-arg ONEC_PASSWORD=$ONEC_PASSWORD \
     --build-arg EDT_VERSION="$EDT_VERSION" \
-    --build-arg DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
+    --build-arg DOWNLOADER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
     --build-arg DOWNLOADER_IMAGE=oscript-downloader \
     --build-arg DOWNLOADER_TAG=latest \
     -t $DOCKER_REGISTRY_URL/edt:$edt_escaped \

From 1044a20d2878c0453592153f8db8da74874d54f0 Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 08:27:31 +0200
Subject: [PATCH 09/13] =?UTF-8?q?=D0=92=D1=8B=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20fail-fast?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2f3174e..f511dbd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy: 
+    strategy:
+      fail-fast: false
       matrix:
         script: [ 'build-base-k8s-jenkins-agent.sh', 'build-base-k8s-jenkins-agent.sh', 'build-crs.sh', 'build-edt-k8s-agent.sh', 'build-edt-swarm-agent.sh', 'build-oscript-k8s-agent.sh', 'build-oscript-swarm-agent.sh', 'build-server.sh' ]
 

From 4c69ef31087ab184eb1d1b5c138f204f41887b8f Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 08:37:07 +0200
Subject: [PATCH 10/13] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20crs,=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=BF=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=B5?=
 =?UTF-8?q?=D0=B4=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f511dbd..c350b3b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        script: [ 'build-base-k8s-jenkins-agent.sh', 'build-base-k8s-jenkins-agent.sh', 'build-crs.sh', 'build-edt-k8s-agent.sh', 'build-edt-swarm-agent.sh', 'build-oscript-k8s-agent.sh', 'build-oscript-swarm-agent.sh', 'build-server.sh' ]
+        script: [ 'build-base-k8s-jenkins-agent.sh', 'build-base-k8s-jenkins-agent.sh', 'build-edt-k8s-agent.sh', 'build-edt-swarm-agent.sh', 'build-oscript-k8s-agent.sh', 'build-oscript-swarm-agent.sh', 'build-server.sh' ]
 
     steps:
     - name: Checkout repository
@@ -33,7 +33,7 @@ jobs:
         ONEC_USERNAME: ${{ secrets.ONEC_USERNAME}}
         ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD}}
         ONEC_VERSION: '8.3.24.1624'
-        EDT_VERSION: '2021.2.7'
+        EDT_VERSION: '2023.3.6'
       run: |
         docker run -d -p 5000:5000 --name registry registry:2
         ./${{ matrix.script }}

From 6fb745c803ed987ca8778c1f5261c116d647428d Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 08:47:12 +0200
Subject: [PATCH 11/13] Apply suggestions

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c350b3b..c7e647e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        script: [ 'build-base-k8s-jenkins-agent.sh', 'build-base-k8s-jenkins-agent.sh', 'build-edt-k8s-agent.sh', 'build-edt-swarm-agent.sh', 'build-oscript-k8s-agent.sh', 'build-oscript-swarm-agent.sh', 'build-server.sh' ]
+        script: [ 'build-base-k8s-jenkins-agent.sh', 'build-base-swarm-jenkins-agent.sh', 'build-edt-k8s-agent.sh', 'build-edt-swarm-agent.sh', 'build-oscript-k8s-agent.sh', 'build-oscript-swarm-agent.sh', 'build-server.sh' ]
 
     steps:
     - name: Checkout repository
@@ -37,4 +37,3 @@ jobs:
       run: |
         docker run -d -p 5000:5000 --name registry registry:2
         ./${{ matrix.script }}
-        

From ce5076a81f91a5d029f5c7f35881fd79f7897d3c Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 21:02:06 +0000
Subject: [PATCH 12/13] Apply coderabbit suggestions

---
 .github/workflows/build.yml       |  2 +-
 build-base-k8s-jenkins-agent.sh   | 17 +++++++++++------
 build-base-swarm-jenkins-agent.sh | 17 +++++++++++------
 build-crs.sh                      | 17 +++++++++++------
 build-edt-k8s-agent.sh            | 21 +++++++++++++--------
 build-edt-swarm-agent.sh          | 21 +++++++++++++--------
 build-oscript-k8s-agent.sh        | 19 ++++++++++++-------
 build-oscript-swarm-agent.sh      | 19 ++++++++++++-------
 build-server.sh                   | 17 +++++++++++------
 9 files changed, 95 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7e647e..740c44c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        script: [ 'build-base-k8s-jenkins-agent.sh', 'build-base-swarm-jenkins-agent.sh', 'build-edt-k8s-agent.sh', 'build-edt-swarm-agent.sh', 'build-oscript-k8s-agent.sh', 'build-oscript-swarm-agent.sh', 'build-server.sh' ]
+        script: [ 'build-base-k8s-jenkins-agent.sh', 'build-base-swarm-jenkins-agent.sh', 'build-edt-swarm-agent.sh', 'build-oscript-k8s-agent.sh', 'build-oscript-swarm-agent.sh', 'build-server.sh' ]
 
     steps:
     - name: Checkout repository
diff --git a/build-base-k8s-jenkins-agent.sh b/build-base-k8s-jenkins-agent.sh
index 1f299bf..80db3a5 100755
--- a/build-base-k8s-jenkins-agent.sh
+++ b/build-base-k8s-jenkins-agent.sh
@@ -1,16 +1,21 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -euo pipefail
 
-if [ $DOCKER_LOGIN != '' ] ; then
-    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
+    if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
+        echo "Docker login failed"
+        exit 1
+    fi
+else
+    echo "Skipping Docker login due to missing credentials"
 fi
 
-if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
+if [ "${DOCKER_SYSTEM_PRUNE}" = 'true' ] ; then
     docker system prune -af
 fi
 
 last_arg='.'
-if [ $NO_CACHE = 'true' ] ; then
+if [ "${NO_CACHE}" = 'true' ] ; then
     last_arg='--no-cache .'
 fi
 
diff --git a/build-base-swarm-jenkins-agent.sh b/build-base-swarm-jenkins-agent.sh
index 6a7c14d..9622772 100755
--- a/build-base-swarm-jenkins-agent.sh
+++ b/build-base-swarm-jenkins-agent.sh
@@ -1,16 +1,21 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -euo pipefail
 
-if [ $DOCKER_LOGIN != '' ] ; then
-    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
+    if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
+        echo "Docker login failed"
+        exit 1
+    fi
+else
+    echo "Skipping Docker login due to missing credentials"
 fi
 
-if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
+if [ "${DOCKER_SYSTEM_PRUNE}" = 'true' ] ; then
     docker system prune -af
 fi
 
 last_arg='.'
-if [ $NO_CACHE = 'true' ] ; then
+if [ "${NO_CACHE}" = 'true' ] ; then
     last_arg='--no-cache .'
 fi
 
diff --git a/build-crs.sh b/build-crs.sh
index 78d63be..ff14370 100755
--- a/build-crs.sh
+++ b/build-crs.sh
@@ -1,16 +1,21 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -euo pipefail
 
-if [ $DOCKER_LOGIN != '' ] ; then
-    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
+    if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
+        echo "Docker login failed"
+        exit 1
+    fi
+else
+    echo "Skipping Docker login due to missing credentials"
 fi
 
-if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
+if [ "${DOCKER_SYSTEM_PRUNE}" = 'true' ] ; then
     docker system prune -af
 fi
 
 last_arg='.'
-if [ $NO_CACHE = 'true' ] ; then
+if [ "${NO_CACHE}" = 'true' ] ; then
     last_arg='--no-cache .'
 fi
 
diff --git a/build-edt-k8s-agent.sh b/build-edt-k8s-agent.sh
index 0f01f8f..7d9693a 100755
--- a/build-edt-k8s-agent.sh
+++ b/build-edt-k8s-agent.sh
@@ -1,17 +1,22 @@
-#!/bin/bash
-set -e
-
-if [ $DOCKER_LOGIN != '' ] ; then
-    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
+    if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
+        echo "Docker login failed"
+        exit 1
+    fi
+else
+    echo "Skipping Docker login due to missing credentials"
 fi
 
-if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
+if [ "${DOCKER_SYSTEM_PRUNE}" = 'true' ] ; then
     docker system prune -af
 fi
 
 last_arg='.'
-if [ $NO_CACHE = 'true' ] ; then
-	last_arg='--no-cache .'
+if [ "${NO_CACHE}" = 'true' ] ; then
+    last_arg='--no-cache .'
 fi
 
 edt_version=$EDT_VERSION
diff --git a/build-edt-swarm-agent.sh b/build-edt-swarm-agent.sh
index 26b1aec..326c2b6 100755
--- a/build-edt-swarm-agent.sh
+++ b/build-edt-swarm-agent.sh
@@ -1,17 +1,22 @@
-#!/bin/bash
-set -e
-
-if [ $DOCKER_LOGIN != '' ] ; then
-    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
+    if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
+        echo "Docker login failed"
+        exit 1
+    fi
+else
+    echo "Skipping Docker login due to missing credentials"
 fi
 
-if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
+if [ "${DOCKER_SYSTEM_PRUNE}" = 'true' ] ; then
     docker system prune -af
 fi
 
 last_arg='.'
-if [ $NO_CACHE = 'true' ] ; then
-	last_arg='--no-cache .'
+if [ "${NO_CACHE}" = 'true' ] ; then
+    last_arg='--no-cache .'
 fi
 
 edt_version=$EDT_VERSION
diff --git a/build-oscript-k8s-agent.sh b/build-oscript-k8s-agent.sh
index e9755ca..e35f975 100755
--- a/build-oscript-k8s-agent.sh
+++ b/build-oscript-k8s-agent.sh
@@ -1,17 +1,22 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -euo pipefail
 
-if [ $DOCKER_LOGIN != '' ] ; then
-    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
+    if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
+        echo "Docker login failed"
+        exit 1
+    fi
+else
+    echo "Skipping Docker login due to missing credentials"
 fi
 
-if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
+if [ "${DOCKER_SYSTEM_PRUNE}" = 'true' ] ; then
     docker system prune -af
 fi
 
 last_arg='.'
-if [ $NO_CACHE = 'true' ] ; then
-	last_arg='--no-cache .'
+if [ "${NO_CACHE}" = 'true' ] ; then
+    last_arg='--no-cache .'
 fi
 
 docker build \
diff --git a/build-oscript-swarm-agent.sh b/build-oscript-swarm-agent.sh
index 2289739..73d61f4 100755
--- a/build-oscript-swarm-agent.sh
+++ b/build-oscript-swarm-agent.sh
@@ -1,17 +1,22 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -euo pipefail
 
-if [ $DOCKER_LOGIN != '' ] ; then
-    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
+    if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
+        echo "Docker login failed"
+        exit 1
+    fi
+else
+    echo "Skipping Docker login due to missing credentials"
 fi
 
-if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
+if [ "${DOCKER_SYSTEM_PRUNE}" = 'true' ] ; then
     docker system prune -af
 fi
 
 last_arg='.'
-if [ $NO_CACHE = 'true' ] ; then
-	last_arg='--no-cache .'
+if [ "${NO_CACHE}" = 'true' ] ; then
+    last_arg='--no-cache .'
 fi
 
 docker build \
diff --git a/build-server.sh b/build-server.sh
index fd1a61b..5164340 100755
--- a/build-server.sh
+++ b/build-server.sh
@@ -1,16 +1,21 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -euo pipefail
 
-if [ $DOCKER_LOGIN != '' ] ; then
-    docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
+    if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
+        echo "Docker login failed"
+        exit 1
+    fi
+else
+    echo "Skipping Docker login due to missing credentials"
 fi
 
-if [ $DOCKER_SYSTEM_PRUNE = 'true' ] ; then
+if [ "${DOCKER_SYSTEM_PRUNE}" = 'true' ] ; then
     docker system prune -af
 fi
 
 last_arg='.'
-if [ $NO_CACHE = 'true' ] ; then
+if [ "${NO_CACHE}" = 'true' ] ; then
     last_arg='--no-cache .'
 fi
 

From 4e21eac867f96390788118ee74c841f7f6311cda Mon Sep 17 00:00:00 2001
From: Nikita Fedkin <nixel2007@gmail.com>
Date: Tue, 1 Oct 2024 21:04:13 +0000
Subject: [PATCH 13/13] Disable unbound varible check

---
 build-base-k8s-jenkins-agent.sh   | 2 +-
 build-base-swarm-jenkins-agent.sh | 2 +-
 build-crs.sh                      | 2 +-
 build-edt-k8s-agent.sh            | 2 +-
 build-edt-swarm-agent.sh          | 2 +-
 build-oscript-k8s-agent.sh        | 2 +-
 build-oscript-swarm-agent.sh      | 2 +-
 build-server.sh                   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build-base-k8s-jenkins-agent.sh b/build-base-k8s-jenkins-agent.sh
index 80db3a5..9a8c876 100755
--- a/build-base-k8s-jenkins-agent.sh
+++ b/build-base-k8s-jenkins-agent.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
     if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
diff --git a/build-base-swarm-jenkins-agent.sh b/build-base-swarm-jenkins-agent.sh
index 9622772..5517ddc 100755
--- a/build-base-swarm-jenkins-agent.sh
+++ b/build-base-swarm-jenkins-agent.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
     if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
diff --git a/build-crs.sh b/build-crs.sh
index ff14370..89be603 100755
--- a/build-crs.sh
+++ b/build-crs.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
     if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
diff --git a/build-edt-k8s-agent.sh b/build-edt-k8s-agent.sh
index 7d9693a..61e53fc 100755
--- a/build-edt-k8s-agent.sh
+++ b/build-edt-k8s-agent.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
     if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
diff --git a/build-edt-swarm-agent.sh b/build-edt-swarm-agent.sh
index 326c2b6..d34d017 100755
--- a/build-edt-swarm-agent.sh
+++ b/build-edt-swarm-agent.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
     if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
diff --git a/build-oscript-k8s-agent.sh b/build-oscript-k8s-agent.sh
index e35f975..91a2327 100755
--- a/build-oscript-k8s-agent.sh
+++ b/build-oscript-k8s-agent.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
     if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
diff --git a/build-oscript-swarm-agent.sh b/build-oscript-swarm-agent.sh
index 73d61f4..b55a3a4 100755
--- a/build-oscript-swarm-agent.sh
+++ b/build-oscript-swarm-agent.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
     if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then
diff --git a/build-server.sh b/build-server.sh
index 5164340..1cede45 100755
--- a/build-server.sh
+++ b/build-server.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 if [ -n "${DOCKER_LOGIN}" ] && [ -n "${DOCKER_PASSWORD}" ] && [ -n "${DOCKER_REGISTRY_URL}" ]; then
     if ! docker login -u "${DOCKER_LOGIN}" -p "${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_URL}"; then