microsoft
/
Oryx
зеркало из https://github.com/microsoft/Oryx.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed dotnet core base image break and add Python version 3.8.2 (#517)

This commit is contained in:
Kiran 2020-03-05 09:27:57 -08:00 коммит произвёл GitHub
Родитель 7d7b05ffc1
Коммит d00ce52f9c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
15 изменённых файлов: 57 добавлений и 161 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
build/__pythonVersions.sh
Просмотреть файл

@ -1,8 +1,8 @@
# This file was auto-generated from 'constants.yaml'. Changes may be overridden.
PYTHON_BASE_TAG='20200217.4'
PIP_VERSION='19.3.1'
PIP_VERSION='20.0.2'
PYTHON27_VERSION='2.7.17'
PYTHON36_VERSION='3.6.10'
PYTHON37_VERSION='3.7.6'
PYTHON38_VERSION='3.8.1'
PYTHON38_VERSION='3.8.2'

4
build/constants.yaml
Просмотреть файл

@ -47,11 +47,11 @@
- name: python-versions
constants:
python-base-tag: 20200217.4
pip-version: 19.3.1
pip-version: 20.0.2
python27-version: 2.7.17
python36-version: 3.6.10
python37-version: 3.7.6
python38-version: 3.8.1
python38-version: 3.8.2
outputs:
- type: csharp
directory: src/BuildScriptGenerator

5
images/build/python/2.7/Dockerfile
Просмотреть файл

@ -1,5 +0,0 @@
# Build Python 2.7
FROM python-build-prereqs
WORKDIR /usr/src/python
ENV GPG_KEY=C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
RUN . /tmp/__pythonVersions.sh && PYTHON_VERSION=$PYTHON27_VERSION PIP_VERSION=$PIP_VERSION /tmp/build.sh

5
images/build/python/3.6/Dockerfile
Просмотреть файл

@ -1,5 +0,0 @@
# Build Python 3.6
FROM python-build-prereqs
WORKDIR /usr/src/python
ENV GPG_KEY=0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
RUN . /tmp/__pythonVersions.sh && PYTHON_VERSION=$PYTHON36_VERSION PIP_VERSION=$PIP_VERSION /tmp/build.sh

5
images/build/python/3.7/Dockerfile
Просмотреть файл

@ -1,5 +0,0 @@
# Build Python 3.7
FROM python-build-prereqs
WORKDIR /usr/src/python
ENV GPG_KEY=0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
RUN . /tmp/__pythonVersions.sh && PYTHON_VERSION=$PYTHON37_VERSION PIP_VERSION=$PIP_VERSION /tmp/build.sh

5
images/build/python/3.8/Dockerfile
Просмотреть файл

@ -1,5 +0,0 @@
# Build Python 3.8
FROM python-build-prereqs
WORKDIR /usr/src/python
ENV GPG_KEY=E3FF2839C048B25C084DEBE9B26995E310250568
RUN . /tmp/__pythonVersions.sh && PYTHON_VERSION=$PYTHON38_VERSION PIP_VERSION=$PIP_VERSION /tmp/build.sh

14
images/build/python/prereqs/Dockerfile
Просмотреть файл

@ -1,14 +0,0 @@
# Install Python build prerequisites
FROM buildpack-deps:stretch
COPY build/__pythonVersions.sh /tmp/
COPY images/build/python/prereqs/build.sh /tmp/
COPY images/receiveGpgKeys.sh /tmp/receiveGpgKeys.sh
RUN chmod +x /tmp/receiveGpgKeys.sh
RUN chmod +x /tmp/build.sh && \
apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y --no-install-recommends \
tk-dev \
uuid-dev \
libgeos-dev

72
images/build/python/prereqs/build.sh
Просмотреть файл

