Merge pull request #45 from firstBitMarksistskaya/nixel2007-patch-1

firstBitMarksistskaya · Oct 1, 2024 · 55e79c3 · 55e79c3
2 parents 39d2f26 + 4e21eac
commit 55e79c3
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 49 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,9 +10,10 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy: 
+    strategy:
+      fail-fast: false
       matrix:
-        dir: [ 'jdk', 'oscript' ]
+        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
@@ -25,5 +26,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.24.1624'
+        EDT_VERSION: '2023.3.6'
       run: |
-        docker build -t oscript:latest -f ${{ matrix.dir }}/Dockerfile .
+        docker run -d -p 5000:5000 --name registry registry:2
+        ./${{ matrix.script }}
diff --git a/build-base-k8s-jenkins-agent.sh b/build-base-k8s-jenkins-agent.sh
@@ -1,14 +1,21 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -eo pipefail
 
-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
@@ -1,14 +1,21 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -eo pipefail
 
-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
@@ -1,14 +1,21 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -eo pipefail
 
-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
@@ -1,15 +1,22 @@
-#!/bin/bash
-set -e
-
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+#!/usr/bin/env bash
+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
+        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
@@ -1,15 +1,22 @@
-#!/bin/bash
-set -e
-
-docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
+#!/usr/bin/env bash
+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
+        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
@@ -1,15 +1,22 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -eo pipefail
 
-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
@@ -1,15 +1,22 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -eo pipefail
 
-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
@@ -1,14 +1,21 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -eo pipefail
 
-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