mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Address PR feedback and remove Azure CLI from dockerfiles

Browse source 
We no longer need Azure CLI since publish is now via C#.
This commit is contained in:
Sridhar Periyasamy 2016-03-08 18:46:54 -08:00
parent 3edcab8eab
commit b99e40bfab
3 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packaging/osx/package-osx.sh
View file

@ -16,9 +16,9 @@ help(){
echo "Usage: $0 [--version <pkg version>] [--input <input directory>] [--output <output pkg>] [--help]" echo "Usage: $0 [--version <pkg version>] [--input <input directory>] [--output <output pkg>] [--help]"
echo "" echo ""
echo "Options:" echo "Options:"
echo " --version <pkg version> Specify a version for the package." echo " --version <pkg version> Specify a version for the package. Version format is 4 '.' separated numbers - <major>.<minor>.<patch>.<revision>"
echo " --input <input directory> Package the entire contents of the directory tree." echo " --input <input directory> Package the entire contents of the directory tree."
echo " --output <output pkg> The path to which the package will be written." echo " --output <output pkg> The path to where the package will be written."
exit 1 exit 1
} }
@ -56,11 +56,11 @@ if [ -z "$OUTPUT_PKG" ]; then
fi fi
if [ -z "$INPUT_DIR" ]; then if [ -z "$INPUT_DIR" ]; then
echo "Provide an inout directory. Missing option '--input'" && help echo "Provide an input directory. Missing option '--input'" && help
fi fi
if [ ! -d "$INPUT_DIR" ]; then if [ ! -d "$INPUT_DIR" ]; then
echo "Missing input directory - $INPUT_DIR" 1>&2 echo "'$INPUT_DIR' - is either missing or not a directory" 1>&2
exit 1 exit 1
fi fi

6
scripts/docker/centos/Dockerfile
View file

@ -24,12 +24,6 @@ RUN yum -q -y install tar git cmake clang make
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100 RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
RUN update-alternatives --set c++ /usr/bin/clang++ 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 RUN yum -q -y install sudo
# Setup User to match Host User, and give superuser permissions # Setup User to match Host User, and give superuser permissions

5
scripts/docker/ubuntu/Dockerfile
View file

@ -69,11 +69,6 @@ RUN apt-get -qq install -y debhelper build-essential devscripts git cmake
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100
RUN update-alternatives --set c++ /usr/bin/clang++-3.5 RUN update-alternatives --set c++ /usr/bin/clang++-3.5
# Install azure cli. We need this to publish artifacts.
RUN apt-get -qqy install nodejs-legacy && \
apt-get -qqy install npm && \
npm install -g azure-cli
# Setup User to match Host User, and give superuser permissions # Setup User to match Host User, and give superuser permissions
ARG USER_ID=0 ARG USER_ID=0
RUN useradd -m code_executor -u ${USER_ID} -g sudo RUN useradd -m code_executor -u ${USER_ID} -g sudo