fixes

ovcharenko-di · ovcharenko-di · commit d5300b42a5bb · 2025-12-18T12:11:11.000+03:00
diff --git a/build-base-k8s-jenkins-agent.sh b/build-base-k8s-jenkins-agent.sh
@@ -96,6 +96,8 @@ docker build \
     -f k8s-jenkins-agent/Dockerfile \
     $last_arg
 
-if [[ $PUSH_AGENT != "false" ]] ; then
+if [[ $PUSH_AGENT != "false" ]] && [[ -n "$DOCKER_REGISTRY_URL" ]]; then
   docker push $DOCKER_REGISTRY_URL/base-jenkins-agent:$ONEC_VERSION
+else
+  echo "DOCKER_REGISTRY_URL not set or PUSH_AGENT is false, skipping docker push."
 fi
diff --git a/build-base-swarm-jenkins-agent.sh b/build-base-swarm-jenkins-agent.sh
@@ -96,8 +96,8 @@ docker build \
     -f swarm-jenkins-agent/Dockerfile \
     $last_arg
 
-if [[ "$PUSH_AGENT" != "false" && -n "$DOCKER_REGISTRY_URL" ]]; then
+if [[ $PUSH_AGENT != "false" ]] && [[ -n "$DOCKER_REGISTRY_URL" ]]; then
   docker push "$DOCKER_REGISTRY_URL/base-jenkins-agent:$ONEC_VERSION"
 else
-  echo "skipping docker push."
+  echo "DOCKER_REGISTRY_URL not set or PUSH_AGENT is false, skipping docker push."
 fi
diff --git a/build-server.sh b/build-server.sh
@@ -37,7 +37,7 @@ docker build \
     --build-arg DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
     --build-arg BASE_IMAGE=oscript-downloader \
     --build-arg BASE_TAG=latest \
-    -t ${DOCKER_REGISTRY_URL:+:"$DOCKER_REGISTRY_URL/"}onec-server:$ONEC_VERSION \
+    -t ${DOCKER_REGISTRY_URL:+"$DOCKER_REGISTRY_URL/"}onec-server:$ONEC_VERSION \
     -f server/Dockerfile \
     $last_arg
 
diff --git a/coverage41C/Dockerfile b/coverage41C/Dockerfile
@@ -1,4 +1,4 @@
-ARG DOCKER_REGISTRY_URL=library
+ARG DOCKER_REGISTRY_URL
 ARG BASE_IMAGE=edt
 ARG BASE_TAG
 ARG EDT_VERSION=2021.3
diff --git a/edt/Dockerfile b/edt/Dockerfile
@@ -5,7 +5,7 @@ ARG DOWNLOADER_TAG
 
 ARG BASE_IMAGE=eclipse-temurin
 ARG BASE_TAG=11
-ARG DOCKER_REGISTRY_URL=library
+ARG DOCKER_REGISTRY_URL
 
 FROM ${DOWNLOADER_REGISTRY_URL:+"$DOWNLOADER_REGISTRY_URL/"}${DOWNLOADER_IMAGE}:${DOWNLOADER_TAG} AS downloader
 
diff --git a/executor/Dockerfile b/executor/Dockerfile
@@ -1,4 +1,4 @@
-ARG DOCKER_REGISTRY_URL=library
+ARG DOCKER_REGISTRY_URL
 ARG BASE_IMAGE=ubuntu
 ARG BASE_TAG=24.04
 FROM ${DOCKER_REGISTRY_URL:+"$DOCKER_REGISTRY_URL/"}${BASE_IMAGE}:${BASE_TAG}
diff --git a/jdk/Dockerfile b/jdk/Dockerfile
@@ -1,4 +1,4 @@
-ARG DOCKER_REGISTRY_URL=library
+ARG DOCKER_REGISTRY_URL
 ARG BASE_IMAGE=debian
 ARG BASE_TAG=bookworm-slim
 
diff --git a/oscript/Dockerfile b/oscript/Dockerfile
@@ -1,4 +1,4 @@
-ARG DOCKER_REGISTRY_URL=""
+ARG DOCKER_REGISTRY_URL
 ARG BASE_IMAGE=debian
 ARG BASE_TAG=bookworm-slim
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG DOCKER_REGISTRY_URL=library`
	`1`	`+ARG DOCKER_REGISTRY_URL`
`2`	`2`	`ARG BASE_IMAGE=edt`
`3`	`3`	`ARG BASE_TAG`
`4`	`4`	`ARG EDT_VERSION=2021.3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG DOCKER_REGISTRY_URL=""`
	`1`	`+ARG DOCKER_REGISTRY_URL`
`2`	`2`	`ARG BASE_IMAGE=debian`
`3`	`3`	`ARG BASE_TAG=bookworm-slim`
`4`	`4`