Skip to content

Commit 9ad0aa6

Browse files
authored
Merge branch 'main' into fix/add-parquet-nar-to-nifi
2 parents bf47991 + 192c3f3 commit 9ad0aa6

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file.
88

99
- nifi: Activate `include-hadoop` profile for NiFi version 2.* ([#958]).
1010
- nifi: Add NiFi hadoop Azure and GCP libraries ([#943]).
11-
- base: Add containerdebug tool ([#928]).
11+
- base: Add containerdebug tool ([#928], [#959]).
1212
- tools: Add the package util-linux-core ([#952]).
1313
util-linux-core contains a basic set of Linux utilities, including the
1414
command logger which allows to enter messages into the system log.
@@ -30,6 +30,7 @@ All notable changes to this project will be documented in this file.
3030
[#953]: https://github.com/stackabletech/docker-images/pull/953
3131
[#955]: https://github.com/stackabletech/docker-images/pull/955
3232
[#958]: https://github.com/stackabletech/docker-images/pull/958
33+
[#959]: https://github.com/stackabletech/docker-images/pull/959
3334

3435
## [24.11.0] - 2024-11-18
3536

airflow/Dockerfile

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -99,25 +99,28 @@ ENV AIRFLOW_USER_HOME_DIR=/stackable
9999
ENV PATH=$PATH:/bin:$HOME/app/bin
100100
ENV AIRFLOW_HOME=$HOME/airflow
101101

102-
# Update image and install python
103-
RUN <<EOF
104-
microdnf update
105-
microdnf install \
106-
ca-certificates \
107-
cyrus-sasl \
108-
git \
109-
libpq \
110-
openldap \
111-
openldap-clients \
112-
openssh-clients \
113-
openssl-libs \
114-
openssl-pkcs11 \
115-
python${PYTHON} \
116-
socat \
117-
unixODBC
118-
microdnf clean all
119-
rm -rf /var/cache/yum
120-
102+
# Update image and install needed packages
103+
RUN microdnf update && \
104+
microdnf install \
105+
ca-certificates \
106+
cyrus-sasl \
107+
# Needed for the gitsync functionality
108+
git \
109+
libpq \
110+
# Needed for authentication of clients against LDAP servers
111+
openldap \
112+
openldap-clients \
113+
# We need the openssh libs for the gitsync functionality (the clone target could be e.g. [email protected]:org/repo.git)
114+
openssh-clients \
115+
openssl-libs \
116+
openssl-pkcs11 \
117+
# Airflow needs Python
118+
python${PYTHON} \
119+
socat \
120+
unixODBC && \
121+
microdnf clean all && \
122+
rm -rf /var/cache/yum && \
123+
bash <<EOF
121124
# Get the correct `tini` binary for our architecture.
122125
# It is used as an init alternative in the entrypoint
123126
curl -o /usr/bin/tini "https://repo.stackable.tech/repository/packages/tini/tini-${TINI}-${TARGETARCH}"

stackable-base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:c0e70387664f30cd9cf2795b
1111
ENV CONFIG_UTILS_VERSION=0.2.0
1212
# Find the latest version here: https://github.com/stackabletech/containerdebug/tags
1313
# renovate: datasource=github-tags packageName=stackabletech/containerdebug
14-
ENV CONTAINERDEBUG_VERSION=0.1.0
14+
ENV CONTAINERDEBUG_VERSION=0.1.1
1515
# This SHOULD be kept in sync with operator-templating and other tools to reduce build times
1616
# Find the latest version here: https://doc.rust-lang.org/stable/releases.html
1717
# renovate: datasource=github-releases packageName=rust-lang/rust

0 commit comments

Comments
 (0)