Skip to content

Commit

Permalink
Revert "Enforcing Min extension bundle versions for node22, java21,py…
Browse files Browse the repository at this point in the history
…thon3.12 and dotnet9-isolated (#1179)" (#1181)

This reverts commit 020dbf3.
  • Loading branch information
pragnagopa authored Oct 29, 2024
1 parent 020dbf3 commit 7a87eb8
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 558 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
HOST_VERSION=${HOST_VERSION} \
ASPNETCORE_CONTENTROOT=/azure-functions-host \
AzureWebJobsFeatureFlags=EnableWorkerIndexing \
FUNCTIONS_HOSTING_ENVIRONMENT_CONFIG_FILE_PATH=/local/FunctionHostingEnvironmentConfig.json \
ASPNETCORE_URLS=http://+:80

COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ]
COPY sshd_config /etc/ssh/
COPY start.sh /azure-functions-host/
COPY install_ca_certificates.sh /opt/startup/
COPY FunctionHostingEnvironmentConfig.json /local/FunctionHostingEnvironmentConfig.json

EXPOSE 2222 80

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
HOST_VERSION=${HOST_VERSION} \
ASPNETCORE_CONTENTROOT=/azure-functions-host \
AzureWebJobsFeatureFlags=EnableWorkerIndexing \
FUNCTIONS_HOSTING_ENVIRONMENT_CONFIG_FILE_PATH=/local/FunctionHostingEnvironmentConfig.json \
ASPNETCORE_URLS=http://+:80

# Default EXPOSE port inherited from Dotnet Base image has changed to 8080. Host still hosts on 80
Expand All @@ -36,7 +35,6 @@ RUN apt-get update && \
COPY --from=runtime-image [ "/azure-functions-host", "/azure-functions-host" ]

COPY install_ca_certificates.sh start_nonappservice.sh /opt/startup/
COPY FunctionHostingEnvironmentConfig.json /local/FunctionHostingEnvironmentConfig.json
RUN chmod +x /opt/startup/install_ca_certificates.sh && \
chmod +x /opt/startup/start_nonappservice.sh

Expand Down
135 changes: 0 additions & 135 deletions host/4/bookworm/java/java21/FunctionHostingEnvironmentConfig.json

This file was deleted.

2 changes: 0 additions & 2 deletions host/4/bookworm/java/java21/java21-appservice.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ COPY --from=runtime-image [ "/workers/java", "/azure-functions-host/workers/java
COPY sshd_config /etc/ssh/
COPY start.sh /azure-functions-host/
COPY install_ca_certificates.sh /opt/startup/
COPY FunctionHostingEnvironmentConfig.json /local/FunctionHostingEnvironmentConfig.json

EXPOSE 2222 80

Expand All @@ -47,7 +46,6 @@ ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
HOST_VERSION=${HOST_VERSION} \
ASPNETCORE_CONTENTROOT=/azure-functions-host \
JAVA_HOME=${JAVA_HOME} \
FUNCTIONS_HOSTING_ENVIRONMENT_CONFIG_FILE_PATH=/local/FunctionHostingEnvironmentConfig.json \
ASPNETCORE_URLS=http://+:80

# Fix from https://github.com/GoogleCloudPlatform/google-cloud-dotnet-powerpack/issues/22#issuecomment-729895157
Expand Down
2 changes: 0 additions & 2 deletions host/4/bookworm/java/java21/java21-slim.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
HOST_VERSION=${HOST_VERSION} \
ASPNETCORE_CONTENTROOT=/azure-functions-host \
JAVA_HOME=${JAVA_HOME} \
FUNCTIONS_HOSTING_ENVIRONMENT_CONFIG_FILE_PATH=/local/FunctionHostingEnvironmentConfig.json \
ASPNETCORE_URLS=http://+:80

# Fix from https://github.com/GoogleCloudPlatform/google-cloud-dotnet-powerpack/issues/22#issuecomment-729895157
Expand All @@ -60,7 +59,6 @@ COPY --from=runtime-image [ "/workers/java", "/azure-functions-host/workers/java
COPY --from=runtime-image [ "${JAVA_HOME}", "${JAVA_HOME}" ]
COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ]
COPY install_ca_certificates.sh start_nonappservice.sh /opt/startup/
COPY FunctionHostingEnvironmentConfig.json /local/FunctionHostingEnvironmentConfig.json
RUN chmod +x /opt/startup/install_ca_certificates.sh && \
chmod +x /opt/startup/start_nonappservice.sh

Expand Down
2 changes: 0 additions & 2 deletions host/4/bookworm/java/java21/java21.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
HOST_VERSION=${HOST_VERSION} \
ASPNETCORE_CONTENTROOT=/azure-functions-host \
JAVA_HOME=${JAVA_HOME} \
FUNCTIONS_HOSTING_ENVIRONMENT_CONFIG_FILE_PATH=/local/FunctionHostingEnvironmentConfig.json \
ASPNETCORE_URLS=http://+:80

# Fix from https://github.com/GoogleCloudPlatform/google-cloud-dotnet-powerpack/issues/22#issuecomment-729895157
Expand All @@ -60,7 +59,6 @@ COPY --from=runtime-image [ "/workers/java", "/azure-functions-host/workers/java
COPY --from=runtime-image [ "${JAVA_HOME}", "${JAVA_HOME}" ]
COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ]
COPY install_ca_certificates.sh start_nonappservice.sh /opt/startup/
COPY FunctionHostingEnvironmentConfig.json /local/FunctionHostingEnvironmentConfig.json
RUN chmod +x /opt/startup/install_ca_certificates.sh && \
chmod +x /opt/startup/start_nonappservice.sh

Expand Down
Loading

0 comments on commit 7a87eb8

Please sign in to comment.