From a87ab99a593149b3b43b5a0390b9561154bd994d Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Thu, 7 Nov 2024 10:01:47 +0100
Subject: [PATCH 1/4] docs(airflow): Document the need for installed packages

---
 airflow/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index 033d4aa71..ef205acd9 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -105,13 +105,17 @@ microdnf update
 microdnf install \
   ca-certificates \
   cyrus-sasl \
+  # Needed for the gitsync functionality
   git \
   libpq \
+  # Needed for authentication of clients against LDAP servers
   openldap \
   openldap-clients \
+  # We need the openssh libs for the gitsync functionality (the clone target could be e.g. git@github.com:org/repo.git)
   openssh-clients \
   openssl-libs \
   openssl-pkcs11 \
+  # Airflow needs Python
   python${PYTHON} \
   socat \
   unixODBC

From 29dcaa6d4391e7011a6d81db02f0f6873664f522 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Thu, 7 Nov 2024 10:08:02 +0100
Subject: [PATCH 2/4] fix compilation because of comments

---
 airflow/Dockerfile | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index ef205acd9..477477def 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -99,29 +99,29 @@ ENV AIRFLOW_USER_HOME_DIR=/stackable
 ENV PATH=$PATH:/bin:$HOME/app/bin
 ENV AIRFLOW_HOME=$HOME/airflow
 
-# Update image and install python
-RUN <<EOF
-microdnf update
-microdnf install \
-  ca-certificates \
-  cyrus-sasl \
-  # Needed for the gitsync functionality
-  git \
-  libpq \
-  # Needed for authentication of clients against LDAP servers
-  openldap \
-  openldap-clients \
-  # We need the openssh libs for the gitsync functionality (the clone target could be e.g. git@github.com:org/repo.git)
-  openssh-clients \
-  openssl-libs \
-  openssl-pkcs11 \
-  # Airflow needs Python
-  python${PYTHON} \
-  socat \
-  unixODBC
-microdnf clean all
-rm -rf /var/cache/yum
+# Update image and install needed packages
+RUN microdnf update && \
+    microdnf install \
+        ca-certificates \
+        cyrus-sasl \
+        # Needed for the gitsync functionality
+        git \
+        libpq \
+        # Needed for authentication of clients against LDAP servers
+        openldap \
+        openldap-clients \
+        # We need the openssh libs for the gitsync functionality (the clone target could be e.g. git@github.com:org/repo.git)
+        openssh-clients \
+        openssl-libs \
+        openssl-pkcs11 \
+        # Airflow needs Python
+        python${PYTHON} \
+        socat \
+        unixODBC && \
+    microdnf clean all && \
+    rm -rf /var/cache/yum
 
+RUN <<EOF
 # Get the correct `tini` binary for our architecture.
 # It is used as an init alternative in the entrypoint
 curl -o /usr/bin/tini "https://repo.stackable.tech/repository/packages/tini/tini-${TINI}-${TARGETARCH}"

From 641ff9315369a606a43924f564a0fbfc3003171a Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Thu, 7 Nov 2024 10:17:08 +0100
Subject: [PATCH 3/4] Save 2 layers :)

---
 airflow/Dockerfile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index 477477def..02dfb5211 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -43,9 +43,8 @@ RUN microdnf update && \
         # Needed to modify the SBOM
         jq && \
     microdnf clean all && \
-    rm -rf /var/cache/yum
-
-RUN <<EOF
+    rm -rf /var/cache/yum && \
+bash <<EOF
 python${PYTHON} -m venv --system-site-packages /stackable/app
 
 source /stackable/app/bin/activate
@@ -119,9 +118,8 @@ RUN microdnf update && \
         socat \
         unixODBC && \
     microdnf clean all && \
-    rm -rf /var/cache/yum
-
-RUN <<EOF
+    rm -rf /var/cache/yum && \
+bash <<EOF
 # Get the correct `tini` binary for our architecture.
 # It is used as an init alternative in the entrypoint
 curl -o /usr/bin/tini "https://repo.stackable.tech/repository/packages/tini/tini-${TINI}-${TARGETARCH}"

From 296d1b905d8acea690bfedd0420b5fedb0525558 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Fri, 13 Dec 2024 12:31:08 +0100
Subject: [PATCH 4/4] revert layer optimization

---
 airflow/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index 02dfb5211..6dd345440 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -43,8 +43,9 @@ RUN microdnf update && \
         # Needed to modify the SBOM
         jq && \
     microdnf clean all && \
-    rm -rf /var/cache/yum && \
-bash <<EOF
+    rm -rf /var/cache/yum
+
+RUN <<EOF
 python${PYTHON} -m venv --system-site-packages /stackable/app
 
 source /stackable/app/bin/activate