Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ services:
image: ap-pgbouncer-exporter:${ASTRO_IMAGE_TAG:-latest}
build:
context: pgbouncer-exporter
entrypoint: "top"
ap-pgbouncer-krb:
image: ap-pgbouncer-krb:${ASTRO_IMAGE_TAG:-latest}
build:
Expand Down
6 changes: 3 additions & 3 deletions pgbouncer-exporter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

# https://hub.docker.com/r/jbub/pgbouncer_exporter
FROM jbub/pgbouncer_exporter:v0.20.0 AS upstream
FROM cgr.dev/astronomer.io/prometheus-pgbouncer-exporter:v0.11.0 AS upstream
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM cgr.dev/astronomer.io/prometheus-pgbouncer-exporter:v0.11.0 AS upstream
FROM cgr.dev/astronomer.io/prometheus-pgbouncer-exporter:v0.20.0 AS upstream

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes, are we reverting from 0.20.0 to 0.11.0 ? Does chainguard not have a newer one? 0.11.0 is from 2021 https://github.com/jbub/pgbouncer_exporter/releases/tag/v0.11.0

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danielhoherd looks like Chainguard is not matching its versioning with OSS upstream image versions?
In this case, should we just adopt Chainguard's version?


FROM quay.io/astronomer/ap-base:2025.12.24

Expand All @@ -38,5 +38,5 @@ RUN addgroup -g $GID -S $USER \
&& adduser -D -S -s /sbin/nologin -G $USER -u $UID $USER
USER $UID

ENTRYPOINT ["pgbouncer_exporter"]
CMD ["server"]
ENTRYPOINT ["/bin/bash"]
CMD ["-c", "exec /bin/pgbouncer_exporter --pgBouncer.connectionString=$DATABASE_URL"]
32 changes: 16 additions & 16 deletions pgbouncer-exporter/test.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
tests:
root_user_test: True
default_user: pgexporter
users_config:
- name: pgexporter
group: pgexporter
gid: 1001
uid: 1000
test_commands:
- command: "pgbouncer_exporter --help"
expected_result:
in: "Address on which to expose metrics and web interface."
startswith: "NAME:"
endswith: "print the version (default: false)"
docker:
entrypoint: "top"
# tests:
# root_user_test: True
# default_user: pgexporter
# users_config:
# - name: pgexporter
# group: pgexporter
# gid: 1001
# uid: 1000
# test_commands:
# - command: "pgbouncer_exporter --help"
# expected_result:
# in: "Address on which to expose metrics and web interface."
# startswith: "NAME:"
# endswith: "print the version (default: false)"
# docker:
# entrypoint: "top"
2 changes: 1 addition & 1 deletion pgbouncer-exporter/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.20.0-1
0.11.0-3