-
Notifications
You must be signed in to change notification settings - Fork 120
Update py run path v2 #153
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,34 @@ | ||
| FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS runtime-image | ||
|
|
||
| ENV PublishWithAspNetCoreTargetManifest=false \ | ||
| HOST_VERSION=2.0.12763 \ | ||
| HOST_COMMIT=5575abf992e867d142d70c7bc054ae0d032facbe | ||
|
|
||
| RUN BUILD_NUMBER=$(echo $HOST_VERSION | cut -d'.' -f 3) && \ | ||
| wget https://github.com/Azure/azure-functions-host/archive/$HOST_COMMIT.tar.gz && \ | ||
| tar xzf $HOST_COMMIT.tar.gz && \ | ||
| cd azure-functions-host-* && \ | ||
| dotnet publish -v q /p:BuildNumber=$BUILD_NUMBER /p:CommitHash=$HOST_COMMIT src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj --output /azure-functions-host && \ | ||
| mv /azure-functions-host/workers /workers && mkdir /azure-functions-host/workers && \ | ||
| rm -rf /workers/powershell/runtimes/win* && \ | ||
| rm -rf /workers/powershell/runtimes/osx && \ | ||
| rm -rf /workers/powershell/runtimes/*arm* | ||
|
|
||
| FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 | ||
|
|
||
| ENV AzureWebJobsScriptRoot=/home/site/wwwroot \ | ||
| HOME=/home \ | ||
| FUNCTIONS_WORKER_RUNTIME=powershell \ | ||
| DOTNET_USE_POLLING_FILE_WATCHER=true | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y gnupg wget unzip && \ | ||
| wget https://functionscdn.azureedge.net/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/1.0.0/Microsoft.Azure.Functions.ExtensionBundle.1.0.0.zip && \ | ||
| mkdir -p /FuncExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/1.0.0 && \ | ||
| unzip /Microsoft.Azure.Functions.ExtensionBundle.1.0.0.zip -d /FuncExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/1.0.0 && \ | ||
| rm -f /Microsoft.Azure.Functions.ExtensionBundle.1.0.0.zip | ||
|
|
||
| COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] | ||
| COPY --from=runtime-image [ "/workers/powershell", "/azure-functions-host/workers/powershell" ] | ||
|
|
||
| FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS runtime-image | ||
| ENV PublishWithAspNetCoreTargetManifest=false \ | ||
| HOST_VERSION=2.0.12792 \ | ||
| HOST_COMMIT=1e7677116a4a94e615f657369d37dc16289071e0 | ||
| RUN BUILD_NUMBER=$(echo $HOST_VERSION | cut -d'.' -f 3) && \ | ||
| wget https://github.com/Azure/azure-functions-host/archive/$HOST_COMMIT.tar.gz && \ | ||
| tar xzf $HOST_COMMIT.tar.gz && \ | ||
| cd azure-functions-host-* && \ | ||
| dotnet publish -v q /p:BuildNumber=$BUILD_NUMBER /p:CommitHash=$HOST_COMMIT src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj --output /azure-functions-host && \ | ||
| mv /azure-functions-host/workers /workers && mkdir /azure-functions-host/workers && \ | ||
| rm -rf /workers/powershell/runtimes/win* && \ | ||
| rm -rf /workers/powershell/runtimes/osx && \ | ||
| rm -rf /workers/powershell/runtimes/*arm* | ||
| FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 | ||
| ENV AzureWebJobsScriptRoot=/home/site/wwwroot \ | ||
| HOME=/home \ | ||
| FUNCTIONS_WORKER_RUNTIME=powershell \ | ||
| DOTNET_USE_POLLING_FILE_WATCHER=true | ||
| RUN apt-get update && \ | ||
| apt-get install -y gnupg wget unzip && \ | ||
| wget https://functionscdn.azureedge.net/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/1.0.0/Microsoft.Azure.Functions.ExtensionBundle.1.0.0.zip && \ | ||
| mkdir -p /FuncExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/1.0.0 && \ | ||
| unzip /Microsoft.Azure.Functions.ExtensionBundle.1.0.0.zip -d /FuncExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/1.0.0 && \ | ||
| rm -f /Microsoft.Azure.Functions.ExtensionBundle.1.0.0.zip | ||
| COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] | ||
| COPY --from=runtime-image [ "/workers/powershell", "/azure-functions-host/workers/powershell" ] | ||
| CMD [ "dotnet", "/azure-functions-host/Microsoft.Azure.WebJobs.Script.WebHost.dll" ] |
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
host/2.0/stretch/amd64/python/python36-context/worker.config.json
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,36 @@ | ||
| FROM python:3.6-slim-stretch | ||
|
|
||
| ENV LANG=C.UTF-8 \ | ||
| ACCEPT_EULA=Y \ | ||
| AzureWebJobsScriptRoot=/home/site/wwwroot \ | ||
| HOME=/home \ | ||
| FUNCTIONS_WORKER_RUNTIME=python \ | ||
| WORKER_TAG=1.0.0 \ | ||
| AZURE_FUNCTIONS_PACKAGE_VERSION=1.0.3 \ | ||
| ASPNETCORE_URLS=http://+:80 \ | ||
| DOTNET_RUNNING_IN_CONTAINER=true \ | ||
| DOTNET_USE_POLLING_FILE_WATCHER=true | ||
|
|
||
| # Install Python dependencies | ||
| RUN apt-get update && \ | ||
| apt-get install -y wget && \ | ||
| echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ | ||
| apt-get update && \ | ||
| apt-get install -y apt-transport-https curl gnupg && \ | ||
| curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ | ||
| curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list && \ | ||
| # Needed for libss1.0.0 and in turn MS SQL | ||
| echo 'deb http://security.debian.org/debian-security jessie/updates main' >> /etc/apt/sources.list && \ | ||
| # install necessary locales for MS SQL | ||
| apt-get update && apt-get install -y locales && \ | ||
| echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && \ | ||
| locale-gen && \ | ||
| # install MS SQL related packages | ||
| apt-get update && \ | ||
| apt-get install -y unixodbc msodbcsql17 mssql-tools && \ | ||
| wget --quiet https://github.com/Azure/azure-functions-python-worker/archive/$WORKER_TAG.tar.gz && \ | ||
| tar xvzf $WORKER_TAG.tar.gz && \ | ||
| mv azure-functions-python-worker-* azure-functions-python-worker && \ | ||
| mv /azure-functions-python-worker/python /python && \ | ||
| rm -rf $WORKER_TAG.tar.gz /azure-functions-python-worker && \ | ||
| pip install azure-functions==$AZURE_FUNCTIONS_PACKAGE_VERSION azure-functions-worker==$WORKER_TAG && \ | ||
| # .NET Core dependencies | ||
| apt-get install -y --no-install-recommends ca-certificates \ | ||
| libc6 libgcc1 libgssapi-krb5-2 libicu57 liblttng-ust0 libssl1.0.2 libstdc++6 zlib1g && \ | ||
| rm -rf /var/lib/apt/lists/* && \ | ||
| mkdir -p /azure-functions-host/workers && \ | ||
| mv /python /azure-functions-host/workers && \ | ||
| # Custom dependencies: | ||
| # OpenCV dependencies: | ||
| apt-get update && \ | ||
| apt-get install -y libglib2.0-0 libsm6 libxext6 libxrender-dev | ||
| FROM python:3.6-slim-stretch | ||
|
|
||
| ENV LANG=C.UTF-8 \ | ||
| ACCEPT_EULA=Y \ | ||
| AzureWebJobsScriptRoot=/home/site/wwwroot \ | ||
| HOME=/home \ | ||
| FUNCTIONS_WORKER_RUNTIME=python \ | ||
| ASPNETCORE_URLS=http://+:80 \ | ||
| DOTNET_RUNNING_IN_CONTAINER=true \ | ||
| DOTNET_USE_POLLING_FILE_WATCHER=true | ||
|
|
||
| # Install Python dependencies | ||
| RUN apt-get update && \ | ||
| apt-get install -y wget && \ | ||
| echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ | ||
| apt-get update && \ | ||
| apt-get install -y apt-transport-https curl gnupg && \ | ||
| curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ | ||
| curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list && \ | ||
| # Needed for libss1.0.0 and in turn MS SQL | ||
| echo 'deb http://security.debian.org/debian-security jessie/updates main' >> /etc/apt/sources.list && \ | ||
| # install necessary locales for MS SQL | ||
| apt-get update && apt-get install -y locales && \ | ||
| echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && \ | ||
| locale-gen && \ | ||
| # install MS SQL related packages | ||
| apt-get update && \ | ||
| apt-get install -y unixodbc msodbcsql17 mssql-tools && \ | ||
| # .NET Core dependencies | ||
| apt-get install -y --no-install-recommends ca-certificates \ | ||
| libc6 libgcc1 libgssapi-krb5-2 libicu57 liblttng-ust0 libssl1.0.2 libstdc++6 zlib1g && \ | ||
| rm -rf /var/lib/apt/lists/* && \ | ||
| # Custom dependencies: | ||
| # OpenCV dependencies: | ||
| apt-get update && \ | ||
| apt-get install -y libglib2.0-0 libsm6 libxext6 libxrender-dev |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,10 @@ | ||
| ARG BASE_IMAGE | ||
| ARG BASE_PYTHON_IMAGE | ||
| FROM ${BASE_IMAGE} as runtime-image | ||
| ARG BASE_PYTHON_IMAGE | ||
| FROM ${BASE_PYTHON_IMAGE} | ||
|
|
||
| COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] | ||
| COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] | ||
|
|
||
| # Add custom worker config | ||
| COPY ./python36-context/start.sh ./python36-context/worker.config.json /azure-functions-host/workers/python/ | ||
| RUN chmod +x /azure-functions-host/workers/python/start.sh | ||
|
|
||
| ARG BASE_IMAGE | ||
| ARG BASE_PYTHON_IMAGE | ||
| FROM ${BASE_IMAGE} as runtime-image | ||
| ARG BASE_PYTHON_IMAGE | ||
| FROM ${BASE_PYTHON_IMAGE} | ||
|
|
||
| COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] | ||
| COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] | ||
|
|
||
| CMD [ "/azure-functions-host/Microsoft.Azure.WebJobs.Script.WebHost" ] |
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
host/2.0/stretch/amd64/python/python37-context/worker.config.json
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,36 @@ | ||
| FROM python:3.7-slim-stretch | ||
|
|
||
| ENV LANG=C.UTF-8 \ | ||
| ACCEPT_EULA=Y \ | ||
| AzureWebJobsScriptRoot=/home/site/wwwroot \ | ||
| HOME=/home \ | ||
| FUNCTIONS_WORKER_RUNTIME=python \ | ||
| WORKER_TAG=1.0.0 \ | ||
| AZURE_FUNCTIONS_PACKAGE_VERSION=1.0.3 \ | ||
| ASPNETCORE_URLS=http://+:80 \ | ||
| DOTNET_RUNNING_IN_CONTAINER=true \ | ||
| DOTNET_USE_POLLING_FILE_WATCHER=true | ||
|
|
||
| # Install Python dependencies | ||
| RUN apt-get update && \ | ||
| apt-get install -y wget && \ | ||
| echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ | ||
| apt-get update && \ | ||
| apt-get install -y apt-transport-https curl gnupg && \ | ||
| curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ | ||
| curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list && \ | ||
| # Needed for libss1.0.0 and in turn MS SQL | ||
| echo 'deb http://security.debian.org/debian-security jessie/updates main' >> /etc/apt/sources.list && \ | ||
| # install necessary locales for MS SQL | ||
| apt-get update && apt-get install -y locales && \ | ||
| echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && \ | ||
| locale-gen && \ | ||
| # install MS SQL related packages | ||
| apt-get update && \ | ||
| apt-get install -y unixodbc msodbcsql17 mssql-tools && \ | ||
| wget --quiet https://github.com/Azure/azure-functions-python-worker/archive/$WORKER_TAG.tar.gz && \ | ||
| tar xvzf $WORKER_TAG.tar.gz && \ | ||
| mv azure-functions-python-worker-* azure-functions-python-worker && \ | ||
| mv /azure-functions-python-worker/python /python && \ | ||
| rm -rf $WORKER_TAG.tar.gz /azure-functions-python-worker && \ | ||
| pip install azure-functions==$AZURE_FUNCTIONS_PACKAGE_VERSION azure-functions-worker==$WORKER_TAG && \ | ||
| # .NET Core dependencies | ||
| apt-get install -y --no-install-recommends ca-certificates \ | ||
| libc6 libgcc1 libgssapi-krb5-2 libicu57 liblttng-ust0 libssl1.0.2 libstdc++6 zlib1g && \ | ||
| rm -rf /var/lib/apt/lists/* && \ | ||
| mkdir -p /azure-functions-host/workers && \ | ||
| mv /python /azure-functions-host/workers && \ | ||
| # Custom dependencies: | ||
| # OpenCV dependencies: | ||
| apt-get update && \ | ||
| apt-get install -y libglib2.0-0 libsm6 libxext6 libxrender-dev | ||
| FROM python:3.7-slim-stretch | ||
|
|
||
| ENV LANG=C.UTF-8 \ | ||
| ACCEPT_EULA=Y \ | ||
| AzureWebJobsScriptRoot=/home/site/wwwroot \ | ||
| HOME=/home \ | ||
| FUNCTIONS_WORKER_RUNTIME=python \ | ||
| ASPNETCORE_URLS=http://+:80 \ | ||
| DOTNET_RUNNING_IN_CONTAINER=true \ | ||
| DOTNET_USE_POLLING_FILE_WATCHER=true | ||
|
|
||
| # Install Python dependencies | ||
| RUN apt-get update && \ | ||
| apt-get install -y wget && \ | ||
| echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ | ||
| apt-get update && \ | ||
| apt-get install -y apt-transport-https curl gnupg && \ | ||
| curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ | ||
| curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list && \ | ||
| # Needed for libss1.0.0 and in turn MS SQL | ||
| echo 'deb http://security.debian.org/debian-security jessie/updates main' >> /etc/apt/sources.list && \ | ||
| # install necessary locales for MS SQL | ||
| apt-get update && apt-get install -y locales && \ | ||
| echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && \ | ||
| locale-gen && \ | ||
| # install MS SQL related packages | ||
| apt-get update && \ | ||
| apt-get install -y unixodbc msodbcsql17 mssql-tools && \ | ||
| # .NET Core dependencies | ||
| apt-get install -y --no-install-recommends ca-certificates \ | ||
| libc6 libgcc1 libgssapi-krb5-2 libicu57 liblttng-ust0 libssl1.0.2 libstdc++6 zlib1g && \ | ||
| rm -rf /var/lib/apt/lists/* && \ | ||
| # Custom dependencies: | ||
| # OpenCV dependencies: | ||
| apt-get update && \ | ||
| apt-get install -y libglib2.0-0 libsm6 libxext6 libxrender-dev |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,10 @@ | ||
| ARG BASE_IMAGE | ||
| ARG BASE_PYTHON_IMAGE | ||
| FROM ${BASE_IMAGE} as runtime-image | ||
| ARG BASE_PYTHON_IMAGE | ||
| FROM ${BASE_PYTHON_IMAGE} | ||
|
|
||
| COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] | ||
| COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] | ||
|
|
||
| # Add custom worker config | ||
| COPY ./python37-context/start.sh ./python37-context/worker.config.json /azure-functions-host/workers/python/ | ||
| RUN chmod +x /azure-functions-host/workers/python/start.sh | ||
|
|
||
| ARG BASE_IMAGE | ||
| ARG BASE_PYTHON_IMAGE | ||
| FROM ${BASE_IMAGE} as runtime-image | ||
| ARG BASE_PYTHON_IMAGE | ||
| FROM ${BASE_PYTHON_IMAGE} | ||
|
|
||
| COPY --from=runtime-image ["/azure-functions-host", "/azure-functions-host"] | ||
| COPY --from=runtime-image [ "/FuncExtensionBundles", "/FuncExtensionBundles" ] | ||
|
|
||
| CMD [ "/azure-functions-host/Microsoft.Azure.WebJobs.Script.WebHost" ] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you also update the version in powershell6.Dockerfile to match this?