From ca518104d549f75cec68921e73adf25ba083c71d Mon Sep 17 00:00:00 2001
From: "Alex Ellis (OpenFaaS Ltd)" <alexellis2@gmail.com>
Date: Wed, 13 Apr 2022 10:14:53 +0100
Subject: [PATCH 1/2] Allow static files to be published into final image

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
---
 template/golang-http/Dockerfile       | 10 +++++-----
 template/golang-middleware/Dockerfile | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/template/golang-http/Dockerfile b/template/golang-http/Dockerfile
index 52bbaa4..e08b274 100644
--- a/template/golang-http/Dockerfile
+++ b/template/golang-http/Dockerfile
@@ -26,8 +26,8 @@ ENV CGO_ENABLED=${CGO_ENABLED}
 # Run a gofmt and exclude all vendored code.
 RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./function/vendor/*"))" || { echo "Run \"gofmt -s -w\" on your Golang code"; exit 1; }
 
-
 WORKDIR /go/src/handler/function
+RUN mkdir -p /go/src/handler/function/static
 
 RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go test ./... -cover
 
@@ -35,7 +35,7 @@ WORKDIR /go/src/handler
 RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
     go build --ldflags "-s -w" -a -installsuffix cgo -o handler .
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.14
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.15
 # Add non root user and certs
 RUN apk --no-cache add ca-certificates \
     && addgroup -S app && adduser -S -g app app
@@ -46,9 +46,9 @@ RUN mkdir -p /home/app \
 
 WORKDIR /home/app
 
-COPY --from=build --chown=app /go/src/handler/handler    .
-COPY --from=build --chown=app /usr/bin/fwatchdog         .
-COPY --from=build --chown=app /go/src/handler/function/  .
+COPY --from=build --chown=app /go/src/handler/handler           .
+COPY --from=build --chown=app /usr/bin/fwatchdog                .
+COPY --from=build --chown=app /go/src/handler/function/static   static
 
 USER app
 
diff --git a/template/golang-middleware/Dockerfile b/template/golang-middleware/Dockerfile
index 4c59721..54f13f8 100644
--- a/template/golang-middleware/Dockerfile
+++ b/template/golang-middleware/Dockerfile
@@ -26,6 +26,7 @@ ENV CGO_ENABLED=${CGO_ENABLED}
 RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./function/vendor/*"))" || { echo "Run \"gofmt -s -w\" on your Golang code"; exit 1; }
 
 WORKDIR /go/src/handler/function
+RUN mkdir -p /go/src/handler/function/static
 
 RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go test ./... -cover
 
@@ -33,7 +34,8 @@ WORKDIR /go/src/handler
 RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
     go build --ldflags "-s -w" -a -installsuffix cgo -o handler .
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.14
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.15 as ship
+
 # Add non root user and certs
 RUN apk --no-cache add ca-certificates \
     && addgroup -S app && adduser -S -g app app
@@ -44,9 +46,9 @@ RUN mkdir -p /home/app \
 
 WORKDIR /home/app
 
-COPY --from=build --chown=app /go/src/handler/handler    .
-COPY --from=build --chown=app /usr/bin/fwatchdog         .
-COPY --from=build --chown=app /go/src/handler/function/  .
+COPY --from=build --chown=app /go/src/handler/handler           .
+COPY --from=build --chown=app /usr/bin/fwatchdog                .
+COPY --from=build --chown=app /go/src/handler/function/static   static
 
 USER app
 

From b1e73d10557120dc42abc6b56946ba3a911902bf Mon Sep 17 00:00:00 2001
From: "Alex Ellis (OpenFaaS Ltd)" <alexellis2@gmail.com>
Date: Wed, 13 Apr 2022 10:27:00 +0100
Subject: [PATCH 2/2] Add example to README

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.md b/README.md
index 577bb07..2a89368 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,32 @@ You can manage dependencies in one of the following ways:
 - You can also Go modules with vendoring, run `go mod vendor` in your function folder and add `--build-arg GO111MODULE=off --build-arg GOFLAGS='-mod=vendor'` to `faas-cli up`
 - If you have a private module dependency, we recommend using the vendoring technique from above.
 
+## Adding static files to your image
+
+Any folder named `static` will be copied into the final image published for your function.
+
+To read this back at runtime, you can do the following:
+
+```go
+package function
+
+import (
+    "io/ioutil"
+    "net/http"
+)
+
+func Handle(w http.ResponseWriter, r *http.Request) {
+
+    data, err := ioutil.ReadFile("./static/file.txt")
+
+    if err != nil {
+        http.Error(w, err.Error(), http.StatusInternalServerError)
+    }
+
+    w.Write(data)
+}
+```
+
 ## 1.0 golang-http
 
 This template provides additional context and control over the HTTP response from your function.