diff --git a/host/4/bullseye/base/host.Dockerfile b/host/4/bullseye/base/host.Dockerfile index d9263a498..ed25f19fa 100644 --- a/host/4/bullseye/base/host.Dockerfile +++ b/host/4/bullseye/base/host.Dockerfile @@ -16,7 +16,7 @@ RUN BUILD_NUMBER=$(echo ${HOST_VERSION} | cut -d'.' -f 3) && \ git clone --branch v${HOST_VERSION} https://github.com/Azure/azure-functions-host /src/azure-functions-host && \ cd /src/azure-functions-host && \ HOST_COMMIT=$(git rev-list -1 HEAD) && \ - dotnet publish -v q /p:BuildNumber=$BUILD_NUMBER /p:CommitHash=$HOST_COMMIT src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj -c Release --output /azure-functions-host --runtime linux-x64 && \ + dotnet publish -v q /p:BuildNumber=$BUILD_NUMBER /p:CommitHash=$HOST_COMMIT src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj -c Release --output /azure-functions-host --self-contained --runtime linux-x64 && \ mv /azure-functions-host/workers /workers && mkdir /azure-functions-host/workers && \ rm -rf /root/.local /root/.nuget /src \; diff --git a/host/4/bullseye/dotnet-isolated/dotnet6-isolated/dotnet-isolated-composite.template b/host/4/bullseye/dotnet-isolated/dotnet6-isolated/dotnet-isolated-composite.template index 13b0b8beb..2e10878c0 100644 --- a/host/4/bullseye/dotnet-isolated/dotnet6-isolated/dotnet-isolated-composite.template +++ b/host/4/bullseye/dotnet-isolated/dotnet6-isolated/dotnet-isolated-composite.template @@ -8,7 +8,7 @@ COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + ENV AzureWebJobsScriptRoot=/home/site/wwwroot \ HOME=/home \ diff --git a/host/4/bullseye/dotnet-isolated/dotnet7-isolated/dotnet-isolated-composite.template b/host/4/bullseye/dotnet-isolated/dotnet7-isolated/dotnet-isolated-composite.template index 456677437..ddf60801b 100644 --- a/host/4/bullseye/dotnet-isolated/dotnet7-isolated/dotnet-isolated-composite.template +++ b/host/4/bullseye/dotnet-isolated/dotnet7-isolated/dotnet-isolated-composite.template @@ -8,7 +8,7 @@ COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + ENV AzureWebJobsScriptRoot=/home/site/wwwroot \ diff --git a/host/4/bullseye/java/java11/java11-composite.template b/host/4/bullseye/java/java11/java11-composite.template index 25393c735..0e03daf67 100644 --- a/host/4/bullseye/java/java11/java11-composite.template +++ b/host/4/bullseye/java/java11/java11-composite.template @@ -10,7 +10,7 @@ COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image [ "/workers/java", "/azure-functions-host/workers/java" ] EXPOSE 2222 80 diff --git a/host/4/bullseye/java/java17/java17-composite.template b/host/4/bullseye/java/java17/java17-composite.template index 6de385b4b..306a940aa 100644 --- a/host/4/bullseye/java/java17/java17-composite.template +++ b/host/4/bullseye/java/java17/java17-composite.template @@ -10,7 +10,7 @@ COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image [ "/workers/java", "/azure-functions-host/workers/java" ] EXPOSE 2222 80 diff --git a/host/4/bullseye/java/java8/java8-composite.template b/host/4/bullseye/java/java8/java8-composite.template index f12451541..552478b2f 100644 --- a/host/4/bullseye/java/java8/java8-composite.template +++ b/host/4/bullseye/java/java8/java8-composite.template @@ -12,7 +12,7 @@ COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image [ "/workers/java", "/azure-functions-host/workers/java" ] EXPOSE 2222 80 diff --git a/host/4/bullseye/node/node14/node14-composite.template b/host/4/bullseye/node/node14/node14-composite.template index 5335e5c71..e93002f1e 100644 --- a/host/4/bullseye/node/node14/node14-composite.template +++ b/host/4/bullseye/node/node14/node14-composite.template @@ -5,7 +5,7 @@ COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] COPY --from=runtime-image [ "/workers/node", "/azure-functions-host/workers/node" ] diff --git a/host/4/bullseye/node/node16/node16-composite.template b/host/4/bullseye/node/node16/node16-composite.template index ac7c5295f..b63974ca6 100644 --- a/host/4/bullseye/node/node16/node16-composite.template +++ b/host/4/bullseye/node/node16/node16-composite.template @@ -7,7 +7,7 @@ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] COPY --from=runtime-image [ "/workers/node", "/azure-functions-host/workers/node" ] -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + # Chrome Headless Dependencies (01/2023) # https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#chrome-headless-doesnt-launch-on-unix diff --git a/host/4/bullseye/node/node18/node18-composite.template b/host/4/bullseye/node/node18/node18-composite.template index 51c503b33..fc4771ab3 100644 --- a/host/4/bullseye/node/node18/node18-composite.template +++ b/host/4/bullseye/node/node18/node18-composite.template @@ -5,7 +5,7 @@ COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] COPY --from=runtime-image [ "/workers/node", "/azure-functions-host/workers/node" ] diff --git a/host/4/bullseye/node/node20/node20-composite.template b/host/4/bullseye/node/node20/node20-composite.template index b128fa18a..3611d2f4d 100644 --- a/host/4/bullseye/node/node20/node20-composite.template +++ b/host/4/bullseye/node/node20/node20-composite.template @@ -5,7 +5,7 @@ COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ] COPY --from=runtime-image [ "/workers/node", "/azure-functions-host/workers/node" ] diff --git a/host/4/bullseye/powershell/powershell70/powershell70-composite.template b/host/4/bullseye/powershell/powershell70/powershell70-composite.template index 1b2a59cfa..45c0c1357 100644 --- a/host/4/bullseye/powershell/powershell70/powershell70-composite.template +++ b/host/4/bullseye/powershell/powershell70/powershell70-composite.template @@ -19,7 +19,7 @@ RUN apt-get update && \ apt-get install -y libc-dev # copy bundles, host runtime and powershell worker from the build image -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image ["/FuncExtensionBundles", "/FuncExtensionBundles"] COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] COPY --from=runtime-image ["/workers/powershell", "/azure-functions-host/workers/powershell"] diff --git a/host/4/bullseye/powershell/powershell72/powershell72-composite.template b/host/4/bullseye/powershell/powershell72/powershell72-composite.template index 558ec147a..530efb528 100644 --- a/host/4/bullseye/powershell/powershell72/powershell72-composite.template +++ b/host/4/bullseye/powershell/powershell72/powershell72-composite.template @@ -16,7 +16,7 @@ RUN apt-get update && \ apt-get install -y libc-dev # copy bundles, host runtime and powershell worker from the build image -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image ["/FuncExtensionBundles", "/FuncExtensionBundles"] COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] COPY --from=runtime-image ["/workers/powershell", "/azure-functions-host/workers/powershell"] diff --git a/host/4/bullseye/python/python310/python310-composite.template b/host/4/bullseye/python/python310/python310-composite.template index 51bb59d3c..2c7edf881 100644 --- a/host/4/bullseye/python/python310/python310-composite.template +++ b/host/4/bullseye/python/python310/python310-composite.template @@ -6,7 +6,7 @@ FROM mcr.microsoft.com/mirror/docker/library/python:3.10-slim-bullseye ARG HOST_VERSION -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] COPY start.sh /azure-functions-host/ COPY install_ca_certificates.sh /opt/startup/ diff --git a/host/4/bullseye/python/python311/python311-composite.template b/host/4/bullseye/python/python311/python311-composite.template index c7bb0a4b3..6b9b8b69c 100644 --- a/host/4/bullseye/python/python311/python311-composite.template +++ b/host/4/bullseye/python/python311/python311-composite.template @@ -35,7 +35,7 @@ RUN apt-get update && \ FROM mcr.microsoft.com/dotnet/runtime-deps:6.0 ARG HOST_VERSION -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] COPY sshd_config /etc/ssh/ COPY start.sh /azure-functions-host/ diff --git a/host/4/bullseye/python/python37/python37-composite.template b/host/4/bullseye/python/python37/python37-composite.template index 574efbbc2..4afd326a1 100644 --- a/host/4/bullseye/python/python37/python37-composite.template +++ b/host/4/bullseye/python/python37/python37-composite.template @@ -54,7 +54,7 @@ RUN apt-get update && \ #apt-get install -y libc-dev && \ -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] COPY --from=runtime-image [ "/workers/python/3.7/LINUX", "/azure-functions-host/workers/python/3.7/LINUX" ] COPY --from=runtime-image [ "/workers/python/worker.config.json", "/azure-functions-host/workers/python" ] diff --git a/host/4/bullseye/python/python38/python38-composite.template b/host/4/bullseye/python/python38/python38-composite.template index f32d5f4df..b13eb32d2 100644 --- a/host/4/bullseye/python/python38/python38-composite.template +++ b/host/4/bullseye/python/python38/python38-composite.template @@ -53,7 +53,7 @@ RUN apt-get update && \ # Fix from https://github.com/GoogleCloudPlatform/google-cloud-dotnet-powerpack/issues/22#issuecomment-729895157 #apt-get install -y libc-dev -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] COPY --from=runtime-image [ "/workers/python/3.8/LINUX", "/azure-functions-host/workers/python/3.8/LINUX" ] COPY --from=runtime-image [ "/workers/python/worker.config.json", "/azure-functions-host/workers/python" ] diff --git a/host/4/bullseye/python/python39/python39-composite.template b/host/4/bullseye/python/python39/python39-composite.template index 9074cd379..eb922bbc9 100644 --- a/host/4/bullseye/python/python39/python39-composite.template +++ b/host/4/bullseye/python/python39/python39-composite.template @@ -53,7 +53,7 @@ RUN apt-get update && \ # Fix from https://github.com/GoogleCloudPlatform/google-cloud-dotnet-powerpack/issues/22#issuecomment-729895157 #apt-get install -y libc-dev && \ -COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ] + COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] COPY --from=runtime-image [ "/workers/python/3.9/LINUX", "/azure-functions-host/workers/python/3.9/LINUX" ] COPY --from=runtime-image [ "/workers/python/worker.config.json", "/azure-functions-host/workers/python" ] diff --git a/host/4/dotnet-isolated-build.yml b/host/4/dotnet-isolated-build.yml index 614068349..0a8176612 100644 --- a/host/4/dotnet-isolated-build.yml +++ b/host/4/dotnet-isolated-build.yml @@ -13,7 +13,7 @@ pr: - host/4/bullseye/dotnet-isolated/* - host/4/bookworm/dotnet-isolated/* - host/4/mariner/dotnet-isolated/* - - host/4/dotnet-solated-build.yml + - host/4/dotnet-isolated-build.yml trigger: branches: @@ -28,7 +28,7 @@ variables: value: '' jobs: - - job: Dotnet + - job: Dotnet_Isolated strategy: matrix: _isolated-net-6: