Skip to content

Commit

Permalink
Host Version updates for Func36 release (#1162)
Browse files Browse the repository at this point in the history
  • Loading branch information
pragnagopa authored Sep 11, 2024
1 parent cb63530 commit 98eb6df
Show file tree
Hide file tree
Showing 55 changed files with 58 additions and 60 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2

FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand All @@ -13,7 +13,7 @@ RUN BUILD_NUMBER=$(echo ${HOST_VERSION} | cut -d'.' -f 3) && \
mv /azure-functions-host/workers /workers && mkdir /azure-functions-host/workers && \
rm -rf /root/.local /root/.nuget /src

FROM mcr.microsoft.com/dotnet/aspnet:9.0-preview-bookworm-slim-amd64
FROM mcr.microsoft.com/dotnet/aspnet:9.0-bookworm-slim-amd64
ARG HOST_VERSION

ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand All @@ -13,7 +13,7 @@ RUN BUILD_NUMBER=$(echo ${HOST_VERSION} | cut -d'.' -f 3) && \
mv /azure-functions-host/workers /workers && mkdir /azure-functions-host/workers && \
rm -rf /root/.local /root/.nuget /src

FROM mcr.microsoft.com/dotnet/aspnet:9.0-preview-bookworm-slim-amd64
FROM mcr.microsoft.com/dotnet/aspnet:9.0-bookworm-slim-amd64
ARG HOST_VERSION

ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
Expand Down
2 changes: 1 addition & 1 deletion host/4/bookworm/dotnet/dotnet6.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.635.1
ARG HOST_VERSION=4.636.0
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS dn8-sdk-image
FROM mcr.microsoft.com/dotnet/sdk:6.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION
Expand Down
2 changes: 1 addition & 1 deletion host/4/bookworm/dotnet/dotnet8-appservice.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.835.1
ARG HOST_VERSION=4.836.0
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bookworm/dotnet/dotnet8.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.835.1
ARG HOST_VERSION=4.836.0
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bookworm/java/java21/java21-appservice.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG JAVA_VERSION=21.0.1
ARG JAVA_HOME=/usr/lib/jvm/msft-21-x64
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bookworm/java/java21/java21-slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
ARG JAVA_VERSION=21.0.1
ARG JAVA_HOME=/usr/lib/jvm/msft-21-x64
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
Expand Down
2 changes: 1 addition & 1 deletion host/4/bookworm/java/java21/java21.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
ARG JAVA_VERSION=21.0.1
ARG JAVA_HOME=/usr/lib/jvm/msft-21-x64
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
Expand Down
5 changes: 2 additions & 3 deletions host/4/bookworm/node/node22/node22-appservice.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand All @@ -10,7 +10,6 @@ RUN BUILD_NUMBER=$(echo ${HOST_VERSION} | cut -d'.' -f 3) && \
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 && \

mv /azure-functions-host/workers /workers && mkdir /azure-functions-host/workers && \
rm -rf /root/.local /root/.nuget /src

Expand Down Expand Up @@ -51,7 +50,7 @@ ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
ASPNETCORE_CONTENTROOT=/azure-functions-host \
ASPNETCORE_URLS=http://+:80

COPY --from=dn8-sdk-image [ "/usr/share/dotnet", "/usr/share/dotnet" ]
COPY --from=runtime-image [ "/usr/share/dotnet", "/usr/share/dotnet" ]
COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ]
COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ]
COPY --from=runtime-image [ "/workers/node", "/azure-functions-host/workers/node" ]
Expand Down
3 changes: 1 addition & 2 deletions host/4/bookworm/node/node22/node22.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand All @@ -10,7 +10,6 @@ RUN BUILD_NUMBER=$(echo ${HOST_VERSION} | cut -d'.' -f 3) && \
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 && \

mv /azure-functions-host/workers /workers && mkdir /azure-functions-host/workers && \
rm -rf /root/.local /root/.nuget /src

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#-------------------------------------------------------------------------------------------------------------

# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bookworm/python/python312/python312.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#-------------------------------------------------------------------------------------------------------------

# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/base/host.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION
Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/dotnet-inproc/dotnet-appservice.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.635.1
ARG HOST_VERSION=4.636.0
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/dotnet-inproc/dotnet.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.635.1
ARG HOST_VERSION=4.636.0
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/java/java11/java11-slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
ARG JAVA_VERSION=11.0.21
ARG JAVA_HOME=/usr/lib/jvm/msft-11-x64
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/java/java11/java11.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
ARG JAVA_VERSION=11.0.21
ARG JAVA_HOME=/usr/lib/jvm/msft-11-x64
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/java/java17/java17-slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
ARG JAVA_VERSION=17.0.9
ARG JAVA_HOME=/usr/lib/jvm/msft-17-x64
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/java/java17/java17.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
ARG JAVA_VERSION=17.0.9
ARG JAVA_HOME=/usr/lib/jvm/msft-17-x64
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/java/java8/java8-slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
ARG JAVA_VERSION=8u392b08
ARG JDK_NAME=jdk8u392-b08
ARG JAVA_HOME=/usr/lib/jvm/adoptium-8-x64
Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/java/java8/java8.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
ARG JAVA_VERSION=8u392b08
ARG JDK_NAME=jdk8u392-b08
ARG JAVA_HOME=/usr/lib/jvm/adoptium-8-x64
Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/node/node14/node14-slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/node/node14/node14.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/node/node16/node16-slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/node/node16/node16.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/node/node18/node18-slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/node/node18/node18.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/node/node20/node20-slim.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/node/node20/node20.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/python/python310/python310-slim.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#-------------------------------------------------------------------------------------------------------------

# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/python/python310/python310.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#-------------------------------------------------------------------------------------------------------------

# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/python/python311/python311-slim.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#-------------------------------------------------------------------------------------------------------------

# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/python/python311/python311.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#-------------------------------------------------------------------------------------------------------------

# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
2 changes: 1 addition & 1 deletion host/4/bullseye/python/python37/python37-slim.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#-------------------------------------------------------------------------------------------------------------

# Build the runtime from source
ARG HOST_VERSION=4.1036.0
ARG HOST_VERSION=4.1036.2
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime-image
ARG HOST_VERSION

Expand Down
Loading

0 comments on commit 98eb6df

Please sign in to comment.