Enable docker support for centos builds
- Added an option '--buildindocker <osname>' to build.sh - Fixed bug which caused packaging to be skipped by default. - Fixed bug which caused tarballs to be generated twice. - Fixed bug to propagate build params(like debug, nopackage) to docker build.
This commit is contained in:
parent
fee3785ad2
commit
5155aa61d7
10 changed files with 94 additions and 62 deletions
49
scripts/docker/centos/Dockerfile
Normal file
49
scripts/docker/centos/Dockerfile
Normal file
|
@ -0,0 +1,49 @@
|
|||
#
|
||||
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
#
|
||||
|
||||
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||
FROM centos:7.1.1503
|
||||
|
||||
RUN yum -q -y install deltarpm
|
||||
RUN yum -q -y install epel-release
|
||||
# RUN yum -y update
|
||||
|
||||
# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib)
|
||||
# Install CoreCLR and CoreFx dependencies
|
||||
RUN yum -q -y install unzip libunwind gettext libcurl-devel openssl-devel zlib libicu-devel
|
||||
|
||||
# RUN apt-get update && \
|
||||
# apt-get -qqy install unzip curl libicu-dev libunwind8 gettext libssl-dev libcurl3-gnutls zlib1g liblttng-ust-dev lldb-3.6-dev lldb-3.6
|
||||
|
||||
# Install Build Prereqs
|
||||
RUN yum -q -y install tar git cmake clang make
|
||||
|
||||
# Use clang as c++ compiler
|
||||
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
|
||||
RUN update-alternatives --set c++ /usr/bin/clang++
|
||||
|
||||
# Install azure cli. We need this to publish artifacts.
|
||||
RUN yum -y install nodejs && \
|
||||
yum -y install npm && \
|
||||
npm install -g azure-cli
|
||||
|
||||
|
||||
RUN yum -q -y install sudo
|
||||
|
||||
# Setup User to match Host User, and give superuser permissions
|
||||
ARG USER_ID=0
|
||||
RUN useradd -m code_executor -u ${USER_ID} -g root
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permssions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
RUN chmod -R 755 /usr/bin/sudo
|
||||
|
||||
# Set user to the one we just created
|
||||
USER ${USER_ID}
|
||||
|
||||
# Set working directory
|
||||
WORKDIR /opt/code
|
|
@ -21,11 +21,12 @@ cd $REPOROOT
|
|||
[ -z "$DOTNET_BUILD_CONTAINER_TAG" ] && DOTNET_BUILD_CONTAINER_TAG="dotnetcli-build"
|
||||
[ -z "$DOTNET_BUILD_CONTAINER_NAME" ] && DOTNET_BUILD_CONTAINER_NAME="dotnetcli-build-container"
|
||||
[ -z "$DOCKER_HOST_SHARE_DIR" ] && DOCKER_HOST_SHARE_DIR=$(pwd)
|
||||
[ -z "$BUILD_COMMAND" ] && BUILD_COMMAND="/opt/code/build.sh"
|
||||
[ -z "$DOCKER_OS" ] && DOCKER_OS=$OSNAME
|
||||
[ -z "$BUILD_COMMAND" ] && BUILD_COMMAND="/opt/code/scripts/build/build.sh"
|
||||
|
||||
# Build the docker container (will be fast if it is already built)
|
||||
header "Building Docker Container"
|
||||
docker build --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG scripts/docker/
|
||||
docker build --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG scripts/docker/$DOCKER_OS
|
||||
|
||||
# Run the build in the container
|
||||
header "Launching build in Docker Container"
|
||||
|
@ -43,4 +44,5 @@ docker run -t --rm --sig-proxy=true \
|
|||
-e REPO_USER \
|
||||
-e REPO_PASS \
|
||||
-e REPO_SERVER \
|
||||
$DOTNET_BUILD_CONTAINER_TAG $BUILD_COMMAND $1
|
||||
$DOTNET_BUILD_CONTAINER_TAG \
|
||||
bash -c "${BUILD_COMMAND}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue