Migrate all imports/references to OpenFaaS org

This commit updates all imports and references in documentation/scripts to
point at the new github OpenFaaS org.

Signed-off-by: John McCabe <john@johnmccabe.net>
This commit is contained in:
John McCabe
2017-09-24 19:09:04 +01:00
committed by Alex Ellis
parent 6dba09cd09
commit b6d7fc1931
34 changed files with 62 additions and 58 deletions

View File

@@ -6,7 +6,7 @@
## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
- [ ] I have raised an issue to propose this change ([required](https://github.com/alexellis/faas/blob/master/CONTRIBUTING.md))
- [ ] I have raised an issue to propose this change ([required](https://github.com/openfaas/faas/blob/master/CONTRIBUTING.md))
## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
@@ -25,7 +25,7 @@
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I've read the [CONTRIBUTION](https://github.com/alexellis/faas/blob/master/CONTRIBUTING.md) guide
- [ ] I've read the [CONTRIBUTION](https://github.com/openfaas/faas/blob/master/CONTRIBUTING.md) guide
- [ ] I have signed-off my commits with `git commit -s`
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.

View File

@@ -35,7 +35,11 @@ export PATH=$PATH:$GOPATH/bin
* Now clone / build `faas-cli`:
<<<<<<< HEAD
```bash
=======
```
>>>>>>> Migrate all imports/references to OpenFaaS org
$ mkdir -p $GOPATH/src/github.com/openfaas/
$ cd $GOPATH/src/github.com/openfaas/
$ git clone https://github.com/openfaas/faas-cli

View File

@@ -1,6 +1,6 @@
FROM golang:1.8.3
WORKDIR /go/src/github.com/alexellis/faas-cli
WORKDIR /go/src/github.com/openfaas/faas-cli
COPY . .
# Run a gofmt and exclude all vendored code.
@@ -8,7 +8,7 @@ RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))"
RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
&& GIT_COMMIT=$(git rev-list -1 HEAD) \
&& CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w -X github.com/alexellis/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/alexellis/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli .
&& CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w -X github.com/openfaas/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/openfaas/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli .
RUN go test ./...
FROM alpine:latest
@@ -16,7 +16,7 @@ RUN apk --no-cache add ca-certificates
WORKDIR /root/
COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli .
COPY --from=0 /go/src/github.com/openfaas/faas-cli/faas-cli .
CMD ["./faas-cli"]

View File

@@ -1,6 +1,6 @@
FROM golang:1.8.3
WORKDIR /go/src/github.com/alexellis/faas-cli
WORKDIR /go/src/github.com/openfaas/faas-cli
COPY . .
# Run a gofmt and exclude all vendored code.
@@ -11,21 +11,21 @@ RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))"
RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
&& GIT_COMMIT=$(git rev-list -1 HEAD) \
&& GOARCH=arm GOARM=6 CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w -X github.com/alexellis/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/alexellis/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli-armhf \
&& CGO_ENABLED=0 GOOS=darwin go build --ldflags "-s -w -X github.com/alexellis/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/alexellis/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli-darwin \
&& CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w -X github.com/alexellis/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/alexellis/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli \
&& CGO_ENABLED=0 GOOS=windows go build --ldflags "-s -w -X github.com/alexellis/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/alexellis/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli.exe \
&& CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build --ldflags "-s -w -X github.com/alexellis/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/alexellis/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli-arm64
&& GOARCH=arm GOARM=6 CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w -X github.com/openfaas/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/openfaas/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli-armhf \
&& CGO_ENABLED=0 GOOS=darwin go build --ldflags "-s -w -X github.com/openfaas/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/openfaas/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli-darwin \
&& CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w -X github.com/openfaas/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/openfaas/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli \
&& CGO_ENABLED=0 GOOS=windows go build --ldflags "-s -w -X github.com/openfaas/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/openfaas/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli.exe \
&& CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build --ldflags "-s -w -X github.com/openfaas/faas-cli/commands.GitCommit=${GIT_COMMIT} -X github.com/openfaas/faas-cli/commands.Version=${VERSION}" -a -installsuffix cgo -o faas-cli-arm64
FROM alpine:latest
RUN apk --no-cache add ca-certificates
WORKDIR /root/
COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli .
COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-darwin .
COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-armhf .
COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli.exe .
COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-arm64 .
COPY --from=0 /go/src/github.com/openfaas/faas-cli/faas-cli .
COPY --from=0 /go/src/github.com/openfaas/faas-cli/faas-cli-darwin .
COPY --from=0 /go/src/github.com/openfaas/faas-cli/faas-cli-armhf .
COPY --from=0 /go/src/github.com/openfaas/faas-cli/faas-cli.exe .
COPY --from=0 /go/src/github.com/openfaas/faas-cli/faas-cli-arm64 .
CMD ["./faas"]