@ -1,72 +0,0 @@
#!/bin/bash
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT license.
# --------------------------------------------------------------------------------------------
set -ex
wget https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz -O /python.tar.xz
wget https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc -O /python.tar.xz.asc
# Try getting the keys 5 times at most
/tmp/receiveGpgKeys.sh $GPG_KEY
gpg --batch --verify /python.tar.xz.asc /python.tar.xz
tar -xJf /python.tar.xz --strip-components=1 -C .
INSTALLATION_PREFIX=/opt/python/$PYTHON_VERSION
if [ "${PYTHON_VERSION::1}" == "2" ]; then
./configure \
--prefix=$INSTALLATION_PREFIX \
--build=$(dpkg-architecture --query DEB_BUILD_GNU_TYPE) \
--enable-shared \
--enable-unicode=ucs4
else
./configure \
--prefix=$INSTALLATION_PREFIX \
--build=$(dpkg-architecture --query DEB_BUILD_GNU_TYPE) \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip
fi
make -j $(nproc)
make install
# Install pip
wget https://bootstrap.pypa.io/get-pip.py -O /get-pip.py
LD_LIBRARY_PATH=/usr/src/python \
/usr/src/python/python /get-pip.py \
--prefix $INSTALLATION_PREFIX \
--disable-pip-version-check \
--no-cache-dir \
--no-warn-script-location \
pip==$PIP_VERSION
if [ "${PYTHON_VERSION::1}" == "2" ]; then
LD_LIBRARY_PATH=$INSTALLATION_PREFIX/lib \
$INSTALLATION_PREFIX/bin/pip install --no-cache-dir virtualenv
fi
# Currently only for version '2' of Python, the alias 'python' exists in the 'bin'
# directory. So to make sure other versions also have this alias, we create the link
# explicitly here. This is for the scenarios where a user does 'benv python=3.7' and
# expects the alias 'python' to point to '3.7' rather than '2'. In cases where benv is
# not passed as an explicit python version, the version '2' is used by default. This is
# done in the Dockerfile.
pythonBinDir="$INSTALLATION_PREFIX/bin"
pythonAliasFile="$pythonBinDir/python"
if [ ! -e "$pythonAliasFile" ]; then
IFS='.' read -ra SPLIT_VERSION <<< "$PYTHON_VERSION"
majorAndMinorParts="${SPLIT_VERSION[0]}.${SPLIT_VERSION[1]}"
ln -s $pythonBinDir/python$majorAndMinorParts $pythonBinDir/python
fi
# Replace log level in pip's code as a workaround for https://github.com/pypa/pip/issues/6189
pipReqSetPath=`find $INSTALLATION_PREFIX/lib -path "*site-packages/pip/_internal/req/req_set.py"`
sed -i 's|logger\.debug('\''Cleaning up\.\.\.'\'')|logger\.info('\''Cleaning up\.\.\.'\'')|' "$pipReqSetPath"

7
images/installPlatform.sh
Просмотреть файл

@ -48,11 +48,18 @@ if [ -z "$targetDir" ]; then
targetDir="$platformDir/$VERSION"
fi
START_TIME=$SECONDS
downloadFileAndVerifyChecksum $PLATFORM_NAME $VERSION $fileName
ELAPSED_TIME=$(($SECONDS - $START_TIME))
echo "Downloaded and verified checksum in $ELAPSED_TIME sec(s)."
echo "Extracting..."
START_TIME=$SECONDS
mkdir -p "$targetDir"
tar -xzf $fileName -C "$targetDir"
rm -f "$fileName"
ELAPSED_TIME=$(($SECONDS - $START_TIME))
echo "Extracted contents in $ELAPSED_TIME sec(s)."
if [ "$createLinks" != "false" ]; then
# Create a link : major.minor => major.minor.patch

2
images/runtime/dotnetcore/2.2/base.Dockerfile
Просмотреть файл

@ -36,7 +36,7 @@ ENV PATH="/opt/dotnetcore-tools:${PATH}"
ENV ASPNETCORE_VERSION 2.2.7
RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-x64.tar.gz \
&& aspnetcore_sha512=''3fdc874a20d5cd318deabf12d73d26bd1f9b767cf351d05bfed5efc6d66c1d774ebd911d7dc28a5a7f6af9976d50068b217ef051024d3c91496d4a44b89b374a' \
&& aspnetcore_sha512='3fdc874a20d5cd318deabf12d73d26bd1f9b767cf351d05bfed5efc6d66c1d774ebd911d7dc28a5a7f6af9976d50068b217ef051024d3c91496d4a44b89b374a' \
&& echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \
&& mkdir -p /usr/share/dotnet \
&& tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \

10
platforms/python/buildPython.sh
Просмотреть файл

