cleanup docker build (#2)

plgd-dev · Apr 7, 2020 · 98d6121 · 98d6121
1 parent 6c63f90
commit 98d6121
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 25 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,5 @@
-FROM golang:1.13.5-alpine3.10 AS cloud-build
+FROM golang:1.13.5-alpine3.10 AS test-build
 RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud
-COPY go.mod go.sum ./
-RUN go mod download
-COPY . .
+COPY . .
+RUN go mod download
diff --git a/Makefile b/Makefile
@@ -2,16 +2,10 @@ SHELL = /bin/bash
 SIMULATOR_NAME_SUFFIX ?= $(shell hostname)
 
 SUBDIRS := resource-aggregate authorization resource-directory openapi-connector openapi-gateway coap-gateway grpc-gateway certificate-authority portal-webapi bundle
-.PHONY: $(SUBDIRS) push proto/generate clean build test env make-mongo make-nats make-ca cloud-build
+.PHONY: $(SUBDIRS) push proto/generate clean build test env make-mongo make-nats make-ca test-build
 
 default: build
 
-cloud-build:
-	docker build \
-		--network=host \
-		--tag cloud-build \
-		.
-
 make-ca:
 	docker pull ocfcloud/step-ca:vnext
 	if [ "${TRAVIS_OS_NAME}" == "linux" ]; then \
@@ -59,7 +53,13 @@ env: clean make-ca make-nats make-mongo
 	docker build ./device-simulator --network=host -t device-simulator --target service
 	docker run -d --name=devsim --network=host -t device-simulator devsim-$(SIMULATOR_NAME_SUFFIX)
 
-test: env cloud-build
+test-build:
+	docker build \
+		--network=host \
+		--tag test-build \
+		.
+
+test: env test-build
 	docker run \
 		--network=host \
 		-v $(shell pwd)/.tmp/step-ca/data/certs/root_ca.crt:/root_ca.crt \
@@ -72,10 +72,10 @@ test: env cloud-build
 		-e LISTEN_ACME_DIRECTORY_URL="https://localhost:10443/acme/acme/directory" \
 		-e TEST_COAP_GW_OVERWRITE_LISTEN_ACME_DIRECTORY_URL="https://localhost:10443/acme/ocf.gw/directory" \
 		--mount type=bind,source="$(shell pwd)",target=/shared \
-		cloud-build \
+		test-build \
 		go test -p 1 -v ./... -covermode=atomic -coverprofile=/shared/coverage.txt
 
-build: cloud-build $(SUBDIRS)
+build: $(SUBDIRS)
 
 clean:
 	docker rm -f step-ca-test || true

diff --git a/authorization/Dockerfile b/authorization/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/authorization
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/authorization/Makefile b/authorization/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef
 

diff --git a/bundle/Dockerfile b/bundle/Dockerfile
@@ -1,4 +1,9 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
+WORKDIR $GOPATH/src/github.com/go-ocf/cloud
+COPY . .
+RUN go mod download
+
 ARG root_directory=$GOPATH/src/github.com/go-ocf/cloud
 
 #coap-gateway

diff --git a/bundle/Makefile b/bundle/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef
 

diff --git a/certificate-authority/Dockerfile b/certificate-authority/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/certificate-authority
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/certificate-authority/Makefile b/certificate-authority/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef
 

diff --git a/coap-gateway/Dockerfile b/coap-gateway/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/coap-gateway
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/coap-gateway/Makefile b/coap-gateway/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef
 

diff --git a/grpc-gateway/Dockerfile b/grpc-gateway/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/grpc-gateway
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/grpc-gateway/Makefile b/grpc-gateway/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef
 

diff --git a/openapi-connector/Dockerfile b/openapi-connector/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/openapi-connector
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/openapi-connector/Makefile b/openapi-connector/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef
 

diff --git a/openapi-gateway/Dockerfile b/openapi-gateway/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/openapi-gateway
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/openapi-gateway/Makefile b/openapi-gateway/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef
 

diff --git a/portal-webapi/Dockerfile b/portal-webapi/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/portal-webapi
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/portal-webapi/Makefile b/portal-webapi/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef
 

diff --git a/resource-aggregate/Dockerfile b/resource-aggregate/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/resource-aggregate
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/resource-aggregate/Makefile b/resource-aggregate/Makefile
@@ -11,7 +11,8 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
-		.
+		--file Dockerfile \
+		..
 endef
 
 build-servicecontainer:

diff --git a/resource-directory/Dockerfile b/resource-directory/Dockerfile
@@ -1,5 +1,8 @@
-FROM cloud-build AS build
+FROM golang:1.13.5-alpine3.10 AS build
+RUN apk add --no-cache curl git build-base
 WORKDIR $GOPATH/src/github.com/go-ocf/cloud/resource-directory
+COPY . .
+RUN go mod download
 RUN go build -o /go/bin/service ./cmd/service
 
 FROM alpine:3.11 as service

diff --git a/resource-directory/Makefile b/resource-directory/Makefile
@@ -11,6 +11,7 @@ define build-docker-image
 		--tag ocfcloud/$(SERVICE_NAME):$(VERSION_TAG) \
 		--tag ocfcloud/$(SERVICE_NAME):$(LATEST_TAG) \
 		--target $(1) \
+		--file Dockerfile \
 		.
 endef