View File

@@ -4,7 +4,7 @@ In addition to YAML file support, you can use the CLI to build and deploy indivi
#### Worked example with Node.js
So if you want to write in another language, just prepare a Dockerfile and build an image manually, like in the [FaaS samples](https://github.com/alexellis/faas/tree/master/sample-functions).
So if you want to write in another language, just prepare a Dockerfile and build an image manually, like in the [FaaS samples](https://github.com/openfaas/faas/tree/master/sample-functions).
**Build a FaaS function in NodeJS from a template:**

View File

@@ -1,11 +1,11 @@
## faas-cli
[![Go Report Card](https://goreportcard.com/badge/github.com/openfaas/faas-cli)](https://goreportcard.com/report/github.com/openfaas/faas-cli) [![Build Status](https://travis-ci.org/openfaas/faas-cli.svg?branch=master)](https://travis-ci.org/openfaas/faas-cli)
This is a CLI for use with [OpenFaaS](https://github.com/alexellis/faas) - a serverless functions framework for Docker & Kubernetes.
This is a CLI for use with [OpenFaaS](https://github.com/openfaas/faas) - a serverless functions framework for Docker & Kubernetes.
> Before using this tool please setup OpenFaaS by following instructions over on the main repo.
The CLI can be used to build and deploy functions to [OpenFaaS](https://github.com/alexellis/faas). You can build OpenFaaS functions from a set of supported language templates (such as Node.js, Python, CSharp and Ruby). That means you just write a handler file such as (handler.py/handler.js) and the CLI does the rest to create a Docker image.
The CLI can be used to build and deploy functions to [OpenFaaS](https://github.com/openfaas/faas). You can build OpenFaaS functions from a set of supported language templates (such as Node.js, Python, CSharp and Ruby). That means you just write a handler file such as (handler.py/handler.js) and the CLI does the rest to create a Docker image.
Demo: [ASCII cinema](https://asciinema.org/a/121234)
@@ -42,7 +42,7 @@ Help for all of the commands supported by the CLI can be found by running:
* `faas-cli help` or `faas-cli [command] --help`
You can chose between using a [programming language template](https://github.com/alexellis/faas-cli/tree/master/template) where you only need to provide a handler file, or a Docker that you can build yourself.
You can chose between using a [programming language template](https://github.com/openfaas/faas-cli/tree/master/template) where you only need to provide a handler file, or a Docker that you can build yourself.
**Templates**
@@ -54,7 +54,7 @@ Specify `lang: node/python/csharp/ruby`
* Customise the provided templates
Perhaps you need to have [`gcc` or another dependency](https://github.com/alexellis/faas-office-sample) in your Python template? That's not a problem.
Perhaps you need to have [`gcc` or another dependency](https://github.com/openfaas/faas-office-sample) in your Python template? That's not a problem.
You can customise the Dockerfile or code for any of the templates. Just create a new directory and copy in the templates folder from this repository. The templates in your current working directory are always used for builds.
@@ -65,7 +65,7 @@ Specify `lang: Dockerfile` if you want the faas-cli to execute a build or `skip_
* Ultimate versatility and control
* Package anything
* If you are using a stack file add the `skip_build: true` attribute
* Use one of the [samples as a basis](https://github.com/alexellis/faas/tree/master/sample-functions)
* Use one of the [samples as a basis](https://github.com/openfaas/faas/tree/master/sample-functions)
### Use a YAML stack file
@@ -208,7 +208,7 @@ $ curl --data-binary @README.md http://localhost:8080/function/nodejs-echo
$ uname -a | curl http://localhost:8080/function/nodejs-echo--data-binary @-
```
> For further instructions on the manual CLI flags (without using a YAML file) read [manual_cli.md](https://github.com/alexellis/faas-cli/blob/master/MANUAL_CLI.md)
> For further instructions on the manual CLI flags (without using a YAML file) read [manual_cli.md](https://github.com/openfaas/faas-cli/blob/master/MANUAL_CLI.md)
**Bash Auto-completion [experimental]**
@@ -240,7 +240,7 @@ Refer to your distributions instructions on installing and enabling `bash-comple
## FaaS-CLI Developers / Contributors
See [contributing guide](https://github.com/alexellis/faas-cli/blob/master/CONTRIBUTING.md).
See [contributing guide](https://github.com/openfaas/faas-cli/blob/master/CONTRIBUTING.md).
### License

2
app.go
View File

@@ -7,7 +7,7 @@ import (
"fmt"
"os"
"github.com/alexellis/faas-cli/commands"
"github.com/openfaas/faas-cli/commands"
)
func main() {

View File

@@ -9,8 +9,8 @@ import (
"os"
"sync"
"github.com/alexellis/faas-cli/builder"
"github.com/alexellis/faas-cli/stack"
"github.com/openfaas/faas-cli/builder"
"github.com/openfaas/faas-cli/stack"
"github.com/spf13/cobra"
)

View File

@@ -12,8 +12,8 @@ import (
"gopkg.in/yaml.v2"
"github.com/alexellis/faas-cli/proxy"
"github.com/alexellis/faas-cli/stack"
"github.com/openfaas/faas-cli/proxy"
"github.com/openfaas/faas-cli/stack"
"github.com/spf13/cobra"
)

View File

@@ -69,7 +69,7 @@ func fetchMasterZip(templateUrl string) error {
if _, err = os.Stat(ZipFileName); err != nil {
if len(templateUrl) == 0 {
templateUrl = "https://github.com/alexellis/faas-cli/archive/" + ZipFileName
templateUrl = "https://github.com/openfaas/faas-cli/archive/" + ZipFileName
}
c := http.Client{}

View File

@@ -9,8 +9,8 @@ import (
"log"
"os"
"github.com/alexellis/faas-cli/proxy"
"github.com/alexellis/faas-cli/stack"
"github.com/openfaas/faas-cli/proxy"
"github.com/openfaas/faas-cli/stack"
"github.com/spf13/cobra"
)

View File

@@ -7,8 +7,8 @@ import (
"fmt"
"log"
"github.com/alexellis/faas-cli/proxy"
"github.com/alexellis/faas-cli/stack"
"github.com/openfaas/faas-cli/proxy"
"github.com/openfaas/faas-cli/stack"
"github.com/spf13/cobra"
)

View File

@@ -8,7 +8,7 @@ import (
"io/ioutil"
"os"
"github.com/alexellis/faas-cli/builder"
"github.com/openfaas/faas-cli/builder"
"github.com/spf13/cobra"
)

View File

@@ -7,8 +7,8 @@ import (
"fmt"
"log"
"github.com/alexellis/faas-cli/builder"
"github.com/alexellis/faas-cli/stack"
"github.com/openfaas/faas-cli/builder"
"github.com/openfaas/faas-cli/stack"
"github.com/spf13/cobra"
)

View File

@@ -7,8 +7,8 @@ import (
"fmt"
"log"
"github.com/alexellis/faas-cli/proxy"
"github.com/alexellis/faas-cli/stack"
"github.com/openfaas/faas-cli/proxy"
"github.com/openfaas/faas-cli/stack"
"github.com/spf13/cobra"
)

View File

@@ -29,7 +29,7 @@ var versionCmd = &cobra.Command{
Long: fmt.Sprintf(`The version command returns the current clients version information.
This currently consists of the GitSHA from which the client was built.
- https://github.com/alexellis/faas-cli/tree/%s`, GitCommit),
- https://github.com/openfaas/faas-cli/tree/%s`, GitCommit),
Example: ` faas-cli version
faas-cli version --short-version`,
Run: runVersion,

View File

@@ -11,7 +11,7 @@ import (
"net/http"
"strings"
"github.com/alexellis/faas/gateway/requests"
"github.com/openfaas/faas/gateway/requests"
)
// DeleteFunction delete a function from the FaaS server

View File

@@ -11,7 +11,7 @@ import (
"net/http"
"strings"
"github.com/alexellis/faas/gateway/requests"
"github.com/openfaas/faas/gateway/requests"
)
// DeployFunction call FaaS server to deploy a new function

View File

@@ -10,7 +10,7 @@ import (
"net/http"
"strings"
"github.com/alexellis/faas/gateway/requests"
"github.com/openfaas/faas/gateway/requests"
)
// ListFunctions list deployed functions

View File

@@ -2,13 +2,13 @@ FROM golang:1.7.5-alpine
MAINTAINER alexellis2@gmail.com
ENTRYPOINT []
#RUN mkdir -p /go/src/github.com/alexellis/faas/sample-functions/handler
WORKDIR /go/src/github.com/alexellis/faas/sample-functions/handler
COPY . /go/src/github.com/alexellis/faas/sample-functions/handler
#RUN mkdir -p /go/src/github.com/openfaas/faas/sample-functions/handler
WORKDIR /go/src/github.com/openfaas/faas/sample-functions/handler
COPY . /go/src/github.com/openfaas/faas/sample-functions/handler
RUN go get -d -v
RUN go install
ADD https://github.com/alexellis/faas/releases/download/0.5.5-alpha/fwatchdog /usr/bin
ADD https://github.com/openfaas/faas/releases/download/0.5.5-alpha/fwatchdog /usr/bin
RUN chmod +x /usr/bin/fwatchdog
ENV cgi_headers true

View File

@@ -3,7 +3,7 @@ FROM alpine:3.6
# Alternatively use ADD https:// (which will not be cached by Docker builder)
RUN apk --no-cache add curl ca-certificates imagemagick \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.5.8-alpha/fwatchdog > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.5.8-alpha/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog
ENV fprocess="convert - -resize 50% fd:1"

View File

@@ -10,11 +10,11 @@ RUN dotnet publish -c release -o published
FROM microsoft/dotnet:2.0-runtime
#ADD https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog /usr/bin
#ADD https://github.com/openfaas/faas/releases/download/0.6.1/fwatchdog /usr/bin
RUN apt-get update -qy \
&& apt-get install -qy curl ca-certificates --no-install-recommends \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.6.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apt-get -qy remove curl \
&& apt-get clean \

View File

@@ -3,7 +3,7 @@ FROM arm64v8/node:6.11.2
RUN apt-get update -qy \
&& apt-get install -qy curl ca-certificates --no-install-recommends \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.5/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.6.5/fwatchdog-arm64 > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apt-get -qy remove curl \
&& apt-get clean \

View File

@@ -3,7 +3,7 @@ FROM arm32v6/alpine:3.6
RUN apk add --no-cache nodejs nodejs-npm ca-certificates
RUN apk --no-cache add curl \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.6.1/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl --no-cache

View File

@@ -3,7 +3,7 @@ FROM node:6.11.2-alpine
# Alternatively use ADD https:// (which will not be cached by Docker builder)
RUN apk --no-cache add curl \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.6.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl --no-cache

View File

@@ -2,7 +2,7 @@ FROM armhf/python:2.7-alpine
# Alternatively use ADD https:// (which will not be cached by Docker builder)
RUN apk --no-cache add curl \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog-armhf > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.6.1/fwatchdog-armhf > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl --no-cache

View File

@@ -3,7 +3,7 @@ FROM python:2.7-alpine
# Alternatively use ADD https:// (which will not be cached by Docker builder)
RUN apk --no-cache add curl \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.6.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl --no-cache

View File

@@ -3,7 +3,7 @@ FROM python:3-alpine
# Alternatively use ADD https:// (which will not be cached by Docker builder)
RUN apk --no-cache add curl \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.5/fwatchdog > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.6.5/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl --no-cache

View File

@@ -3,7 +3,7 @@ FROM ruby:2.4-alpine3.6
# Alternatively use ADD https:// (which will not be cached by Docker builder)
RUN apk --no-cache add curl \
&& echo "Pulling watchdog binary from Github." \
&& curl -sSL https://github.com/alexellis/faas/releases/download/0.6.1/fwatchdog > /usr/bin/fwatchdog \
&& curl -sSL https://github.com/openfaas/faas/releases/download/0.6.1/fwatchdog > /usr/bin/fwatchdog \
&& chmod +x /usr/bin/fwatchdog \
&& apk del curl --no-cache

View File

@@ -1,4 +1,4 @@
github.com/alexellis/faas 9a70a1b9915d7420e71dda445349d68f3f3928d8
github.com/openfaas/faas 9a70a1b9915d7420e71dda445349d68f3f3928d8
gopkg.in/yaml.v2 cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
github.com/spf13/cobra 2df9a531813370438a4d79bfc33e21f58063ed87
github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e6