Use containers instead of dockerbuild.sh (#23497)
This commit is contained in:
parent
a4dd539b40
commit
7f6147d50f
|
|
@ -433,7 +433,8 @@ stages:
|
||||||
jobName: Linux_musl_x64_build
|
jobName: Linux_musl_x64_build
|
||||||
jobDisplayName: "Build: Linux Musl x64"
|
jobDisplayName: "Build: Linux Musl x64"
|
||||||
agentOs: Linux
|
agentOs: Linux
|
||||||
buildScript: ./dockerbuild.sh alpine
|
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-WithNode-0fc54a3-20190918214015
|
||||||
|
buildScript: ./build.sh
|
||||||
buildArgs:
|
buildArgs:
|
||||||
--arch x64
|
--arch x64
|
||||||
--os-name linux-musl
|
--os-name linux-musl
|
||||||
|
|
@ -466,7 +467,8 @@ stages:
|
||||||
jobDisplayName: "Build: Linux Musl ARM64"
|
jobDisplayName: "Build: Linux Musl ARM64"
|
||||||
agentOs: Linux
|
agentOs: Linux
|
||||||
useHostedUbuntu: false
|
useHostedUbuntu: false
|
||||||
buildScript: ./dockerbuild.sh ubuntu-alpine37
|
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20200413125008-406629a
|
||||||
|
buildScript: ./build.sh
|
||||||
buildArgs:
|
buildArgs:
|
||||||
--arch arm64
|
--arch arm64
|
||||||
--os-name linux-musl
|
--os-name linux-musl
|
||||||
|
|
|
||||||
|
|
@ -114,6 +114,8 @@ jobs:
|
||||||
name: NetCoreInternal-Pool
|
name: NetCoreInternal-Pool
|
||||||
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
|
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
|
||||||
queue: BuildPool.Server.Amd64.VS2019
|
queue: BuildPool.Server.Amd64.VS2019
|
||||||
|
${{ if ne(parameters.container, '') }}:
|
||||||
|
container: ${{ parameters.container }}
|
||||||
variables:
|
variables:
|
||||||
- AgentOsName: ${{ parameters.agentOs }}
|
- AgentOsName: ${{ parameters.agentOs }}
|
||||||
- ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
|
- ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
|
||||||
|
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
FROM microsoft/dotnet:2.1.0-preview1-runtime-deps-alpine
|
|
||||||
ARG USER
|
|
||||||
ARG USER_ID
|
|
||||||
ARG GROUP_ID
|
|
||||||
ARG WORKDIR
|
|
||||||
|
|
||||||
WORKDIR ${WORKDIR}
|
|
||||||
RUN mkdir -p "/home/$USER" && chown "${USER_ID}:${GROUP_ID}" "/home/$USER"
|
|
||||||
ENV HOME "/home/$USER"
|
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
|
||||||
bash \
|
|
||||||
wget \
|
|
||||||
git \
|
|
||||||
jq \
|
|
||||||
curl \
|
|
||||||
icu-libs \
|
|
||||||
openssl
|
|
||||||
|
|
||||||
USER $USER_ID:$GROUP_ID
|
|
||||||
|
|
||||||
# Disable the invariant mode (set in base image)
|
|
||||||
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
|
|
||||||
ENV LC_ALL en_US.UTF-8
|
|
||||||
ENV LANG en_US.UTF-8
|
|
||||||
|
|
||||||
# Skip package initilization
|
|
||||||
ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine10fcdcf-20190208200917
|
|
||||||
ARG USER
|
|
||||||
ARG USER_ID
|
|
||||||
ARG GROUP_ID
|
|
||||||
ARG WORKDIR
|
|
||||||
|
|
||||||
WORKDIR ${WORKDIR}
|
|
||||||
RUN mkdir -p "/home/$USER" && chown "${USER_ID}:${GROUP_ID}" "/home/$USER"
|
|
||||||
ENV HOME "/home/$USER"
|
|
||||||
|
|
||||||
USER $USER_ID:$GROUP_ID
|
|
||||||
|
|
||||||
# Disable the invariant mode (set in base image)
|
|
||||||
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
|
|
||||||
ENV LC_ALL en_US.UTF-8
|
|
||||||
ENV LANG en_US.UTF-8
|
|
||||||
|
|
||||||
# Skip package initilization
|
|
||||||
ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
|
||||||
Loading…
Reference in New Issue