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
12 changes: 0 additions & 12 deletions Dockerfile

This file was deleted.

6 changes: 6 additions & 0 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM golang:1.7.4

RUN go get -d golang.org/x/sys/unix
RUN go get -d github.com/containernetworking/cni/pkg/skel

WORKDIR /go/src/github.com/Azure/azure-container-networking
22 changes: 18 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ CNIFILES = \
$(COREFILES)

CNMDIR = cnm/plugin

CNIDIR = cni/plugin

OUTPUTDIR = out
REPO_PATH = /go/src/github.com/Azure/azure-container-networking

BUILD_CONTAINER_IMAGE = acn-build
BUILD_USER ?= $(shell id -u)

VERSION ?= $(shell git describe --tags --always --dirty)

Expand All @@ -37,6 +39,7 @@ ENSURE_OUTPUTDIR_EXISTS := $(shell mkdir -p $(OUTPUTDIR))
# Shorthand target names for convenience.
azure-cnm-plugin: $(OUTPUTDIR)/azure-cnm-plugin
azure-cni-plugin: $(OUTPUTDIR)/azure-cni-plugin
all-binaries: azure-cnm-plugin azure-cni-plugin

# Clean all build artifacts.
.PHONY: clean
Expand All @@ -51,5 +54,16 @@ $(OUTPUTDIR)/azure-cnm-plugin: $(CNMFILES)
$(OUTPUTDIR)/azure-cni-plugin: $(CNIFILES)
go build -v -o $(OUTPUTDIR)/azure-cni-plugin -ldflags "-X main.version=$(VERSION) -s -w" $(CNIDIR)/*.go

install:
go install github.com/Azure/azure-container-networking/cnm
# Build all binaries in a container.
.PHONY: build-containerized
build-containerized:
docker build -f Dockerfile.build -t $(BUILD_CONTAINER_IMAGE):$(VERSION) .
docker run --rm \
-v ${PWD}:$(REPO_PATH):ro \
-v ${PWD}/$(OUTPUTDIR):$(REPO_PATH)/$(OUTPUTDIR) \
$(BUILD_CONTAINER_IMAGE):$(VERSION) \
bash -c '\
make all-binaries && \
chown -R $(BUILD_USER):$(BUILD_USER) $(OUTPUTDIR) \
'

2 changes: 2 additions & 0 deletions build/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
make build-containerized