Skip to content

Commit ac26e96

Browse files
committed
Bring armhf/arm64 into parity with x86_64 for Dockerfile
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent 5edf170 commit ac26e96

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

Dockerfile.arm64

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1+
FROM teamserverless/license-check:0.3.6 as license-check
2+
13
FROM golang:1.13 as build
24
ENV CGO_ENABLED=0
35
ENV GO111MODULE=on
46
ENV GOFLAGS=-mod=vendor
57

6-
RUN curl -sLSf https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh
7-
RUN mv ./license-check /usr/bin/license-check && chmod +x /usr/bin/license-check
8+
COPY --from=license-check /license-check /usr/bin/
89

910
RUN mkdir -p /go/src/github.com/openfaas/faas-netes
1011
WORKDIR /go/src/github.com/openfaas/faas-netes
1112
COPY . .
1213

1314
RUN license-check -path /go/src/github.com/openfaas/faas-netes/ --verbose=false "Alex Ellis" "OpenFaaS Author(s)"
14-
RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") \
15-
&& go test -v ./...
15+
RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*")
16+
RUN go test -v ./...
1617

1718
RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
1819
&& GIT_COMMIT=$(git rev-list -1 HEAD) \
@@ -43,7 +44,7 @@ EXPOSE 8080
4344
ENV http_proxy ""
4445
ENV https_proxy ""
4546

46-
COPY --from=0 /go/src/github.com/openfaas/faas-netes/faas-netes .
47+
COPY --from=build /go/src/github.com/openfaas/faas-netes/faas-netes .
4748
RUN chown -R app:app ./
4849

4950
USER app

Dockerfile.armhf

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1+
FROM teamserverless/license-check:0.3.6 as license-check
2+
13
FROM golang:1.13 as build
24
ENV CGO_ENABLED=0
35
ENV GO111MODULE=on
46
ENV GOFLAGS=-mod=vendor
57

6-
RUN curl -sLSf https://raw.githubusercontent.com/teamserverless/license-check/master/get.sh | sh
7-
RUN mv ./license-check /usr/bin/license-check && chmod +x /usr/bin/license-check
8+
COPY --from=license-check /license-check /usr/bin/
89

910
RUN mkdir -p /go/src/github.com/openfaas/faas-netes
1011
WORKDIR /go/src/github.com/openfaas/faas-netes
1112
COPY . .
1213

1314
RUN license-check -path /go/src/github.com/openfaas/faas-netes/ --verbose=false "Alex Ellis" "OpenFaaS Author(s)"
14-
RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") \
15-
&& go test -v ./...
15+
RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*")
16+
RUN go test -v ./...
1617

1718
RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
1819
&& GIT_COMMIT=$(git rev-list -1 HEAD) \
@@ -43,7 +44,7 @@ EXPOSE 8080
4344
ENV http_proxy ""
4445
ENV https_proxy ""
4546

46-
COPY --from=0 /go/src/github.com/openfaas/faas-netes/faas-netes .
47+
COPY --from=build /go/src/github.com/openfaas/faas-netes/faas-netes .
4748
RUN chown -R app:app ./
4849

4950
USER app

0 commit comments

Comments
 (0)