Bump samples/versions - reduce image sizes through multi-stage builds

Signed-off-by: Alex Ellis <alexellis2@gmail.com>
openfaas · Nov 9, 2017 · 80b8f6a · 80b8f6a
1 parent f62309f
commit 80b8f6a
Show file tree

Hide file tree

Showing 736 changed files with 177,333 additions and 185 deletions.
diff --git a/docker-compose.extended.yml b/docker-compose.extended.yml
@@ -120,7 +120,7 @@ services:
 
     # Pass a username as an argument to find how many images user has pushed to Docker Hub.
     hubstats:
-        image: alexellis2/faas-dockerhubstats:latest
+        image: functions/hubstats:latest
         labels:
             function: "true"
         depends_on:
@@ -131,6 +131,11 @@ services:
             no_proxy: "gateway"
             https_proxy: $https_proxy
         deploy:
+            resources:
+                limits:
+                    memory: 50M
+                reservations:
+                    memory: 20M
             placement:
                 constraints:
                     - 'node.platform.os == linux'
@@ -148,6 +153,11 @@ services:
             no_proxy: "gateway"
             https_proxy: $https_proxy
         deploy:
+            resources:
+                limits:
+                    memory: 50M
+                reservations:
+                    memory: 20M
             placement:
                 constraints:
                     - 'node.platform.os == linux'
@@ -166,6 +176,11 @@ services:
             no_proxy: "gateway"
             https_proxy: $https_proxy
         deploy:
+            resources:
+                limits:
+                    memory: 50M
+                reservations:
+                    memory: 20M
             placement:
                 constraints:
                     - 'node.platform.os == linux'

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -206,7 +206,7 @@ services:
 
     # Converts body in (markdown format) -> (html)
     markdown:
-        image: alexellis2/faas-markdownrender:latest
+        image: functions/markdown-render:latest
         labels:
             function: "true"
         depends_on:

diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:latest
+FROM alpine:3.6
 
-ADD https://github.com/openfaas/faas/releases/download/0.6.5/fwatchdog /usr/bin
+ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog /usr/bin
 # COPY ./fwatchdog /usr/bin/
 RUN chmod +x /usr/bin/fwatchdog
 

diff --git a/sample-functions/AlpineFunction/Dockerfile.arm64 b/sample-functions/AlpineFunction/Dockerfile.arm64
@@ -1,6 +1,6 @@
 FROM arm64v8/alpine:3.6
 
-ADD https://github.com/alexellis/faas/releases/download/0.6.5/fwatchdog-arm64 /usr/bin/fwatchdog
+ADD https://github.com/alexellis/faas/releases/download/0.6.9/fwatchdog-arm64 /usr/bin/fwatchdog
 # COPY ./fwatchdog /usr/bin/
 RUN chmod +x /usr/bin/fwatchdog
 

diff --git a/sample-functions/ApiKeyProtected/Dockerfile b/sample-functions/ApiKeyProtected/Dockerfile
@@ -1,16 +1,26 @@
-FROM alpine:latest
+FROM golang:1.9.2-alpine as builder
 
-WORKDIR /root/
+MAINTAINER alex@openfaas.com
+ENTRYPOINT []
 
-EXPOSE 8080
-ENV http_proxy      ""
-ENV https_proxy     ""
+RUN apk --no-cache add make curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
-ADD https://github.com/openfaas/faas/releases/download/0.5.1-alpha/fwatchdog /usr/bin
-# COPY fwatchdog  /usr/bin/
-RUN chmod +x /usr/bin/fwatchdog
+WORKDIR /go/src/github.com/openfaas/faas/sample-functions/ApiKeyProtected
 
-COPY app    .
+COPY handler.go .
+# COPY vendor vendor
 
-ENV fprocess="/root/app"
-CMD ["fwatchdog"]
+RUN go install
+
+FROM alpine:3.6
+
+# Needed to reach the hub
+RUN apk --no-cache add ca-certificates 
+
+COPY --from=builder /usr/bin/fwatchdog  /usr/bin/fwatchdog
+COPY --from=builder /go/bin/ApiKeyProtected  /usr/bin/ApiKeyProtected
+ENV fprocess "/usr/bin/ApiKeyProtected"
+
+CMD ["/usr/bin/fwatchdog"]
diff --git a/sample-functions/ApiKeyProtected/Dockerfile.build b/sample-functions/ApiKeyProtected/Dockerfile.build
diff --git a/sample-functions/ApiKeyProtected/build.sh b/sample-functions/ApiKeyProtected/build.sh
diff --git a/sample-functions/BaseFunctions/dncore/Dockerfile b/sample-functions/BaseFunctions/dncore/Dockerfile
@@ -1,6 +1,6 @@
 FROM microsoft/dotnet:sdk
 
-ADD https://github.com/openfaas/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
+ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1

diff --git a/sample-functions/BaseFunctions/golang/Dockerfile b/sample-functions/BaseFunctions/golang/Dockerfile
@@ -8,7 +8,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/golang
 
 RUN go install
 
-ADD https://github.com/openfaas/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
+ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 ENV fprocess "/go/bin/golang"

diff --git a/sample-functions/BaseFunctions/golang/Dockerfile.win b/sample-functions/BaseFunctions/golang/Dockerfile.win
@@ -6,7 +6,7 @@ WORKDIR /go/src/github.com/openfaas/faas/sample-functions/golang
 COPY . /go/src/github.com/openfaas/faas/sample-functions/golang
 RUN go build
 
-ADD ./watchdog.exe /
+ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog.exe /watchdog.exe
 
 EXPOSE 8080
 ENV fprocess="golang.exe"

diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:latest
+FROM alpine:3.6
 RUN apk --update add nodejs nodejs-npm
 
