From 5b736cfb10f309f4fc0fd1b65708484ed60469a1 Mon Sep 17 00:00:00 2001 From: 12ww1160 Date: Sat, 6 Dec 2025 15:44:10 +0100 Subject: [PATCH] OP#213 add steps and up version --- Dockerfile | 11 +++++++---- Jenkinsfile | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4209b39..8f3000b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,11 +20,14 @@ RUN groupadd -r pgbouncer && \ useradd -r -g pgbouncer -d /etc/pgbouncer -s /usr/sbin/nologin pgbouncer # Directories -RUN mkdir -p /etc/pgbouncer /etc/pgbouncer/tls +RUN mkdir -p /etc/pgbouncer /etc/pgbouncer/tls \ + /var/run/pgbouncer /var/log/pgbouncer -RUN chown -R pgbouncer:pgbouncer /etc/pgbouncer && \ - chmod 700 /etc/pgbouncer && \ - chmod 700 /etc/pgbouncer/tls +RUN chown -R pgbouncer:pgbouncer /etc/pgbouncer \ + /var/run/pgbouncer /var/log/pgbouncer && \ + chmod -R 700 /etc/pgbouncer && \ + chmod -R 700 /var/run/pgbouncer && \ + chmod -R 700 /var/log/pgbouncer # Drop privileges USER pgbouncer diff --git a/Jenkinsfile b/Jenkinsfile index a6c00c5..4fdf9ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,9 +42,9 @@ stage('build and push image to gitlab') { sh ''' set +xe docker login gitlab.confdroid.com:5050 -u $un -p $pw - docker build --network=host -t gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:1.1.2 . + docker build --network=host -t gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:1.1.3 . docker build --network=host -t gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:latest . - docker push gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:1.1.2 + docker push gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:1.1.3 docker push gitlab.confdroid.com:5050/containers/confdroid_pgbouncer:latest ''' } @@ -57,9 +57,9 @@ stage('build and push image to gitlab') { sh ''' set +xe docker login gitea.confdroid.com -u $un -p $pw - docker build --network=host -t gitea.confdroid.com/confdroid/confdroid_pgbouncer:1.1.2 . + docker build --network=host -t gitea.confdroid.com/confdroid/confdroid_pgbouncer:1.1.3 . docker build --network=host -t gitea.confdroid.com/confdroid/confdroid_pgbouncer:latest . - docker push gitea.confdroid.com/confdroid/confdroid_pgbouncer:1.1.2 + docker push gitea.confdroid.com/confdroid/confdroid_pgbouncer:1.1.3 docker push gitea.confdroid.com/confdroid/confdroid_pgbouncer:latest ''' }