From b34d7772e3f28784cbc89d025b3db95532117f53 Mon Sep 17 00:00:00 2001 From: Sridhar Periyasamy Date: Tue, 10 Nov 2015 17:20:18 -0800 Subject: [PATCH 1/3] Install azure cli in the docker container We need azure cli to publish atrifacts to the azure blob storage. --- scripts/docker/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index e252801dc..8e6610b46 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -17,5 +17,10 @@ RUN echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee # Use clang as c++ compiler RUN update-alternatives --set c++ /usr/bin/clang++ +# Install azure cli. We need this to publish atrifacts. +RUN apt-get install nodejs-legacy \ + apt-get install npm \ + npm install -g azure-cli + # Set working directory WORKDIR /opt/code From 0878879bc8d730261e0932fdbf7dcc04193a125f Mon Sep 17 00:00:00 2001 From: Sridhar Periyasamy Date: Tue, 10 Nov 2015 17:28:46 -0800 Subject: [PATCH 2/3] Fix type in Dockerfile and set the UPLOAD_URL variable to the correct location. --- scripts/docker/Dockerfile | 4 ++-- scripts/publish.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 8e6610b46..1b3e781f9 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -18,8 +18,8 @@ RUN echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee RUN update-alternatives --set c++ /usr/bin/clang++ # Install azure cli. We need this to publish atrifacts. -RUN apt-get install nodejs-legacy \ - apt-get install npm \ +RUN apt-get install nodejs-legacy && \ + apt-get install npm && \ npm install -g azure-cli # Set working directory diff --git a/scripts/publish.sh b/scripts/publish.sh index b21c45653..3e7b0209b 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -165,6 +165,7 @@ upload_installers_to_blob_storage(){ # debain packages need to be uploaded to the PPA feed too if [[ $installfile == *.deb ]]; then DEB_FILE=$installfile + UPLOAD_URL="https://$STORAGE_ACCOUNT.blob.core.windows.net/$STORAGE_CONTAINER/$blob" generate_repoclient_json call_repo_client fi From e31dae6beecf0ab7c81a6863a7a74bcd62692d1b Mon Sep 17 00:00:00 2001 From: Sridhar Periyasamy Date: Tue, 10 Nov 2015 17:49:33 -0800 Subject: [PATCH 3/3] Add '-y' to prevent prompts during installation. --- scripts/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 1b3e781f9..1f7b1ca76 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -18,8 +18,8 @@ RUN echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee RUN update-alternatives --set c++ /usr/bin/clang++ # Install azure cli. We need this to publish atrifacts. -RUN apt-get install nodejs-legacy && \ - apt-get install npm && \ +RUN apt-get -y install nodejs-legacy && \ + apt-get -y install npm && \ npm install -g azure-cli # Set working directory