From abfc2b9faceb58725ad25f6760ca6f54a5692e8c Mon Sep 17 00:00:00 2001
From: onikolskyy <onikolskyy@gmail.com>
Date: Wed, 8 Nov 2023 18:08:28 +0100
Subject: [PATCH] a
---
Jenkinsfile | 61 +++++++++++++++++++++---------------------------
Jenkinsfile.func | 33 --------------------------
Jenkinsfile.old | 40 +++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+), 67 deletions(-)
delete mode 100644 Jenkinsfile.func
create mode 100644 Jenkinsfile.old
diff --git a/Jenkinsfile b/Jenkinsfile
index c9432bd..e84fb12 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,40 +1,33 @@
-pipeline {
- agent {
- kubernetes {
- yaml """\
- apiVersion: v1
- kind: Pod
- metadata:
- name: 'jenkins-slave'
- namespace: 'your-namespace'
- spec:
- containers:
- - name: docker
- image: swr.eu-de.otc.t-systems.com/base-image/docker:dind
- tty: true
- imagePullPolicy: Always
- imagePullSecrets:
- - name: default-secret
- env:
- - name: PASS
- valueFrom:
- secretKeyRef:
- name: docker-reg
- key: docker-reg
- """.stripIndent()
- }
- }
- stages {
- stage('Build Docker Image') {
+version="1.0.0"
+repository="swr.eu-de.otc.t-systems.com"
+tag="latest"
+image="swr.eu-de.otc.t-systems.com/omnia-test/${repository}:${version}.${env.BUILD_NUMBER}"
+namespace="demo"
+
+podTemplate(label: 'pod', cloud: 'kubernetes', serviceAccount: 'jenkins-agent-sa',
+ imagePullSecrets: [
+ 'default-secret'
+ ],
+ containers: [
+ containerTemplate(
+ name: 'docker', image: 'swr.eu-de.otc.t-systems.com/base-image/docker:dind', ttyEnabled: true, command: 'cat', privileged: true,
+ envVars: [
+ secretEnvVar(key: "PASS", secretName: "docker-reg", secretKey: "docker-reg")
+ ]
+ ),
+ ],
+) {
+ node('pod') {
+ stage('Build Docker Image') {
container('docker') {
sh """
- image="swr.eu-de.otc.t-systems.com/omnia-test/test-build:latest"
- docker login ${PASS} swr.eu-de.otc.t-systems.com
- docker build -t ${image} .
- docker push ${image}
+ docker login ${env.PASS} swr.eu-de.otc.t-systems.com
+ docker build -t ${image}:${tag} .
+ docker push ${image}:${tag}
"""
milestone(1)
}
}
- }
-}
\ No newline at end of file
+ }
+}
+
diff --git a/Jenkinsfile.func b/Jenkinsfile.func
deleted file mode 100644
index e84fb12..0000000
--- a/Jenkinsfile.func
+++ /dev/null
@@ -1,33 +0,0 @@
-version="1.0.0"
-repository="swr.eu-de.otc.t-systems.com"
-tag="latest"
-image="swr.eu-de.otc.t-systems.com/omnia-test/${repository}:${version}.${env.BUILD_NUMBER}"
-namespace="demo"
-
-podTemplate(label: 'pod', cloud: 'kubernetes', serviceAccount: 'jenkins-agent-sa',
- imagePullSecrets: [
- 'default-secret'
- ],
- containers: [
- containerTemplate(
- name: 'docker', image: 'swr.eu-de.otc.t-systems.com/base-image/docker:dind', ttyEnabled: true, command: 'cat', privileged: true,
- envVars: [
- secretEnvVar(key: "PASS", secretName: "docker-reg", secretKey: "docker-reg")
- ]
- ),
- ],
-) {
- node('pod') {
- stage('Build Docker Image') {
- container('docker') {
- sh """
- docker login ${env.PASS} swr.eu-de.otc.t-systems.com
- docker build -t ${image}:${tag} .
- docker push ${image}:${tag}
- """
- milestone(1)
- }
- }
- }
-}
-
diff --git a/Jenkinsfile.old b/Jenkinsfile.old
new file mode 100644
index 0000000..c9432bd
--- /dev/null
+++ b/Jenkinsfile.old
@@ -0,0 +1,40 @@
+pipeline {
+ agent {
+ kubernetes {
+ yaml """\
+ apiVersion: v1
+ kind: Pod
+ metadata:
+ name: 'jenkins-slave'
+ namespace: 'your-namespace'
+ spec:
+ containers:
+ - name: docker
+ image: swr.eu-de.otc.t-systems.com/base-image/docker:dind
+ tty: true
+ imagePullPolicy: Always
+ imagePullSecrets:
+ - name: default-secret
+ env:
+ - name: PASS
+ valueFrom:
+ secretKeyRef:
+ name: docker-reg
+ key: docker-reg
+ """.stripIndent()
+ }
+ }
+ stages {
+ stage('Build Docker Image') {
+ container('docker') {
+ sh """
+ image="swr.eu-de.otc.t-systems.com/omnia-test/test-build:latest"
+ docker login ${PASS} swr.eu-de.otc.t-systems.com
+ docker build -t ${image} .
+ docker push ${image}
+ """
+ milestone(1)
+ }
+ }
+ }
+}
\ No newline at end of file