-ADD https://github.com/openfaas/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
+ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json   .

diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:latest
+FROM alpine:3.6
 RUN apk --update add nodejs nodejs-npm
 
-ADD https://github.com/openfaas/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
+ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog /usr/bin
 #COPY ./fwatchdog /usr/bin/
 RUN chmod +x /usr/bin/fwatchdog
 

diff --git a/sample-functions/DockerHubStats/Dockerfile b/sample-functions/DockerHubStats/Dockerfile
@@ -1,17 +1,26 @@
-FROM golang:1.7.5-alpine
-MAINTAINER alexellis2@gmail.com
+FROM golang:1.9.2-alpine as builder
+
+MAINTAINER alex@openfaas.com
 ENTRYPOINT []
 
-RUN apk --no-cache add make
+RUN apk --no-cache add make curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
+
 WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
+
 COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
 
-RUN make
+RUN make install
 
-ADD https://github.com/openfaas/faas/releases/download/0.6.0/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+FROM alpine:3.6
 
-ENV fprocess "/go/bin/DockerHubStats"
-HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
+# Needed to reach the hub
+RUN apk --no-cache add ca-certificates 
+
+COPY --from=builder /usr/bin/fwatchdog  /usr/bin/fwatchdog
+COPY --from=builder /go/bin/DockerHubStats  /usr/bin/DockerHubStats
+ENV fprocess "/usr/bin/DockerHubStats"
 
-CMD [ "/usr/bin/fwatchdog"]
+HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
+CMD ["/usr/bin/fwatchdog"]
diff --git a/sample-functions/DockerHubStats/Dockerfile.armhf b/sample-functions/DockerHubStats/Dockerfile.armhf
@@ -1,17 +1,25 @@
-FROM alexellis2/go-armhf:1.7.4
+FROM golang:1.9.2-alpine as builder
 
-MAINTAINER alexellis2@gmail.com
+MAINTAINER alex@openfaas.com
 ENTRYPOINT []
 
-RUN apk --no-cache add make
+RUN apk --no-cache add make curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog-armhf > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
+
 WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
+
 COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
 
-RUN make
+RUN make install
+
+FROM alpine:3.6
 
-COPY ./fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
+# Needed to reach the hub
+RUN apk --no-cache add ca-certificates 
 
-ENV fprocess "/go/bin/DockerHubStats"
+COPY --from=builder /usr/bin/fwatchdog  /usr/bin/fwatchdog
+COPY --from=builder /go/bin/DockerHubStats  /usr/bin/DockerHubStats
+ENV fprocess "/usr/bin/DockerHubStats"
 
-CMD [ "/usr/bin/fwatchdog"]
+CMD ["/usr/bin/fwatchdog"]
diff --git a/sample-functions/DockerHubStats/Makefile b/sample-functions/DockerHubStats/Makefile
@@ -1,9 +1,5 @@
 
-.PHONY: install image
+.PHONY: install
 
 install:
 	@go install .
-
-image:
-	@docker build -t alexellis2/dockerhub-stats .
-
diff --git a/sample-functions/DockerHubStats/build.armhf.sh b/sample-functions/DockerHubStats/build.armhf.sh
diff --git a/sample-functions/DockerHubStats/build.sh b/sample-functions/DockerHubStats/build.sh
diff --git a/sample-functions/HostnameIntent/Dockerfile b/sample-functions/HostnameIntent/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:latest
+FROM alpine:3.6
 RUN apk --update add nodejs nodejs-npm
 
-ADD https://github.com/openfaas/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
+ADD https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog /usr/bin
 RUN chmod +x /usr/bin/fwatchdog
 
 COPY package.json   .

diff --git a/sample-functions/MarkdownRender/Dockerfile b/sample-functions/MarkdownRender/Dockerfile
@@ -1,16 +1,26 @@
-FROM alpine:latest
+FROM golang:1.9.2-alpine as builder
 
-WORKDIR /root/
+MAINTAINER alex@openfaas.com
+ENTRYPOINT []
 
-EXPOSE 8080
-ENV http_proxy      ""
-ENV https_proxy     ""
+RUN apk --no-cache add make curl \
+    && curl -sL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog
 
-ADD https://github.com/openfaas/faas/releases/download/v0.5-alpha/fwatchdog /usr/bin
-RUN chmod +x /usr/bin/fwatchdog
-# COPY fwatchdog  /usr/bin/
+WORKDIR /go/src/github.com/openfaas/faas/sample-functions/MarkdownRender
 
-COPY app    .
+COPY handler.go .
+COPY vendor vendor
 
-ENV fprocess="/root/app"
-CMD ["fwatchdog"]
+RUN go install
+
+FROM alpine:3.6
+
+# Needed to reach the hub
+RUN apk --no-cache add ca-certificates 
+
+COPY --from=builder /usr/bin/fwatchdog  /usr/bin/fwatchdog
+COPY --from=builder /go/bin/MarkdownRender  /usr/bin/MarkdownRender
+ENV fprocess "/usr/bin/MarkdownRender"
+
+CMD ["/usr/bin/fwatchdog"]
diff --git a/sample-functions/MarkdownRender/Dockerfile.armhf b/sample-functions/MarkdownRender/Dockerfile.armhf
diff --git a/sample-functions/MarkdownRender/Dockerfile.build b/sample-functions/MarkdownRender/Dockerfile.build
diff --git a/sample-functions/MarkdownRender/Dockerfile.build.armhf b/sample-functions/MarkdownRender/Dockerfile.build.armhf
diff --git a/sample-functions/MarkdownRender/Gopkg.lock b/sample-functions/MarkdownRender/Gopkg.lock