Does anyone read this? I'll be at the coffee shop accross the street.

This commit is contained in:
2025-05-27 13:32:11 +03:00
parent 5477a51877
commit f3d59e489e
3 changed files with 2 additions and 30 deletions

View File

@@ -1,6 +1,6 @@
import com.example.DockerBuilder
def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry) {
def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry, Integer appPort) {
def dockerBuilder = new DockerBuilder()
def containerName = useCustomDocker ? 'custom-docker' : 'docker'
@@ -50,7 +50,7 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh
helmChartVersion,
env.KUBERNETES_API,
env.KUBERNETES_TOKEN,
["app.image": "localhost:31050/my-docker-repo/${appName}:latest", "app.ports.http": 8090, "app.secret": "nexus-secret"]
["app.image": "localhost:31050/my-docker-repo/${appName}:latest", "app.ports.http": appPort, "app.secret": "nexus-secret"]
)
}
}

View File

@@ -1,14 +0,0 @@
def call(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) {
container('custom-docker') {
sh "dockerd &"
echo "Started Docker daemon"
sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}"
echo "Docker image ${imageName} built"
sh "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}"
echo "Logging in to ${dockerRepo}"
sh "docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest"
echo "Image ${imageName} tagged"
sh "docker push ${dockerRepo}/my-docker-repo/${imageName}:latest"
echo "Pushed Docker image ${imageName} to ${dockerRepo}"
}
}

View File

@@ -1,14 +0,0 @@
def call(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) {
container('docker') {
sh "dockerd --insecure-registry http://${dockerRepo} &"
echo "Started Docker daemon"
sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}"
echo "Docker image ${imageName} built"
sh "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}"
echo "Logging in to ${dockerRepo}"
sh "docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest"
echo "Image ${imageName} tagged"
sh "docker push ${dockerRepo}/my-docker-repo/${imageName}:latest"
echo "Pushed Docker image ${imageName} to ${dockerRepo}"
}
}