X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FAirflow%2FDockerfile;h=1a4184c2ea7e64501be704146d3638f32fc859ab;hb=81077aeb651fd5cd24ba193d362be14895c27aa6;hp=b350a09b770baa9a4f470f249c384ec41e667673;hpb=7b53d2629d0c181e026e4eaa1b271b12f36c85f5;p=osm%2Fdevops.git

diff --git a/docker/Airflow/Dockerfile b/docker/Airflow/Dockerfile
index b350a09b..1a4184c2 100644
--- a/docker/Airflow/Dockerfile
+++ b/docker/Airflow/Dockerfile
@@ -15,23 +15,39 @@
 # limitations under the License.
 #######################################################################################
 
-FROM apache/airflow:2.3.0-python3.8
+FROM apache/airflow:2.5.3-python3.10
 USER root
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
     gcc git python3 python3-dev python3-venv python3-pip \
-    python3-setuptools wget && \
+    python3-setuptools wget zstd && \
     python3 -m pip install -U pip build
 
+USER airflow
+
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_NGSA_URL
 RUN curl $PYTHON3_OSM_COMMON_URL -o osm_common.deb
-RUN dpkg -i ./osm_common.deb
-# RUN curl $PYTHON3_OSM_NGSA_URL -o osm_ngsa.deb
-# RUN dpkg -i ./osm_ngsa.deb
+RUN curl $PYTHON3_OSM_NGSA_URL -o osm_ngsa.deb
+
+RUN ar x osm_common.deb && \
+    zstd -d < control.tar.zst | xz > control.tar.xz && \
+    zstd -d < data.tar.zst | xz > data.tar.xz && \
+    ar -m -c -a sdsd osm_common_repacked.deb debian-binary control.tar.xz data.tar.xz && \
+    rm debian-binary control.tar.xz data.tar.xz control.tar.zst data.tar.zst
+RUN ar x osm_ngsa.deb && \
+   zstd -d < control.tar.zst | xz > control.tar.xz && \
+   zstd -d < data.tar.zst | xz > data.tar.xz && \
+   ar -m -c -a sdsd osm_ngsa_repacked.deb debian-binary control.tar.xz data.tar.xz && \
+   rm debian-binary control.tar.xz data.tar.xz control.tar.zst data.tar.zst
+
+RUN mkdir /tmp/osm
+RUN dpkg-deb -x osm_common_repacked.deb /tmp/osm
+RUN dpkg-deb -x osm_ngsa_repacked.deb /tmp/osm
+RUN mv /tmp/osm/usr/lib/python3/dist-packages/* /home/airflow/.local/lib/python3.10/site-packages/
+RUN rm -rf /tmp/osm
 
 RUN pip3 install \
-    -r /usr/lib/python3/dist-packages/osm_common/requirements.txt
-#    -r /usr/lib/python3/dist-packages/osm_ngsa/requirements.txt
+   -r /home/airflow/.local/lib/python3.10/site-packages/osm_common/requirements.txt \
+   -r /home/airflow/.local/lib/python3.10/site-packages/osm_ngsa/requirements.txt
 
-USER airflow