Update to Py3.6.5 for Windows Docker
- Minor build fixes in Appveyor
This commit is contained in:
Родитель
5d4ede9acc
Коммит
935805155f
|
@ -66,13 +66,13 @@ after_test:
|
|||
if ($env:APPVEYOR_REPO_TAG -eq "true") {
|
||||
$env:BATCH_SHIPYARD_CLI_ARITFACT = "batch-shipyard-" + $env:APPVEYOR_REPO_TAG_NAME + "-cli-win-amd64.exe"
|
||||
$env:UPLOAD_PATH="releases/" + $env:APPVEYOR_REPO_TAG_NAME
|
||||
$env:BUILDVER_DOTTED = $env:APPVEYOR_REPO_TAG
|
||||
$env:BUILDVER_DOTTED = $env:APPVEYOR_REPO_TAG_NAME
|
||||
}
|
||||
else {
|
||||
if ($env:APPVEYOR_REPO_BRANCH -eq "master" -Or $env:APPVEYOR_REPO_BRANCH -eq "develop") {
|
||||
$env:BATCH_SHIPYARD_CLI_ARITFACT = "batch-shipyard-" + $env:APPVEYOR_REPO_BRANCH + "-" + $env:APPVEYOR_BUILD_NUMBER + "-cli-win-amd64.exe"
|
||||
$env:UPLOAD_PATH="builds/" + $env:APPVEYOR_REPO_BRANCH
|
||||
$env:BUILDVER_DOTTED = [string]::Format("0.0.0.{0}",$env:APPVEYOR_BUILD_NUMBER)
|
||||
$env:BUILDVER_DOTTED = [string]::Format("0.0.{0}",$env:APPVEYOR_BUILD_NUMBER)
|
||||
}
|
||||
else {
|
||||
Write-Host "Invalid tag or branch $env:APPVEYOR_REPO_BRANCH to build binary"
|
||||
|
@ -80,9 +80,9 @@ after_test:
|
|||
}
|
||||
}
|
||||
|
||||
$bvt0,$bvt1,$bvt2,$bvt3 = $env:BUILDVER_DOTTED.split('.')
|
||||
$bvt0,$bvt1,$bvt2 = $env:BUILDVER_DOTTED.split('.')
|
||||
|
||||
$env:BUILDVER_TUPLE = [string]::Format("({0}, {1}, {2}, {3})",$bvt0,$bvt1,$bvt2,$bvt3)
|
||||
$env:BUILDVER_TUPLE = [string]::Format("({0}, {1}, {2}, 0)",$bvt0,$bvt1,$bvt2)
|
||||
|
||||
$env:BRANCH_GITSHA1 = [string]::Format("{0}@{1}",$env:APPVEYOR_REPO_BRANCH,$env:APPVEYOR_REPO_COMMIT.Substring(0,7))
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Dockerfile for Azure/batch-shipyard CLI (Windows)
|
||||
# Adapted from: https://github.com/StefanScherer/dockerfiles-windows/blob/master/python/Dockerfile
|
||||
|
||||
FROM python:3.6.4-windowsservercore-ltsc2016
|
||||
FROM python:3.6.5-windowsservercore-ltsc2016
|
||||
MAINTAINER Fred Park <https://github.com/Azure/batch-shipyard>
|
||||
|
||||
ENV chocolateyUseWindowsCompression false
|
||||
|
@ -34,8 +34,8 @@ COPY --from=0 /batch-shipyard /batch-shipyard
|
|||
|
||||
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
|
||||
|
||||
ENV PYTHON_VERSION 3.6.4
|
||||
ENV PYTHON_PIP_VERSION 9.0.1
|
||||
ENV PYTHON_VERSION 3.6.5
|
||||
ENV PYTHON_PIP_VERSION 9.0.3
|
||||
|
||||
RUN $env:PATH = 'C:\Python;C:\Python\Scripts;{0}' -f $env:PATH ; \
|
||||
Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH ; \
|
||||
|
|
Загрузка…
Ссылка в новой задаче