Merge remote-tracking branch 'origin' into user/vijilla/min_ext_enforce

Azure · Oct 23, 2024 · 59a5fe7 · 59a5fe7
2 parents 8bea07d + 232427a
commit 59a5fe7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/host/4/bookworm/python/python312/python312-appservice.Dockerfile b/host/4/bookworm/python/python312/python312-appservice.Dockerfile
@@ -76,6 +76,10 @@ COPY --from=python [ "/opt", "/opt" ]
 RUN for file in /opt/python/3.12/bin/*; do \
         ln -sf "$file" /usr/bin/$(basename "$file"); \
     done
+RUN ln -s /opt/python/3.12/lib/libpython3.12.so.1.0 /usr/lib/libpython3.12.so.1.0
+
+# Install opentelemetry packages
+RUN pip install azure-monitor-opentelemetry-exporter azure-monitor-opentelemetry
 
 ENV LANG=C.UTF-8 \
     ACCEPT_EULA=Y \ 
@@ -87,7 +91,6 @@ ENV LANG=C.UTF-8 \
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     HOST_VERSION=${HOST_VERSION} \
     ASPNETCORE_CONTENTROOT=/azure-functions-host \
-    LD_LIBRARY_PATH=/opt/python/3.12/lib:$LD_LIBRARY_PATH \
     FUNCTIONS_HOSTING_ENVIRONMENT_CONFIG_FILE_PATH=/local/FunctionHostingEnvironmentConfig.json \
     FUNCTIONS_WORKER_RUNTIME_VERSION=3.12 
 

diff --git a/host/4/bookworm/python/python312/python312.Dockerfile b/host/4/bookworm/python/python312/python312.Dockerfile
@@ -74,6 +74,10 @@ COPY --from=python [ "/opt", "/opt" ]
 RUN for file in /opt/python/3.12/bin/*; do \
         ln -sf "$file" /usr/bin/$(basename "$file"); \
     done
+RUN ln -s /opt/python/3.12/lib/libpython3.12.so.1.0 /usr/lib/libpython3.12.so.1.0
+
+# Install opentelemetry packages
+RUN pip install azure-monitor-opentelemetry-exporter azure-monitor-opentelemetry
 
 ENV LANG=C.UTF-8 \
     ACCEPT_EULA=Y \ 
@@ -85,7 +89,6 @@ ENV LANG=C.UTF-8 \
     DOTNET_USE_POLLING_FILE_WATCHER=true \
     HOST_VERSION=${HOST_VERSION} \
     ASPNETCORE_CONTENTROOT=/azure-functions-host \
-    LD_LIBRARY_PATH=/opt/python/3.12/lib:$LD_LIBRARY_PATH \
     FUNCTIONS_HOSTING_ENVIRONMENT_CONFIG_FILE_PATH=/local/FunctionHostingEnvironmentConfig.json \
     FUNCTIONS_WORKER_RUNTIME_VERSION=3.12