Skip to content

Commit 158d288

Browse files
alexellisalexellis
committed
Move to using templates-sdk repo for http function
The HTTP function now makes use of a dedicated repository for SDK resources in the openfaas org. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent aeae736 commit 158d288

File tree

26 files changed

+41
-52
lines changed

26 files changed

+41
-52
lines changed

‎template/golang-http-armhf/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM openfaas/of-watchdog:0.7.7 as watchdog
1+
FROM openfaas/of-watchdog:0.8.0 as watchdog
22
FROM golang:1.13-alpine3.11 as build
33

44
RUN apk --no-cache add git
55

6+
ENV CGO_ENABLED=0
7+
68
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
79
RUN chmod +x /usr/bin/fwatchdog
810

9-
ENV CGO_ENABLED=0
10-
1111
RUN mkdir -p /go/src/handler
1212
WORKDIR /go/src/handler
1313
COPY . .

‎template/golang-http-armhf/function/Gopkg.toml

-7
This file was deleted.

‎template/golang-http-armhf/function/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"net/http"
66

7-
"github.com/openfaas-incubator/go-function-sdk"
7+
handler "github.com/openfaas/templates-sdk/go-http"
88
)
99

1010
// Handle a function invocation

‎template/golang-http-armhf/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ go 1.13
44

55
replace handler/function => ./function
66

7-
require github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
7+
require github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625

‎template/golang-http-armhf/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33 h1:KhbcrtXR+IO7IWF08RzKpgMudBhEeRRqNmRurE1iph4=
2-
github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33/go.mod h1:F37Kp+hwdHP+o3UKjkGzikQg4weKiMvcegT9vCQjvjE=
1+
github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625 h1:6JSt10GDCOw0F67bWnqZ6AYg92pbqCcchTu181aT1w0=
2+
github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625/go.mod h1:JWcVHdzlHcR7nLuaDL88Mz68wOqDvOn0CLO6t27OMhk=

‎template/golang-http-armhf/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"handler/function"
1717

18-
handler "github.com/openfaas-incubator/go-function-sdk"
18+
handler "github.com/openfaas/templates-sdk/go-http"
1919
)
2020

2121
var (

‎template/golang-http-armhf/template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
language: golang-http-armhf
1+
language: golang-http
22
fprocess: ./handler

‎template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/.DEREK.yml

-1
This file was deleted.

‎template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/.gitignore

-1
This file was deleted.

‎template/golang-http/vendor/github.com/openfaas-incubator/go-function-sdk/LICENSE renamed to ‎template/golang-http-armhf/vendor/github.com/openfaas/templates-sdk/LICENSE

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/README.md renamed to ‎template/golang-http-armhf/vendor/github.com/openfaas/templates-sdk/go-http/README.md

+7-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/handler.go renamed to ‎template/golang-http-armhf/vendor/github.com/openfaas/templates-sdk/go-http/handler.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎template/golang-http-armhf/vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
2-
github.com/openfaas-incubator/go-function-sdk
1+
# github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625
2+
github.com/openfaas/templates-sdk/go-http

‎template/golang-http/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openfaas/of-watchdog:0.7.7 as watchdog
1+
FROM openfaas/of-watchdog:0.8.0 as watchdog
22
FROM golang:1.13-alpine3.11 as build
33

44
RUN apk --no-cache add git
@@ -8,8 +8,6 @@ ENV CGO_ENABLED=0
88
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
99
RUN chmod +x /usr/bin/fwatchdog
1010

11-
ENV CGO_ENABLED=0
12-
1311
RUN mkdir -p /go/src/handler
1412
WORKDIR /go/src/handler
1513
COPY . .

‎template/golang-http/function/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"net/http"
66

7-
handler "github.com/openfaas-incubator/go-function-sdk"
7+
handler "github.com/openfaas/templates-sdk/go-http"
88
)
99

1010
// Handle a function invocation

‎template/golang-http/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ go 1.13
44

55
replace handler/function => ./function
66

7-
require github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
7+
require github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625

‎template/golang-http/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33 h1:KhbcrtXR+IO7IWF08RzKpgMudBhEeRRqNmRurE1iph4=
2-
github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33/go.mod h1:F37Kp+hwdHP+o3UKjkGzikQg4weKiMvcegT9vCQjvjE=
1+
github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625 h1:6JSt10GDCOw0F67bWnqZ6AYg92pbqCcchTu181aT1w0=
2+
github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625/go.mod h1:JWcVHdzlHcR7nLuaDL88Mz68wOqDvOn0CLO6t27OMhk=

‎template/golang-http/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"handler/function"
1717

18-
handler "github.com/openfaas-incubator/go-function-sdk"
18+
handler "github.com/openfaas/templates-sdk/go-http"
1919
)
2020

2121
var (

‎template/golang-http/vendor/github.com/openfaas-incubator/go-function-sdk/.DEREK.yml

-1
This file was deleted.

‎template/golang-http/vendor/github.com/openfaas-incubator/go-function-sdk/.gitignore

-1
This file was deleted.

‎template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/LICENSE renamed to ‎template/golang-http/vendor/github.com/openfaas/templates-sdk/LICENSE

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎template/golang-http/vendor/github.com/openfaas-incubator/go-function-sdk/README.md renamed to ‎template/golang-http/vendor/github.com/openfaas/templates-sdk/go-http/README.md

+7-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎template/golang-http/vendor/github.com/openfaas-incubator/go-function-sdk/handler.go renamed to ‎template/golang-http/vendor/github.com/openfaas/templates-sdk/go-http/handler.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎template/golang-http/vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
2-
github.com/openfaas-incubator/go-function-sdk
1+
# github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625
2+
github.com/openfaas/templates-sdk/go-http

‎template/golang-middleware-armhf/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openfaas/of-watchdog:0.7.7 as watchdog
1+
FROM openfaas/of-watchdog:0.8.0 as watchdog
22
FROM golang:1.13-alpine3.11 as build
33

44
RUN apk --no-cache add git

‎template/golang-middleware/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openfaas/of-watchdog:0.7.7 as watchdog
1+
FROM openfaas/of-watchdog:0.8.0 as watchdog
22
FROM golang:1.13-alpine3.11 as build
33

44
RUN apk --no-cache add git

0 commit comments

Comments
 (0)