diff --git a/chart/dockerfiles/pgbouncer/Dockerfile b/chart/dockerfiles/pgbouncer/Dockerfile index f561fadc3ebb..fcc45da47ba9 100644 --- a/chart/dockerfiles/pgbouncer/Dockerfile +++ b/chart/dockerfiles/pgbouncer/Dockerfile @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -ARG ALPINE_VERSION="3.14" +ARG ALPINE_VERSION="3.19" FROM alpine:${ALPINE_VERSION} AS builder SHELL ["/bin/ash", "-e", "-x", "-c", "-o", "pipefail"] @@ -26,7 +26,7 @@ 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 # hadolint ignore=DL3018 -RUN apk --no-cache add make pkgconfig build-base libtool wget gcc g++ libevent-dev libressl-dev c-ares-dev ca-certificates +RUN apk --no-cache add make pkgconfig build-base libtool wget gcc g++ libevent-dev openssl-dev c-ares-dev ca-certificates # We are not using Dash so we can safely ignore the "Dash warning" # "In dash, something is not supported." https://github.com/koalaman/shellcheck/wiki/SC2169 # hadolint ignore=SC2169,SC3060 diff --git a/chart/dockerfiles/pgbouncer/build_and_push.sh b/chart/dockerfiles/pgbouncer/build_and_push.sh index 24ab57882daf..cede5ab8b0ab 100755 --- a/chart/dockerfiles/pgbouncer/build_and_push.sh +++ b/chart/dockerfiles/pgbouncer/build_and_push.sh @@ -22,13 +22,13 @@ readonly DOCKERHUB_USER DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"} readonly DOCKERHUB_REPO -PGBOUNCER_VERSION="1.21.0" +PGBOUNCER_VERSION="1.22.1" readonly PGBOUNCER_VERSION -PGBOUNCER_SHA256="7e1dd620c8d85a8490aff25061d5055d7aef9cf3e8bfe2d9e7719b8ee59114e2" +PGBOUNCER_SHA256="2b018aa6ce7f592c9892bb9e0fd90262484eb73937fd2af929770a45373ba215" readonly PGBOUNCER_SHA256 -AIRFLOW_PGBOUNCER_VERSION="2024.01.19" +AIRFLOW_PGBOUNCER_VERSION="2024.09.19" readonly AIRFLOW_PGBOUNCER_VERSION COMMIT_SHA=$(git rev-parse HEAD) diff --git a/chart/values.schema.json b/chart/values.schema.json index 4a73c3b4bfde..e57ff56be29e 100644 --- a/chart/values.schema.json +++ b/chart/values.schema.json @@ -895,7 +895,7 @@ "tag": { "description": "The PgBouncer image tag.", "type": "string", - "default": "airflow-pgbouncer-2024.01.19-1.21.0" + "default": "airflow-pgbouncer-2024.09.19-1.22.1" }, "pullPolicy": { "description": "The PgBouncer image pull policy.", diff --git a/chart/values.yaml b/chart/values.yaml index 5d86c3557baf..8af9ab14bdf1 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -115,7 +115,7 @@ images: pullPolicy: IfNotPresent pgbouncer: repository: apache/airflow - tag: airflow-pgbouncer-2024.01.19-1.21.0 + tag: airflow-pgbouncer-2024.09.19-1.22.1 pullPolicy: IfNotPresent pgbouncerExporter: repository: apache/airflow