From 5fa7e0f8a0e842cb0c90bc529227617a5eb71bc9 Mon Sep 17 00:00:00 2001 From: hasheddan Date: Tue, 4 Feb 2020 09:29:36 -0600 Subject: [PATCH] Use license-check docker image instead of curl Optimizes Docker builds by copying from license-check Docker image instead of using curl to download the tool. Signed-off-by: hasheddan --- auth/basic-auth/Dockerfile | 5 +++-- auth/basic-auth/Dockerfile.arm64 | 5 +++-- gateway/Dockerfile | 6 +++--- gateway/Dockerfile.arm64 | 6 +++--- gateway/Dockerfile.armhf | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/auth/basic-auth/Dockerfile b/auth/basic-auth/Dockerfile index b35f0f13..aec321af 100644 --- a/auth/basic-auth/Dockerfile +++ b/auth/basic-auth/Dockerfile @@ -1,11 +1,12 @@ +FROM teamserverless/license-check:0.3.6 as license-check + FROM golang:1.12-alpine3.11 as build ENV GO111MODULE=off ENV CGO_ENABLED=0 RUN apk add --no-cache curl ca-certificates -RUN curl -sLSf https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh \ - && mv ./license-check /usr/bin/ +COPY --from=license-check /license-check /usr/bin/ WORKDIR /go/src/handler COPY . . diff --git a/auth/basic-auth/Dockerfile.arm64 b/auth/basic-auth/Dockerfile.arm64 index 0209ea0b..cb144298 100644 --- a/auth/basic-auth/Dockerfile.arm64 +++ b/auth/basic-auth/Dockerfile.arm64 @@ -1,11 +1,12 @@ +FROM teamserverless/license-check:0.3.6 as license-check + FROM golang:1.12-alpine3.11 as build ENV GO111MODULE=off ENV CGO_ENABLED=0 RUN apk add --no-cache curl ca-certificates gcc musl-dev -RUN curl -sLSf https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh \ - && mv ./license-check /usr/bin/ +COPY --from=license-check /license-check /usr/bin/ WORKDIR /go/src/handler COPY . . diff --git a/gateway/Dockerfile b/gateway/Dockerfile index d4c7e77f..a1b64db9 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -1,3 +1,5 @@ +FROM teamserverless/license-check:0.3.6 as license-check + FROM golang:1.12 as build ENV GO111MODULE=off @@ -10,9 +12,7 @@ ARG ARCH="x86_64" ARG GOOS=linux ARG GOARM -RUN curl -sLSf \ - https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh \ - && mv ./license-check /usr/bin/ +COPY --from=license-check /license-check /usr/bin/ WORKDIR /go/src/github.com/openfaas/faas/gateway diff --git a/gateway/Dockerfile.arm64 b/gateway/Dockerfile.arm64 index d32b4911..ee855da2 100644 --- a/gateway/Dockerfile.arm64 +++ b/gateway/Dockerfile.arm64 @@ -1,3 +1,5 @@ +FROM teamserverless/license-check:0.3.6 as license-check + FROM golang:1.12 as build ENV GO111MODULE=off @@ -7,9 +9,7 @@ ARG GIT_COMMIT_SHA ARG GIT_COMMIT_MESSAGE ARG VERSION='dev' -RUN curl -sLSf \ - https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh \ - && mv ./license-check /usr/bin/ +COPY --from=license-check /license-check /usr/bin/ WORKDIR /go/src/github.com/openfaas/faas/gateway diff --git a/gateway/Dockerfile.armhf b/gateway/Dockerfile.armhf index 35888c09..3f2f666c 100644 --- a/gateway/Dockerfile.armhf +++ b/gateway/Dockerfile.armhf @@ -1,3 +1,5 @@ +FROM teamserverless/license-check:0.3.6 as license-check + FROM golang:1.12 as build ENV GO111MODULE=off @@ -7,9 +9,7 @@ ARG GIT_COMMIT_SHA ARG GIT_COMMIT_MESSAGE ARG VERSION='dev' -RUN curl -sLSf \ - https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh \ - && mv ./license-check /usr/bin/ +COPY --from=license-check /license-check /usr/bin/ WORKDIR /go/src/github.com/openfaas/faas/gateway