Skip to content

Commit dc37410

Browse files
authored
Pipeline update (#627)
* pipeline update * dockerfile update * ipset update
1 parent dd7abd1 commit dc37410

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

.pipelines/Dockerfile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:16.04
22
RUN apt-get update && apt-get install -y software-properties-common sudo wget apt-utils apt-transport-https curl lsb-release gnupg jq
33
RUN wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
4-
RUN sudo dpkg -i packages-microsoft-prod.deb
4+
RUN dpkg -i packages-microsoft-prod.deb
55
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
66
RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
7-
RUN apt install -y git golang-1.14-go iptables ipset iproute2 ebtables python3-pip gcc zip dotnet-sdk-3.1 azure-cli
7+
RUN apt install -y git python3-pip gcc zip dotnet-sdk-3.1 azure-cli
88
RUN apt install -y --no-install-recommends clang cmake zlib1g-dev libboost-dev libboost-thread-dev gdb build-essential libssl-dev
9-
RUN sudo pip3 install coverage
10-
ENV PATH="/usr/lib/go-1.14/bin/:${PATH}"
9+
RUN pip3 install coverage
10+
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic multiverse" | sudo tee -a /etc/apt/sources.list
11+
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list
12+
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic main" | sudo tee -a /etc/apt/sources.list
13+
RUN apt-get update && apt-get install -y iptables ipset iproute2 ebtables
14+
RUN wget -qO- https://golang.org/dl/go1.14.6.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
15+
ENV PATH="/usr/lib/go/bin/:${PATH}"
16+
ENV GOROOT="/usr/lib/go"
17+
ENV GOPATH="/root/go"
18+
ENV PATH="/root/go/bin/:${PATH}"
1119
RUN go get github.com/docker/libnetwork/driverapi
1220
RUN go get github.com/gorilla/mux
1321
RUN go get github.com/jstemmer/go-junit-report

.pipelines/pipeline.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@ stages:
9393
name: "BuildLinux"
9494
displayName: "Build Linux"
9595
96-
- script: |
97-
make all-binaries VERSION=$(EnvironmentalVariables.Tag)
98-
sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
99-
workingDirectory: "$(modulePath)"
100-
name: "BuildNPMImage"
101-
displayName: "Build NPM Image"
102-
10396
- bash: |
10497
cd ./output
10598
sudo find . -mindepth 2 -type f -regextype posix-extended ! -iregex '.*\.(zip|tgz)$' -delete
@@ -117,6 +110,13 @@ stages:
117110
name: "Test"
118111
displayName: "Run Tests"
119112
113+
- script: |
114+
make all-binaries VERSION=$(EnvironmentalVariables.Tag)
115+
sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
116+
workingDirectory: "$(modulePath)"
117+
name: "BuildNPMImage"
118+
displayName: "Build NPM Image"
119+
120120
- bash: |
121121
export CODECOV_TOKEN=$(CODECOV_TOKEN)
122122
bash <(curl -s https://codecov.io/bash)

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ publish-azure-vnet-plugin-image:
272272
azure-npm-image: azure-npm
273273
ifeq ($(GOOS),linux)
274274
docker build \
275+
--no-cache \
275276
-f npm/Dockerfile \
276277
-t $(AZURE_NPM_IMAGE):$(VERSION) \
277278
--build-arg NPM_BUILD_DIR=$(NPM_BUILD_DIR) \

0 commit comments

Comments
 (0)