Enable network-db test image creation

Updated makefile
Moved binaries in the bin/ directory

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>

libnetwork/.gitignore

@@ -2,7 +2,10 @@
 *.o
 *.a
 *.so
+*~
+.*
 bin/
+tags
 
 # Folders
 integration-tmp/

libnetwork/Dockerfile.build

@@ -1,4 +1,4 @@
-FROM golang:1.9.3
+FROM golang:1.10
 RUN apt-get update && apt-get -y install iptables
 
 RUN go get github.com/tools/godep \

libnetwork/Makefile

@@ -28,7 +28,21 @@ build-local:
 	@mkdir -p "bin"
 	go build -tags experimental -o "bin/dnet" ./cmd/dnet
 	go build -o "bin/docker-proxy" ./cmd/proxy
-	GOOS=linux go build -o "./cmd/diagnostic/diagnosticClient" ./cmd/diagnostic
+	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 build -f cmd/diagnostic/Dockerfile.client -t dockereng/network-diagnostic:onlyclient bin/
+	docker build -f cmd/diagnostic/Dockerfile.dind -t dockereng/network-diagnostic:17.12-dind bin/
+	docker build -f cmd/networkdb-test/Dockerfile -t dockereng/e2e-networkdb bin/
+
+push-images: build-images
+	@echo "🐳 $@"
+	docker push dockereng/network-diagnostic:onlyclient
+	docker push dockereng/network-diagnostic:17.12-dind
+	docker push dockereng/e2e-networkdb
 
 clean:
 	@echo "🐳 $@"

libnetwork/cmd/networkdb-test/README

@@ -0,0 +1,15 @@
+SERVER
+
+cd test/networkdb
+env GOOS=linux go build -v testMain.go && docker build -t dockereng/e2e-networkdb .
+(only for testkit case) docker push dockereng/e2e-networkdb
+
+Run server: docker service create --name testdb --network net1 --replicas 3 --env TASK_ID="{{.Task.ID}}" -p mode=host,target=8000 dockereng/e2e-networkdb server 8000
+
+CLIENT
+
+cd test/networkdb
+Join cluster: docker run -it --network net1 dockereng/e2e-networkdb client join testdb 8000
+Join network: docker run -it --network net1 dockereng/e2e-networkdb client join-network testdb 8000 test
+Run test: docker run -it --network net1 dockereng/e2e-networkdb client write-delete-unique-keys testdb 8000 test tableBla 3 10
+check table: curl "localhost:32768/gettable?nid=test&tname=table_name"

libnetwork/test/networkDb/dbserver/ndbServer.go → libnetwork/cmd/networkdb-test/dbserver/ndbServer.go

@@ -9,9 +9,9 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/docker/libnetwork/cmd/networkdb-test/dummyclient"
 	"github.com/docker/libnetwork/diagnostic"
 	"github.com/docker/libnetwork/networkdb"
-	"github.com/docker/libnetwork/test/networkDb/dummyclient"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/test/networkDb/testMain.go → libnetwork/cmd/networkdb-test/testMain.go

@@ -4,8 +4,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/docker/libnetwork/test/networkDb/dbclient"
-	"github.com/docker/libnetwork/test/networkDb/dbserver"
+	"github.com/docker/libnetwork/cmd/networkdb-test/dbclient"
+	"github.com/docker/libnetwork/cmd/networkdb-test/dbserver"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/etchosts/etchosts_test.go

@@ -434,7 +434,7 @@ func TestConcurrentWrites(t *testing.T) {
 	var wg sync.WaitGroup
 	for i := 0; i < 10; i++ {
 		wg.Add(1)
-		go func() {
+		go func(i int) {
 			defer wg.Done()
 
 			rec := []Record{
@@ -453,7 +453,7 @@ func TestConcurrentWrites(t *testing.T) {
 					t.Fatal(err)
 				}
 			}
-		}()
+		}(i)
 	}
 
 	wg.Wait()

libnetwork/test/networkDb/README

@@ -1,15 +0,0 @@
-SERVER
-
-cd test/networkdb
-env GOOS=linux go build -v testMain.go && docker build -t fcrisciani/networkdb-test .
-(only for testkit case) docker push fcrisciani/networkdb-test
-
-Run server: docker service create --name testdb --network net1 --replicas 3 --env TASK_ID="{{.Task.ID}}" -p mode=host,target=8000 fcrisciani/networkdb-test server 8000
-
-CLIENT
-
-cd test/networkdb
-Join cluster: docker run -it --network net1 fcrisciani/networkdb-test client join testdb 8000
-Join network: docker run -it --network net1 fcrisciani/networkdb-test client join-network testdb 8000 test
-Run test: docker run -it --network net1 fcrisciani/networkdb-test client write-delete-unique-keys testdb 8000 test tableBla 3 10
-check table: curl "localhost:32768/gettable?nid=test&tname=table_name"