Optimize docker images build time

liqotech · May 19, 2021 · 2cbef45 · 2cbef45
1 parent 251d714
commit 2cbef45
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 6 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -5,7 +5,7 @@ on:
       - 'v*'
     branches:
       - master
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - reopened
@@ -30,7 +30,7 @@ jobs:
       id: configure
       run: |
         # The ref of the commit to checkout (do not use the merge commit if pull request)
-        if [ "${{ github.event_name }}" == "pull_request_target" ]; then
+        if [ "${{ github.event_name }}" == "pull_request" ]; then
           echo "::set-output name=master::false"
           echo "::set-output name=architectures::linux/amd64"
           echo "::set-output name=commit_ref::${{ github.event.pull_request.head.sha }}"
@@ -49,7 +49,7 @@ jobs:
           echo "::set-output name=repo-suffix::-ci" ||
           echo "::set-output name=repo-suffix::"
 
-        if [ "${{ github.event_name }}" != "pull_request_target" ]; then
+        if [ "${{ github.event_name }}" != "pull_request" ]; then
            echo "::set-output name=ok-to-continue::true"
            echo "::set-output name=repo-name::${{ github.repository }}"
         elif [ "${{ github.event.pull_request.head.repo.full_name }}" == "${{ github.repository }}" ]; then

diff --git a/build/advertisement-broadcaster/Dockerfile b/build/advertisement-broadcaster/Dockerfile
@@ -1,6 +1,9 @@
 FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/advertisement-broadcaster/

diff --git a/build/advertisement-operator/Dockerfile b/build/advertisement-operator/Dockerfile
@@ -1,6 +1,9 @@
 FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/advertisement-operator/

diff --git a/build/auth-service/Dockerfile b/build/auth-service/Dockerfile
@@ -1,6 +1,9 @@
 FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/auth-service/

diff --git a/build/crd-replicator/Dockerfile b/build/crd-replicator/Dockerfile
@@ -1,6 +1,9 @@
 FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/crd-replicator/

diff --git a/build/discovery/Dockerfile b/build/discovery/Dockerfile
@@ -1,6 +1,9 @@
 FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/discovery/

diff --git a/build/init-virtual-kubelet/Dockerfile b/build/init-virtual-kubelet/Dockerfile
@@ -2,6 +2,9 @@ FROM golang:1.16 as builder
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
 ARG BUILD_TAGS=""

diff --git a/build/liqo-test/Dockerfile b/build/liqo-test/Dockerfile
@@ -2,6 +2,10 @@ FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:/usr/local/kubebuilder/bin:$PATH
 ENV GOPATH /go
 
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
+
 # Install kubebuilder
 RUN curl -sL https://go.kubebuilder.io/dl/2.3.0/$(go env GOOS)/$(go env GOARCH) | tar -xz -C /tmp/
 RUN mv /tmp/kubebuilder_2.3.0_$(go env GOOS)_$(go env GOARCH) /usr/local/kubebuilder

diff --git a/build/liqo-webhook/Dockerfile b/build/liqo-webhook/Dockerfile
@@ -1,6 +1,9 @@
 FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/liqo-webhook/

diff --git a/build/liqonet/Dockerfile b/build/liqonet/Dockerfile
@@ -8,6 +8,9 @@ RUN cargo build --bin boringtun --release
 FROM golang:1.16-alpine AS goBuilder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 RUN apk update && apk add git make
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo

diff --git a/build/uninstaller/Dockerfile b/build/uninstaller/Dockerfile
@@ -1,9 +1,11 @@
 FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
-
 ARG BUILD_TAGS=""
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/uninstaller/
 RUN cp uninstaller /usr/bin/uninstaller

diff --git a/build/virtual-kubelet/Dockerfile b/build/virtual-kubelet/Dockerfile
@@ -1,10 +1,11 @@
 FROM golang:1.16 as builder
-
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
-
 ARG BUILD_TAGS=""
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/virtual-kubelet/
 RUN cp virtual-kubelet /usr/bin/virtual-kubelet

diff --git a/build/webhook-configuration/Dockerfile b/build/webhook-configuration/Dockerfile
@@ -1,6 +1,9 @@
 FROM golang:1.16 as builder
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
+COPY go.mod /go/src/github.com/liqotech/liqo/go.mod
+COPY go.sum /go/src/github.com/liqotech/liqo/go.sum
+RUN cd /go/src/github.com/liqotech/liqo/ && go mod download
 COPY . /go/src/github.com/liqotech/liqo
 WORKDIR /go/src/github.com/liqotech/liqo
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$(go env GOARCH) go build ./cmd/webhook-configuration/