Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions .pipelines/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
FROM ubuntu:20.04
FROM ubuntu:16.04
RUN apt-get update && apt-get install -y software-properties-common sudo wget apt-utils apt-transport-https curl lsb-release gnupg jq
RUN wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
RUN sudo dpkg -i packages-microsoft-prod.deb
RUN dpkg -i packages-microsoft-prod.deb
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
RUN apt install -y git golang-1.14-go iptables ipset iproute2 ebtables python3-pip gcc zip dotnet-sdk-3.1 azure-cli
RUN apt install -y git python3-pip gcc zip dotnet-sdk-3.1 azure-cli
RUN apt install -y --no-install-recommends clang cmake zlib1g-dev libboost-dev libboost-thread-dev gdb build-essential libssl-dev
RUN sudo pip3 install coverage
ENV PATH="/usr/lib/go-1.14/bin/:${PATH}"
RUN pip3 install coverage
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic multiverse" | sudo tee -a /etc/apt/sources.list
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic main" | sudo tee -a /etc/apt/sources.list
RUN apt-get update && apt-get install -y iptables ipset iproute2 ebtables
RUN wget -qO- https://golang.org/dl/go1.14.6.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
ENV PATH="/usr/lib/go/bin/:${PATH}"
ENV GOROOT="/usr/lib/go"
ENV GOPATH="/root/go"
ENV PATH="/root/go/bin/:${PATH}"
RUN go get github.com/docker/libnetwork/driverapi
RUN go get github.com/gorilla/mux
RUN go get github.com/jstemmer/go-junit-report
Expand Down
14 changes: 7 additions & 7 deletions .pipelines/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,6 @@ stages:
name: "BuildLinux"
displayName: "Build Linux"

- script: |
make all-binaries VERSION=$(EnvironmentalVariables.Tag)
sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
workingDirectory: "$(modulePath)"
name: "BuildNPMImage"
displayName: "Build NPM Image"

- bash: |
cd ./output
sudo find . -mindepth 2 -type f -regextype posix-extended ! -iregex '.*\.(zip|tgz)$' -delete
Expand All @@ -117,6 +110,13 @@ stages:
name: "Test"
displayName: "Run Tests"

- script: |
make all-binaries VERSION=$(EnvironmentalVariables.Tag)
sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
workingDirectory: "$(modulePath)"
name: "BuildNPMImage"
displayName: "Build NPM Image"

- bash: |
export CODECOV_TOKEN=$(CODECOV_TOKEN)
bash <(curl -s https://codecov.io/bash)
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ publish-azure-vnet-plugin-image:
azure-npm-image: azure-npm
ifeq ($(GOOS),linux)
docker build \
--no-cache \
-f npm/Dockerfile \
-t $(AZURE_NPM_IMAGE):$(VERSION) \
--build-arg NPM_BUILD_DIR=$(NPM_BUILD_DIR) \
Expand Down