From bd4a1cde3e8ed384245187f5902367ba2c77fdd6 Mon Sep 17 00:00:00 2001 From: konsthol Date: Tue, 27 May 2025 14:00:02 +0300 Subject: [PATCH] Never gonna tell a lie and hurt you --- src/com/example/DockerBuilder.groovy | 4 ++-- vars/buildAndDeploy.groovy | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/example/DockerBuilder.groovy b/src/com/example/DockerBuilder.groovy index 300d5ad..e1b448c 100644 --- a/src/com/example/DockerBuilder.groovy +++ b/src/com/example/DockerBuilder.groovy @@ -4,9 +4,9 @@ class DockerBuilder { def getDockerdCommand(String dockerRepo, Boolean useInsecureRegistry) { return useInsecureRegistry ? "dockerd --insecure-registry http://${dockerRepo} &" : "dockerd &" } - def getDockerBuildCommands(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) { + def getDockerBuildCommands(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass, Integer appPort) { return [ - "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}", + "docker build --build-arg APP_PORT=${appPort} -t ${imageName} -f ${dockerfilePath} ${buildContext}", "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}", "docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest", "docker push ${dockerRepo}/my-docker-repo/${imageName}:latest" diff --git a/vars/buildAndDeploy.groovy b/vars/buildAndDeploy.groovy index 5629f96..585063c 100644 --- a/vars/buildAndDeploy.groovy +++ b/vars/buildAndDeploy.groovy @@ -29,7 +29,8 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh "./Dockerfile", "target", "admin", - env.NEXUS_DOCKER_PASS + env.NEXUS_DOCKER_PASS, + appPort ).each { cmd -> sh(script: cmd, returnStdout:true) }