Update base image for Airflow to support Python 3.10

[osm/devops.git] / docker / Airflow / Dockerfile

diff --git a/docker/Airflow/Dockerfile b/docker/Airflow/Dockerfile
index 73591cd..bf72444 100644 (file)
--- a/docker/Airflow/Dockerfile
+++ b/docker/Airflow/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #######################################################################################
 
-FROM apache/airflow:2.3.0-python3.8
+FROM apache/airflow:2.5.2-python3.10
 USER root
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
@@ -23,15 +23,20 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     python3-setuptools wget && \
     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 mkdir /tmp/osm
+RUN dpkg-deb -x osm_common.deb /tmp/osm
+RUN dpkg-deb -x osm_ngsa.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