Skip to content

fix: update pgbouncer and pgbouncer-exporter images #29792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 2 commits into from
Mar 4, 2023
Merged

fix: update pgbouncer and pgbouncer-exporter images #29792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7525a21
fix: update pgbouncer and pgbouncer-exporter images
evanasse Feb 27, 2023
253fcf8
Merge branch 'main' into update-exporters
evanasse Feb 27, 2023
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
6 changes: 4 additions & 2 deletions chart/dockerfiles/pgbouncer-exporter/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
ARG ALPINE_VERSION="3.12"
ARG ALPINE_VERSION="3.17"
ARG GO_VERSION

FROM golang:${GO_VERSION} AS builder
Expand All @@ -33,7 +33,7 @@ FROM alpine:${ALPINE_VERSION} AS final
# We want to make sure this one includes latest security fixes.
# "Pin versions in apk add" https://github.com/hadolint/hadolint/wiki/DL3018
# hadolint ignore=DL3018
RUN apk --no-cache add libressl libressl-dev
RUN apk --no-cache add libressl libressl-dev openssl

COPY --from=builder /usr/src/myapp/pgbouncer_exporter /bin

Expand All @@ -51,5 +51,7 @@ LABEL org.apache.airflow.component="pgbouncer-exporter" \

HEALTHCHECK CMD ["/bin/pgbouncer_exporter", "health"]

USER nobody

ENTRYPOINT ["/bin/pgbouncer_exporter"]
CMD ["server"]
6 changes: 3 additions & 3 deletions chart/dockerfiles/pgbouncer-exporter/build_and_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ readonly DOCKERHUB_USER
DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"}
readonly DOCKERHUB_REPO

PGBOUNCER_EXPORTER_VERSION="0.5.0"
PGBOUNCER_EXPORTER_VERSION="0.14.0"
readonly PGBOUNCER_EXPORTER_VERSION

AIRFLOW_PGBOUNCER_EXPORTER_VERSION="2021.04.28"
AIRFLOW_PGBOUNCER_EXPORTER_VERSION="2023.02.21"
readonly AIRFLOW_PGBOUNCER_EXPORTER_VERSION

EXPECTED_GO_VERSION="1.15.1"
EXPECTED_GO_VERSION="1.19.6"
readonly EXPECTED_GO_VERSION

COMMIT_SHA=$(git rev-parse HEAD)
Expand Down
6 changes: 4 additions & 2 deletions chart/dockerfiles/pgbouncer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
ARG ALPINE_VERSION="3.12"
ARG ALPINE_VERSION="3.14"
FROM alpine:${ALPINE_VERSION} AS builder
SHELL ["/bin/ash", "-e", "-x", "-c", "-o", "pipefail"]

ARG PGBOUNCER_VERSION
ARG AIRFLOW_PGBOUNCER_VERSION

ARG PGBOUNCER_SHA256="a0c13d10148f557e36ff7ed31793abb7a49e1f8b09aa2d4695d1c28fa101fee7"
Comment thread
potiuk marked this conversation as resolved.
ARG PGBOUNCER_SHA256

# Those are build deps only but still we want the latest versions of those
# "Pin versions in apk add" https://github.com/hadolint/hadolint/wiki/DL3018
Expand Down Expand Up @@ -71,5 +71,7 @@ HEALTHCHECK --interval=10s --timeout=3s CMD stat /tmp/.s.PGSQL.*

EXPOSE 6432

USER nobody

# pgbouncer can't run as root, so let's drop to 'nobody'
ENTRYPOINT ["/usr/bin/pgbouncer", "-u", "nobody", "/etc/pgbouncer/pgbouncer.ini" ]
8 changes: 6 additions & 2 deletions chart/dockerfiles/pgbouncer/build_and_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ readonly DOCKERHUB_USER
DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"}
readonly DOCKERHUB_REPO

PGBOUNCER_VERSION="1.14.0"
PGBOUNCER_VERSION="1.16.1"
readonly PGBOUNCER_VERSION

AIRFLOW_PGBOUNCER_VERSION="2021.04.28"
PGBOUNCER_SHA256="087477e9e4766d032b04b7b006c0c8d64160a54141a7bfc2c6e5ae7ae11bf7fc"
readonly PGBOUNCER_SHA256

AIRFLOW_PGBOUNCER_VERSION="2023.02.24"
readonly AIRFLOW_PGBOUNCER_VERSION

COMMIT_SHA=$(git rev-parse HEAD)
Expand All @@ -47,6 +50,7 @@ docker build . \
--pull \
--build-arg "PGBOUNCER_VERSION=${PGBOUNCER_VERSION}" \
--build-arg "AIRFLOW_PGBOUNCER_VERSION=${AIRFLOW_PGBOUNCER_VERSION}"\
--build-arg "PGBOUNCER_SHA256=${PGBOUNCER_SHA256}"\
--build-arg "COMMIT_SHA=${COMMIT_SHA}" \
--tag "${TAG}"

Expand Down