Remove leftovers from libnetwork move
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff
Sebastiaan van Stijn
parent
159bad5332
commit
42bcc2df68
4 changed files with 0 additions and 373 deletions
|
|
@ -1,26 +0,0 @@
|
|||
# syntax=docker/dockerfile:1.2
|
||||
|
||||
ARG GO_VERSION=1.13.15
|
||||
ARG BASE_DEBIAN_DISTRO="buster"
|
||||
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
|
||||
|
||||
FROM ${GOLANG_IMAGE} AS dev
|
||||
RUN apt-get update && apt-get -y install iptables \
|
||||
protobuf-compiler
|
||||
|
||||
RUN go get -d github.com/gogo/protobuf/protoc-gen-gogo && \
|
||||
cd /go/src/github.com/gogo/protobuf/protoc-gen-gogo && \
|
||||
git reset --hard 30cf7ac33676b5786e78c746683f0d4cd64fa75b && \
|
||||
go install
|
||||
|
||||
RUN go get golang.org/x/lint/golint \
|
||||
golang.org/x/tools/cmd/cover \
|
||||
github.com/mattn/goveralls \
|
||||
github.com/gordonklaus/ineffassign \
|
||||
github.com/client9/misspell/cmd/misspell
|
||||
|
||||
WORKDIR /go/src/github.com/docker/libnetwork
|
||||
|
||||
FROM dev
|
||||
|
||||
COPY . .
|
||||
|
|
@ -1,178 +0,0 @@
|
|||
.PHONY: all all-local build build-local clean cross cross-local vet lint misspell check check-local check-code check-format unit-tests protobuf protobuf-local check-protobuf
|
||||
SHELL=/bin/bash
|
||||
|
||||
dockerbuildargs ?= --target dev - < Dockerfile
|
||||
dockerargs ?= --privileged -v $(shell pwd):/go/src/github.com/docker/libnetwork -w /go/src/github.com/docker/libnetwork
|
||||
build_image=libnetworkbuild
|
||||
container_env = -e "INSIDECONTAINER=-incontainer=true"
|
||||
docker = docker run --rm -it --init ${dockerargs} $$EXTRA_ARGS ${container_env} ${build_image}
|
||||
|
||||
CROSS_PLATFORMS = linux/amd64 linux/386 linux/arm windows/amd64
|
||||
PACKAGES=$(shell go list ./... | grep -v /vendor/)
|
||||
PROTOC_FLAGS=-I=. -I=/go/src -I=/go/src/github.com/gogo/protobuf -I=/go/src/github.com/gogo/protobuf/protobuf
|
||||
|
||||
export PATH := $(CURDIR)/bin:$(PATH)
|
||||
|
||||
|
||||
# Several targets in this Makefile expect to run within the
|
||||
# libnetworkbuild container. In general, a target named '<target>-local'
|
||||
# relies on utilities inside the build container. Usually there is also
|
||||
# a wrapper called '<target>' which starts a container and runs
|
||||
# 'make <target>-local' inside it.
|
||||
|
||||
###########################################################################
|
||||
# Top level targets
|
||||
###########################################################################
|
||||
|
||||
all: build check clean
|
||||
|
||||
all-local: build-local check-local clean
|
||||
|
||||
|
||||
###########################################################################
|
||||
# Build targets
|
||||
###########################################################################
|
||||
|
||||
# builder builds the libnetworkbuild container. All wrapper targets
|
||||
# must depend on this to ensure that the container exists.
|
||||
builder:
|
||||
DOCKER_BUILDKIT=1 docker build --progress=plain -t ${build_image} --build-arg=GO_VERSION ${dockerbuildargs}
|
||||
|
||||
build: builder
|
||||
@echo "🐳 $@"
|
||||
@${docker} make build-local
|
||||
|
||||
build-local:
|
||||
@echo "🐳 $@"
|
||||
@mkdir -p "bin"
|
||||
go build -tags experimental -o "bin/dnet" ./cmd/dnet
|
||||
go build -o "bin/docker-proxy" ./cmd/proxy
|
||||
CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic
|
||||
CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go
|
||||
|
||||
build-images:
|
||||
@echo "🐳 $@"
|
||||
cp cmd/diagnostic/daemon.json ./bin
|
||||
DOCKER_BUILDKIT=1 docker build --progress=plain -f cmd/diagnostic/Dockerfile.client -t dockereng/network-diagnostic:onlyclient bin/
|
||||
DOCKER_BUILDKIT=1 docker build --progress=plain -f cmd/diagnostic/Dockerfile.dind -t dockereng/network-diagnostic:17.12-dind bin/
|
||||
DOCKER_BUILDKIT=1 docker build --progress=plain -f cmd/networkdb-test/Dockerfile -t dockereng/e2e-networkdb:master bin/
|
||||
DOCKER_BUILDKIT=1 docker build --progress=plain -t dockereng/network-diagnostic:support.sh support/
|
||||
|
||||
push-images: build-images
|
||||
@echo "🐳 $@"
|
||||
docker push dockereng/network-diagnostic:onlyclient
|
||||
docker push dockereng/network-diagnostic:17.12-dind
|
||||
docker push dockereng/e2e-networkdb:master
|
||||
docker push dockereng/network-diagnostic:support.sh
|
||||
|
||||
clean:
|
||||
@echo "🐳 $@"
|
||||
@if [ -d bin ]; then \
|
||||
echo "Removing binaries"; \
|
||||
rm -rf bin; \
|
||||
fi
|
||||
|
||||
cross: builder
|
||||
@mkdir -p "bin"
|
||||
@for platform in ${CROSS_PLATFORMS}; do \
|
||||
EXTRA_ARGS="-e GOOS=$${platform%/*} -e GOARCH=$${platform##*/}" ; \
|
||||
echo "$${platform}..." ; \
|
||||
${docker} make cross-local ; \
|
||||
done
|
||||
|
||||
cross-local:
|
||||
@echo "🐳 $@"
|
||||
go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
|
||||
go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
|
||||
|
||||
# Rebuild protocol buffers.
|
||||
# These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt.
|
||||
PROTO_FILES=$(shell find . -path ./vendor -prune -o -name \*.proto -print)
|
||||
PB_FILES=$(PROTO_FILES:.proto=.pb.go)
|
||||
|
||||
# Pattern rule for protoc. If PROTOC_CHECK is defined, it checks
|
||||
# whether the generated files are up to date and fails if they are not
|
||||
%.pb.go: %.proto
|
||||
@if [ ${PROTOC_CHECK} ]; then \
|
||||
protoc ${PROTOC_FLAGS} --gogo_out=/tmp $< ; \
|
||||
diff -q $@ /tmp/$@ >/dev/null || (echo "👹 $@ is out of date; please run 'make protobuf' and check in updates" && exit 1) ; \
|
||||
else \
|
||||
protoc ${PROTOC_FLAGS} --gogo_out=./ $< ; \
|
||||
fi
|
||||
|
||||
.PHONY: $(PROTO_FILES)
|
||||
protobuf: builder
|
||||
@${docker} make protobuf-local
|
||||
protobuf-local: $(PB_FILES)
|
||||
|
||||
|
||||
###########################################################################
|
||||
# Test targets
|
||||
###########################################################################
|
||||
|
||||
check: builder
|
||||
@${docker} make check-local
|
||||
|
||||
check-local: check-code check-format
|
||||
|
||||
check-code: check-protobuf lint vet ineffassign
|
||||
|
||||
check-format: fmt misspell
|
||||
|
||||
unit-tests: builder
|
||||
${docker} make unit-tests-local
|
||||
|
||||
unit-tests-local:
|
||||
@echo "🐳 Running tests... "
|
||||
@echo "mode: count" > coverage.coverprofile
|
||||
@go build -o "bin/docker-proxy" ./cmd/proxy
|
||||
@for dir in $$( find . -maxdepth 10 -not -path './.git*' -not -path '*/_*' -not -path './vendor/*' -type d); do \
|
||||
if ls $$dir/*.go &> /dev/null; then \
|
||||
pushd . &> /dev/null ; \
|
||||
cd $$dir ; \
|
||||
go test ${INSIDECONTAINER} -test.parallel 5 -test.v -covermode=count -coverprofile=./profile.tmp ; \
|
||||
ret=$$? ;\
|
||||
if [ $$ret -ne 0 ]; then exit $$ret; fi ;\
|
||||
popd &> /dev/null; \
|
||||
if [ -f $$dir/profile.tmp ]; then \
|
||||
cat $$dir/profile.tmp | tail -n +2 >> coverage.coverprofile ; \
|
||||
rm $$dir/profile.tmp ; \
|
||||
fi ; \
|
||||
fi ; \
|
||||
done
|
||||
@echo "Done running tests"
|
||||
|
||||
# Depends on binaries because vet will silently fail if it can not load compiled imports
|
||||
vet: ## run go vet
|
||||
@echo "🐳 $@"
|
||||
@test -z "$$(go vet ${PACKAGES} 2>&1 | grep -v 'constant [0-9]* not a string in call to Errorf' | egrep -v '(timestamp_test.go|duration_test.go|exit status 1)' | tee /dev/stderr)"
|
||||
|
||||
misspell:
|
||||
@echo "🐳 $@"
|
||||
@test -z "$$(find . -type f | grep -v vendor/ | grep "\.go\|\.md" | xargs misspell -error | tee /dev/stderr)"
|
||||
|
||||
fmt: ## run go fmt
|
||||
@echo "🐳 $@"
|
||||
@test -z "$$(gofmt -s -l . | grep -v vendor/ | grep -v ".pb.go$$" | tee /dev/stderr)" || \
|
||||
(echo "👹 please format Go code with 'gofmt -s -w'" && false)
|
||||
|
||||
lint: ## run go lint
|
||||
@echo "🐳 $@"
|
||||
@test -z "$$(golint ./... | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)"
|
||||
|
||||
ineffassign: ## run ineffassign
|
||||
@echo "🐳 $@"
|
||||
@test -z "$$(ineffassign . | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)"
|
||||
|
||||
# check-protobuf rebuilds .pb.go files and fails if they have changed
|
||||
check-protobuf: PROTOC_CHECK=1
|
||||
check-protobuf: $(PB_FILES)
|
||||
@echo "🐳 $@"
|
||||
|
||||
|
||||
###########################################################################
|
||||
# Utility targets
|
||||
###########################################################################
|
||||
|
||||
shell: builder
|
||||
@${docker} ${SHELL}
|
||||
58
libnetwork/Vagrantfile
vendored
58
libnetwork/Vagrantfile
vendored
|
|
@ -1,58 +0,0 @@
|
|||
# -*- mode: ruby -*-
|
||||
# vi: set ft=ruby :
|
||||
|
||||
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
|
||||
VAGRANTFILE_API_VERSION = "2"
|
||||
|
||||
$consul=<<SCRIPT
|
||||
apt-get update
|
||||
apt-get -y install wget
|
||||
wget -qO- https://experimental.docker.com/ | sh
|
||||
gpasswd -a vagrant docker
|
||||
service docker restart
|
||||
docker run -d -p 8500:8500 -p 8300-8302:8300-8302/tcp -p 8300-8302:8300-8302/udp -h consul progrium/consul -server -bootstrap
|
||||
SCRIPT
|
||||
|
||||
$bootstrap=<<SCRIPT
|
||||
apt-get update
|
||||
apt-get -y install wget curl
|
||||
apt-get -y install bridge-utils
|
||||
wget -qO- https://experimental.docker.com/ | sh
|
||||
gpasswd -a vagrant docker
|
||||
echo DOCKER_OPTS=\\"--cluster-store=consul://192.168.33.10:8500 --cluster-advertise=${1}:0\\" >> /etc/default/docker
|
||||
cp /vagrant/docs/vagrant-systemd/docker.service /etc/systemd/system/
|
||||
systemctl daemon-reload
|
||||
systemctl restart docker.service
|
||||
SCRIPT
|
||||
|
||||
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||
config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
|
||||
num_nodes = 2
|
||||
base_ip = "192.168.33."
|
||||
net_ips = num_nodes.times.collect { |n| base_ip + "#{n+11}" }
|
||||
|
||||
config.vm.define "consul-server" do |consul|
|
||||
consul.vm.box = "ubuntu/trusty64"
|
||||
consul.vm.hostname = "consul-server"
|
||||
consul.vm.network :private_network, ip: "192.168.33.10"
|
||||
consul.vm.provider "virtualbox" do |vb|
|
||||
vb.customize ["modifyvm", :id, "--memory", "512"]
|
||||
end
|
||||
consul.vm.provision :shell, inline: $consul
|
||||
end
|
||||
|
||||
num_nodes.times do |n|
|
||||
config.vm.define "net-#{n+1}" do |net|
|
||||
net.vm.box = "ubuntu/xenial64"
|
||||
net_ip = net_ips[n]
|
||||
net_index = n+1
|
||||
net.vm.hostname = "net-#{net_index}"
|
||||
net.vm.provider "virtualbox" do |vb|
|
||||
vb.customize ["modifyvm", :id, "--memory", "1024"]
|
||||
end
|
||||
net.vm.network :private_network, ip: "#{net_ip}"
|
||||
net.vm.provision :shell, inline: $bootstrap, :args => "#{net_ip}"
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,111 +0,0 @@
|
|||
#/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
usage()
|
||||
{
|
||||
cat << EOF
|
||||
NAME:
|
||||
machines - Create Test Environments for Docker Networking
|
||||
|
||||
VERSION:
|
||||
0.1
|
||||
|
||||
USAGE:
|
||||
$0 <command> [command_options] [arguments...]
|
||||
|
||||
COMMANDS:
|
||||
help
|
||||
Help and usage
|
||||
|
||||
up <kv-store> <scale>
|
||||
Create environment with given KV store
|
||||
zookeeper | etcd | consul (default)
|
||||
Create N nodes, default = 2
|
||||
|
||||
destroy
|
||||
Destroy Environment
|
||||
|
||||
EOF
|
||||
}
|
||||
|
||||
step() {
|
||||
printf "\033[0;36m-----> $@\033[0m\n"
|
||||
}
|
||||
|
||||
up()
|
||||
{
|
||||
step "Creating KV Store Machine"
|
||||
docker-machine create \
|
||||
-d virtualbox \
|
||||
mh-kv
|
||||
|
||||
step "KV Store is $1"
|
||||
step "Starting KV Container"
|
||||
case "$1" in
|
||||
etcd)
|
||||
cluster_store="cluster-store=etcd://$(docker-machine ip mh-kv):2379"
|
||||
docker $(docker-machine config mh-kv) run -d \
|
||||
-p "2379:2379" \
|
||||
-h "etcd" \
|
||||
--name "etcd" \
|
||||
quay.io/coreos/etcd:v2.2.1 \
|
||||
--listen-client-urls="http://0.0.0.0:2379" \
|
||||
--advertise-client-urls="http://$(docker-machine ip mh-kv):2379"
|
||||
;;
|
||||
zookeeper)
|
||||
cluster_store="cluster-store=zk://$(docker-machine ip mh-kv):2181"
|
||||
docker $(docker-machine config mh-kv) run -d \
|
||||
-p "2181:2181" \
|
||||
-h "zookeeper" \
|
||||
--name "zookeeper" \
|
||||
tianon/zookeeper
|
||||
;;
|
||||
*)
|
||||
cluster_store="cluster-store=consul://$(docker-machine ip mh-kv):8500"
|
||||
docker $(docker-machine config mh-kv) run -d \
|
||||
-p "8500:8500" \
|
||||
-h "consul" \
|
||||
--name "consul" \
|
||||
progrium/consul -server -bootstrap-expect 1
|
||||
;;
|
||||
esac
|
||||
|
||||
machines=$2
|
||||
if [ -z machines ]; then
|
||||
machines=2
|
||||
fi
|
||||
step "Creating $machines Machines"
|
||||
|
||||
for i in $(seq $machines); do
|
||||
step "Creating machine $i"
|
||||
docker-machine create \
|
||||
-d virtualbox \
|
||||
--engine-opt="cluster-advertise=eth1:2376" \
|
||||
--engine-opt="$cluster_store" \
|
||||
mh-$i
|
||||
done
|
||||
}
|
||||
|
||||
destroy()
|
||||
{
|
||||
for x in $(docker-machine ls | grep mh- | awk '{ print $1 }'); do
|
||||
docker-machine rm $x
|
||||
done
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
up)
|
||||
shift
|
||||
up $@
|
||||
;;
|
||||
destroy)
|
||||
destroy $@
|
||||
;;
|
||||
help)
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
;;
|
||||
esac
|
||||
Loading…
Add table
Reference in a new issue