@ -28,8 +28,7 @@ buildPythonPrereqsImage() {
buildPython() {
local version="$1"
local gpgKey="$2"
local pipVersion="$3"
local dockerFile="$4"
local dockerFile="$3"
local imageName="oryx/python"
if shouldBuildSdk python python-$version.tar.gz; then
@ -47,16 +46,11 @@ buildPython() {
dockerFile="$pythonPlatformDir/$dockerFile"
fi
if [ -z "$pipVersion" ]; then
# Use default pip version
pipVersion="$PIP_VERSION"
fi
docker build \
-f "$dockerFile" \
--build-arg VERSION_TO_BUILD=$version \
--build-arg GPG_KEYS=$gpgKey \
--build-arg PIP_VERSION=$pipVersion \
--build-arg PIP_VERSION=$PIP_VERSION \
-t $imageName \
$REPO_DIR

3
platforms/python/versionsToBuild.txt
Просмотреть файл

@ -1,4 +1,4 @@
# version, gpg keys, pipVersion
# version, gpg keys, dockerfile
2.7.16, C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF,
2.7.17, C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF,
3.6.9, 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D,
@ -11,6 +11,7 @@
3.8.0b3, E3FF2839C048B25C084DEBE9B26995E310250568,
3.8.0b4, E3FF2839C048B25C084DEBE9B26995E310250568,
3.8.1, E3FF2839C048B25C084DEBE9B26995E310250568,
3.8.2, E3FF2839C048B25C084DEBE9B26995E310250568,
# NOTE: Make sure to set the default version in 'defaultVersion.txt' file

4
src/BuildScriptGenerator/PythonVersions.cs
Просмотреть файл

@ -5,10 +5,10 @@ namespace Microsoft.Oryx.Common
public static class PythonVersions
{
public const string PythonBaseTag = "20200217.4";
public const string PipVersion = "19.3.1";
public const string PipVersion = "20.0.2";
public const string Python27Version = "2.7.17";
public const string Python36Version = "3.6.10";
public const string Python37Version = "3.7.6";
public const string Python38Version = "3.8.1";
public const string Python38Version = "3.8.2";
}
}

76
tests/Oryx.BuildImage.Tests/Python/PythonDynamicInstallationTest.cs
Просмотреть файл

@ -32,46 +32,46 @@ namespace Microsoft.Oryx.BuildImage.Tests
}
}
//[Theory]
//[MemberData(nameof(ImageNameData))]
//public void GeneratesScript_AndBuilds(string imageName)
//{
// // Arrange
// var version = "3.8.1";
// var appName = "flask-app";
// var volume = CreateSampleAppVolume(appName);
// var appDir = volume.ContainerDir;
// var appOutputDir = "/tmp/app-output";
// var script = new ShellScriptBuilder()
// .AddCommand(GetSnippetToCleanUpExistingInstallation())
// .SetEnvironmentVariable(
// SdkStorageConstants.SdkStorageBaseUrlKeyName,
// SdkStorageConstants.DevSdkStorageBaseUrl)
// .AddBuildCommand(
// $"{appDir} --platform python --platform-version {version} -o {appOutputDir} --enable-dynamic-install")
// .ToString();
[Theory]
[MemberData(nameof(ImageNameData))]
public void GeneratesScript_AndBuilds(string imageName)
{
// Arrange
var version = "3.8.1";
var appName = "flask-app";
var volume = CreateSampleAppVolume(appName);
var appDir = volume.ContainerDir;
var appOutputDir = "/tmp/app-output";
var script = new ShellScriptBuilder()
.AddCommand(GetSnippetToCleanUpExistingInstallation())
.SetEnvironmentVariable(
SdkStorageConstants.SdkStorageBaseUrlKeyName,
SdkStorageConstants.DevSdkStorageBaseUrl)
.AddBuildCommand(
$"{appDir} --platform python --platform-version {version} -o {appOutputDir} --enable-dynamic-install")
.ToString();
// // Act
// var result = _dockerCli.Run(new DockerRunArguments
// {
// ImageId = imageName,
// EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
// Volumes = new List<DockerVolume> { volume },
// CommandToExecuteOnRun = "/bin/bash",
// CommandArguments = new[] { "-c", script }
// });
// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = imageName,
EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
CommandArguments = new[] { "-c", script }
});
// // Assert
// RunAsserts(
// () =>
// {
// Assert.True(result.IsSuccess);
// Assert.Contains(
// $"Python Version: {Constants.TemporaryInstallationDirectoryRoot}/python/{version}/bin/python3",
// result.StdOut);
// },
// result.GetDebugInfo());
//}
// Assert
RunAsserts(
() =>
{
Assert.True(result.IsSuccess);
Assert.Contains(
$"Python Version: {Constants.TemporaryInstallationDirectoryRoot}/python/{version}/bin/python3",
result.StdOut);
},
result.GetDebugInfo());
}
private string GetSnippetToCleanUpExistingInstallation()
{

2
vsts/scripts/publishFilesToAzureStorage.sh
Просмотреть файл

@ -16,7 +16,7 @@ uploadFiles() {
return
fi
allFiles=$(find $artifactsDir -type f -name '*.tar.gz' -o -name '*.txt')
allFiles=$(find $artifactsDir -type f -name '*.tar.gz' -o -name 'defaultVersion.txt')
for fileToUpload in $allFiles
do
fileName=$(basename $fileToUpload)