Skip to content
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

Jump to bottom

Rebuild pgbouncer image with newer version #42349

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Rebuild pgbouncer image with newer version #42349

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
d8e93b3
Rebuild pgbouncer image with newer version
robertvolkmann Sep 19, 2024
27e993f
Merge branch 'main' into rebuild-pgbouncer-image-with-newer-version
robertvolkmann Nov 4, 2024
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
4 changes: 2 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,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"]

Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 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,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)
Expand Down
2 changes: 1 addition & 1 deletion chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down