OP#213 up version

This commit is contained in:
12ww1160
2025-12-06 14:55:13 +01:00
parent ef003b872f
commit 4fae12fbdb

12
Jenkinsfile vendored
View File

@@ -42,9 +42,9 @@ stage('build and push image to gitlab') {
sh ''' sh '''
set +xe set +xe
docker login gitlab.confdroid.com:5050 -u $un -p $pw docker login gitlab.confdroid.com:5050 -u $un -p $pw
docker build --network=host -t gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:1.0.0 . docker build --network=host -t gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:1.1.1 .
docker build --network=host -t gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:latest . docker build --network=host -t gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:latest .
docker push gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:1.0.0 docker push gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:1.1.1
docker push gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:latest docker push gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:latest
''' '''
} }
@@ -57,9 +57,9 @@ stage('build and push image to gitlab') {
sh ''' sh '''
set +xe set +xe
docker login gitea.confdroid.com -u $un -p $pw docker login gitea.confdroid.com -u $un -p $pw
docker build --network=host -t gitea.confdroid.com/confdroid/confdroid_pgbouncer:1.0.0 . docker build --network=host -t gitea.confdroid.com/confdroid/confdroid_pgbouncer:1.1.1 .
docker build --network=host -t gitea.confdroid.com/confdroid/confdroid_pgbouncer:latest . docker build --network=host -t gitea.confdroid.com/confdroid/confdroid_pgbouncer:latest .
docker push gitea.confdroid.com/confdroid/confdroid_pgbouncer:1.0.0 docker push gitea.confdroid.com/confdroid/confdroid_pgbouncer:1.1.1
docker push gitea.confdroid.com/confdroid/confdroid_pgbouncer:latest docker push gitea.confdroid.com/confdroid/confdroid_pgbouncer:latest
''' '''
} }
@@ -90,8 +90,8 @@ stage('build and push image to gitlab') {
git checkout master git checkout master
git pull origin master git pull origin master
git branch git branch
#git branch -D development git branch -D development
#git branch -D jenkins-build-$BUILD_NUMBER git branch -D jenkins-build-$BUILD_NUMBER
git remote add master https://gitea.confdroid.com/confdroid/confdroid_pgbouncer.git git remote add master https://gitea.confdroid.com/confdroid/confdroid_pgbouncer.git
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push master --mirror push master --mirror