OP#213 add steps and up version

This commit is contained in:
12ww1160
2025-12-06 15:44:10 +01:00
parent 272b7910d1
commit 5b736cfb10
2 changed files with 11 additions and 8 deletions

View File

@@ -20,11 +20,14 @@ RUN groupadd -r pgbouncer && \
useradd -r -g pgbouncer -d /etc/pgbouncer -s /usr/sbin/nologin pgbouncer useradd -r -g pgbouncer -d /etc/pgbouncer -s /usr/sbin/nologin pgbouncer
# Directories # 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 && \ RUN chown -R pgbouncer:pgbouncer /etc/pgbouncer \
chmod 700 /etc/pgbouncer && \ /var/run/pgbouncer /var/log/pgbouncer && \
chmod 700 /etc/pgbouncer/tls chmod -R 700 /etc/pgbouncer && \
chmod -R 700 /var/run/pgbouncer && \
chmod -R 700 /var/log/pgbouncer
# Drop privileges # Drop privileges
USER pgbouncer USER pgbouncer

8
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.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 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 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.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 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 docker push gitea.confdroid.com/confdroid/confdroid_pgbouncer:latest
''' '''
} }