Use ap-base 3.20.5 (#940)

astronomer · Feb 5, 2025 · 512af7a · 512af7a
1 parent ecbdbdb
commit 512af7a
Show file tree

Hide file tree

Showing 35 changed files with 38 additions and 47 deletions.
diff --git a/alertmanager/Dockerfile b/alertmanager/Dockerfile
@@ -16,7 +16,7 @@
 # https://hub.docker.com/r/prom/alertmanager/tags?page=1&ordering=last_updated
 FROM prom/alertmanager:v0.27.0 AS UPSTREAM
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 ARG BUILD_NUMBER=-1
 LABEL io.astronomer.docker=true

diff --git a/alertmanager/version.txt b/alertmanager/version.txt
@@ -1 +1 @@
-0.27.0-4
+0.27.0-5
diff --git a/awsesproxy/Dockerfile b/awsesproxy/Dockerfile
@@ -25,7 +25,7 @@ RUN git clone  https://github.com/astronomer/aws-es-proxy.git $AWSESPROXY_DIR &&
 
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o aws-es-proxy
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 
 ARG BUILD_NUMBER=-1

diff --git a/awsesproxy/version.txt b/awsesproxy/version.txt
@@ -1 +1 @@
-1.5.0-12
+1.5.0-13
diff --git a/blackbox-exporter/Dockerfile b/blackbox-exporter/Dockerfile
@@ -35,7 +35,7 @@ RUN git clone https://github.com/prometheus/blackbox_exporter $DISTRIBUTION_DIR
 
 RUN CGO_ENABLED=0 make build
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 
 ARG BUILD_NUMBER=-1

diff --git a/blackbox-exporter/version.txt b/blackbox-exporter/version.txt
@@ -1 +1 @@
-0.25.0-4
+0.25.0-5
diff --git a/curator/Dockerfile b/curator/Dockerfile
@@ -14,24 +14,25 @@
 # limitations under the License.
 
 # https://quay.io/repository/astronomer/ap-base?tab=tags
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 
 ARG BUILD_NUMBER=-1
 LABEL io.astronomer.docker=true
 LABEL io.astronomer.docker.build.number=$BUILD_NUMBER
 
 # https://github.com/elastic/curator/releases
-ENV CURATOR_VERSION 8.0.17
+ENV CURATOR_VERSION=8.0.17
 
 RUN set -x ; apk --no-cache add \
       libffi \
-      libssl1.1 \
+      openssl \
       py3-cffi \
       py3-pip \
       py3-setuptools \
       python3 \
       python3-dev && \
+    rm -fv /usr/lib/python3.*/EXTERNALLY-MANAGED && \
     apk add --no-cache  \
       py3-cryptography \
       py3-openssl \
@@ -52,4 +53,3 @@ RUN set -x ; apk --no-cache add \
 USER 65534
 
 ENTRYPOINT ["/usr/bin/curator"]
-
diff --git a/curator/twistcliignore b/curator/twistcliignore
@@ -1,11 +1,2 @@
-CVE-2023-0286
-CVE-2023-32681
-CVE-2023-42366
-CVE-2023-49083
-CVE-2023-50782
-CVE-2023-5752
-CVE-2024-0727
 CVE-2024-37891
-GHSA-5cpq-8wj7-hf2v
-GHSA-jm77-qphf-c4w8
-GHSA-v8gr-m533-ghj9
+GHSA-h4gh-qq45-vh27
diff --git a/curator/version.txt b/curator/version.txt
@@ -1 +1 @@
-8.0.17-1
+8.0.17-2
diff --git a/git-daemon/Dockerfile b/git-daemon/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # https://github.com/kubernetes/git-sync/releases
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 
 ARG BUILD_NUMBER=-1

diff --git a/git-daemon/version.txt b/git-daemon/version.txt
@@ -1 +1 @@
-3.20.3-1
+3.20.5
diff --git a/git-sync-relay/Dockerfile b/git-sync-relay/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 
 ARG BUILD_NUMBER=-1

diff --git a/git-sync-relay/version.txt b/git-sync-relay/version.txt
@@ -1 +1 @@
-0.0.3-7
+0.0.3-8
diff --git a/git-sync/Dockerfile b/git-sync/Dockerfile
@@ -30,7 +30,7 @@
 # https://github.com/kubernetes/git-sync/releases
 FROM registry.k8s.io/git-sync/git-sync:v4.2.3 AS upstream
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 COPY --from=upstream /git-sync /usr/local/bin/
 USER root

diff --git a/git-sync/version.txt b/git-sync/version.txt
@@ -1 +1 @@
-4.2.3-1
+4.2.3-2
diff --git a/init/Dockerfile b/init/Dockerfile
@@ -1,7 +1,7 @@
 # Used only for kubernetes initContainer tasks
 
 # Inherit dockerize and RDS certificates from ap-base
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 
 RUN apk add --no-cache curl  shadow
 

diff --git a/init/version.txt b/init/version.txt
@@ -1 +1 @@
-3.20.3-1
+3.20.5
diff --git a/nats-exporter/Dockerfile b/nats-exporter/Dockerfile
@@ -30,7 +30,7 @@ RUN git clone --branch v${NATS_EXPORTER_VERSION} https://github.com/nats-io/prom
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w"
 
 # Final docker image building stage
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 
 ARG BUILD_NUMBER=-1
 LABEL io.astronomer.docker=true

diff --git a/nats-exporter/version.txt b/nats-exporter/version.txt
@@ -1 +1 @@
-0.15.0-4
+0.15.0-5
diff --git a/nats-server/Dockerfile b/nats-server/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 
 LABEL maintainer="Astronomer <[email protected]>"
 

diff --git a/nats-server/version.txt b/nats-server/version.txt
@@ -1 +1 @@
-2.10.18-2
+2.10.18-3
diff --git a/nats-streaming/Dockerfile b/nats-streaming/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 
 LABEL maintainer="Astronomer <[email protected]>"
 

diff --git a/nats-streaming/version.txt b/nats-streaming/version.txt
@@ -1 +1 @@
-0.25.6-7
+0.25.6-8
diff --git a/pgbouncer-exporter/Dockerfile b/pgbouncer-exporter/Dockerfile
@@ -16,7 +16,7 @@
 # https://hub.docker.com/r/jbub/pgbouncer_exporter
 FROM jbub/pgbouncer_exporter:v0.18.0 AS upstream
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 
 LABEL maintainer="Astronomer <[email protected]>"
 

diff --git a/pgbouncer-exporter/version.txt b/pgbouncer-exporter/version.txt
@@ -1 +1 @@
-0.18.0-1
+0.18.0-2
diff --git a/pgbouncer-krb/Dockerfile b/pgbouncer-krb/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 
 ARG BUILD_NUMBER=-1

diff --git a/pgbouncer-krb/version.txt b/pgbouncer-krb/version.txt
@@ -1 +1 @@
-1.17.0-16
+1.17.0-17
diff --git a/pgbouncer/Dockerfile b/pgbouncer/Dockerfile
@@ -15,7 +15,7 @@
 
 # https://github.com/CenterForOpenScience/docker-library/blob/master/pgbouncer/Dockerfile
 # https://quay.io/repository/centerforopenscience/pgbouncer
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 
 # Make it possible to override the UID/GID/username of the user running

diff --git a/pgbouncer/version.txt b/pgbouncer/version.txt
@@ -1 +1 @@
-1.23.1-3
+1.23.1-4
diff --git a/postgres-exporter/Dockerfile b/postgres-exporter/Dockerfile
@@ -18,7 +18,7 @@
 
 FROM quay.io/prometheuscommunity/postgres-exporter:v0.16.0 AS upstream
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 
 ARG BUILD_NUMBER=-1
 LABEL io.astronomer.docker=true

diff --git a/postgres-exporter/version.txt b/postgres-exporter/version.txt
@@ -1 +1 @@
-0.16.0-1
+0.16.0-2
diff --git a/registry/Dockerfile b/registry/Dockerfile
@@ -36,7 +36,7 @@ RUN git clone https://github.com/astronomer/distribution.git $DISTRIBUTION_DIR &
 
 RUN CGO_ENABLED=0 make PREFIX=/go clean binaries && file ./bin/registry | grep "statically linked"
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 LABEL maintainer="Astronomer <[email protected]>"
 
 ARG BUILD_NUMBER=-1

diff --git a/registry/version.txt b/registry/version.txt
@@ -1 +1 @@
-3.20.3-1
+3.20.5
diff --git a/vector/Dockerfile b/vector/Dockerfile
@@ -21,7 +21,7 @@ ENV VECTOR_VERSION 0.44.0
 RUN curl -fsSL https://github.com/vectordotdev/vector/releases/download/v${VECTOR_VERSION}/vector-${VECTOR_VERSION}-x86_64-unknown-linux-musl.tar.gz \
     | tar --directory=/tmp --strip-components=3 -xzf - ./vector-x86_64-unknown-linux-musl/bin/vector
 
-FROM quay.io/astronomer/ap-base:3.20.3-1
+FROM quay.io/astronomer/ap-base:3.20.5
 
 LABEL maintainer="Astronomer <[email protected]>"
 

diff --git a/vector/version.txt b/vector/version.txt
@@ -1 +1 @@
-0.44.0-1
+0.44.0-2