From fbd3ffcc626974ed1e1784a7df9765db7be6d3a2 Mon Sep 17 00:00:00 2001 From: Dmitry Ovcharenko Date: Wed, 28 Jan 2026 16:36:01 +0300 Subject: [PATCH] rm redundant pull, fix formatting --- build-base-swarm-jenkins-agent.bat | 38 ++++++++++++++---------------- build-base-swarm-jenkins-agent.sh | 7 +++--- build-oscript-swarm-agent.bat | 6 ++--- build-oscript-swarm-agent.sh | 6 ++--- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/build-base-swarm-jenkins-agent.bat b/build-base-swarm-jenkins-agent.bat index b9d1c41..937cadb 100644 --- a/build-base-swarm-jenkins-agent.bat +++ b/build-base-swarm-jenkins-agent.bat @@ -11,26 +11,25 @@ if %ERRORLEVEL% neq 0 goto end if %NO_CACHE%=="true" (SET last_arg="--no-cache .") else (SET last_arg=".") docker build ^ - --pull ^ - --build-arg DOCKER_REGISTRY_URL=library ^ + --pull ^ + --build-arg DOCKER_REGISTRY_URL=library ^ --build-arg BASE_IMAGE=ubuntu ^ --build-arg BASE_TAG=20.04 ^ --build-arg ONESCRIPT_PACKAGES="yard" ^ -t %DOCKER_REGISTRY_URL%/oscript-downloader:latest ^ - -f oscript/Dockerfile ^ + -f oscript/Dockerfile ^ %last_arg% docker build ^ - --pull ^ - --build-arg ONEC_USERNAME=%ONEC_USERNAME% ^ - --build-arg ONEC_PASSWORD=%ONEC_PASSWORD% ^ - --build-arg ONEC_VERSION=%ONEC_VERSION% ^ - --build-arg DOCKER_REGISTRY_URL=%DOCKER_REGISTRY_URL% ^ + --build-arg ONEC_USERNAME=%ONEC_USERNAME% ^ + --build-arg ONEC_PASSWORD=%ONEC_PASSWORD% ^ + --build-arg ONEC_VERSION=%ONEC_VERSION% ^ + --build-arg DOCKER_REGISTRY_URL=%DOCKER_REGISTRY_URL% ^ --build-arg BASE_IMAGE=oscript-downloader ^ --build-arg BASE_TAG=latest ^ - -t %DOCKER_REGISTRY_URL%/onec-client:%ONEC_VERSION% ^ - -f client/Dockerfile ^ - %last_arg% + -t %DOCKER_REGISTRY_URL%/onec-client:%ONEC_VERSION% ^ + -f client/Dockerfile ^ + %last_arg% if %ERRORLEVEL% neq 0 goto end @@ -39,14 +38,13 @@ docker push %DOCKER_REGISTRY_URL%/onec-client:%ONEC_VERSION% if %ERRORLEVEL% neq 0 goto end docker build ^ - --pull ^ - --build-arg ONEC_USERNAME=%ONEC_USERNAME% ^ - --build-arg ONEC_PASSWORD=%ONEC_PASSWORD% ^ - --build-arg ONEC_VERSION=%ONEC_VERSION% ^ - --build-arg DOCKER_REGISTRY_URL=%DOCKER_REGISTRY_URL% ^ - -t %DOCKER_REGISTRY_URL%/onec-client-vnc:%ONEC_VERSION% ^ - -f client-vnc/Dockerfile ^ - %last_arg% + --build-arg ONEC_USERNAME=%ONEC_USERNAME% ^ + --build-arg ONEC_PASSWORD=%ONEC_PASSWORD% ^ + --build-arg ONEC_VERSION=%ONEC_VERSION% ^ + --build-arg DOCKER_REGISTRY_URL=%DOCKER_REGISTRY_URL% ^ + -t %DOCKER_REGISTRY_URL%/onec-client-vnc:%ONEC_VERSION% ^ + -f client-vnc/Dockerfile ^ + %last_arg% if %ERRORLEVEL% neq 0 goto end @@ -55,7 +53,7 @@ docker push %DOCKER_REGISTRY_URL%/onec-client-vnc:%ONEC_VERSION% if %ERRORLEVEL% neq 0 goto end docker build ^ - --build-arg DOCKER_REGISTRY_URL=%DOCKER_REGISTRY_URL% ^ + --build-arg DOCKER_REGISTRY_URL=%DOCKER_REGISTRY_URL% ^ --build-arg BASE_IMAGE=onec-client-vnc ^ --build-arg BASE_TAG=%ONEC_VERSION% ^ -t %DOCKER_REGISTRY_URL%/onec-client-vnc-oscript:%ONEC_VERSION% ^ diff --git a/build-base-swarm-jenkins-agent.sh b/build-base-swarm-jenkins-agent.sh index 12b7646..4892da4 100755 --- a/build-base-swarm-jenkins-agent.sh +++ b/build-base-swarm-jenkins-agent.sh @@ -20,14 +20,14 @@ if [ "${NO_CACHE}" = 'true' ] ; then fi docker build \ - --pull \ + --pull \ $no_cache_arg \ - --build-arg DOCKER_REGISTRY_URL=library \ + --build-arg DOCKER_REGISTRY_URL=library \ --build-arg BASE_IMAGE=ubuntu \ --build-arg BASE_TAG=20.04 \ --build-arg ONESCRIPT_PACKAGES="yard" \ -t ${DOCKER_REGISTRY_URL:+"$DOCKER_REGISTRY_URL/"}oscript-downloader:latest \ - -f oscript/Dockerfile \ + -f oscript/Dockerfile \ $last_arg docker build \ @@ -48,7 +48,6 @@ else fi docker build \ - --pull \ --build-arg ONEC_USERNAME=$ONEC_USERNAME \ --build-arg ONEC_PASSWORD=$ONEC_PASSWORD \ --build-arg ONEC_VERSION=$ONEC_VERSION \ diff --git a/build-oscript-swarm-agent.bat b/build-oscript-swarm-agent.bat index 7bceae9..d91b782 100644 --- a/build-oscript-swarm-agent.bat +++ b/build-oscript-swarm-agent.bat @@ -11,8 +11,8 @@ if %ERRORLEVEL% neq 0 goto end if %NO_CACHE%=="true" (SET last_arg="--no-cache .") else (SET last_arg=".") docker build ^ - --pull ^ - --build-arg DOCKER_REGISTRY_URL=library ^ + --pull ^ + --build-arg DOCKER_REGISTRY_URL=library ^ --build-arg BASE_IMAGE=eclipse-temurin ^ --build-arg BASE_TAG=17 ^ -t %DOCKER_REGISTRY_URL%/oscript-jdk:latest ^ @@ -36,4 +36,4 @@ docker push %DOCKER_REGISTRY_URL%/base-jenkins-agent:latest if %ERRORLEVEL% neq 0 goto end :end -echo End of program. \ No newline at end of file +echo End of program. diff --git a/build-oscript-swarm-agent.sh b/build-oscript-swarm-agent.sh index 8e80f0d..7b56866 100755 --- a/build-oscript-swarm-agent.sh +++ b/build-oscript-swarm-agent.sh @@ -20,13 +20,13 @@ if [ "${NO_CACHE}" = 'true' ] ; then fi docker build \ - --pull \ + --pull \ $no_cache_arg \ - --build-arg DOCKER_REGISTRY_URL=library \ + --build-arg DOCKER_REGISTRY_URL=library \ --build-arg BASE_IMAGE=eclipse-temurin \ --build-arg BASE_TAG=17 \ -t ${DOCKER_REGISTRY_URL:+"$DOCKER_REGISTRY_URL/"}oscript-jdk:latest \ - -f oscript/Dockerfile \ + -f oscript/Dockerfile \ $last_arg docker build \