* pipeline update

* dockerfile update

* ipset update
This commit is contained in:
Mathew Merrick 2020-07-23 23:21:49 -07:00 коммит произвёл GitHub
Родитель dd7abd1627
Коммит dc37410502
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 21 добавлений и 12 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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
@ -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)

Просмотреть файл

@ -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) \