Skip to content

Commit

Permalink
Update docker images to use openfaas namespace
Browse files Browse the repository at this point in the history
Signed-off-by: Burton Rheutan <[email protected]>
  • Loading branch information
burtonr authored and alexellis committed Jun 4, 2019
1 parent 1263e66 commit c62e419
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ script:
- sh build.sh
after_success:
- if [ -z $DOCKER_NS ] ; then
export DOCKER_NS=functions;
export DOCKER_NS=openfaas;
fi
- if [ ! -z "$TRAVIS_TAG" ] ; then
export DOCKER_CLI_EXPERIMENTAL=enabled
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.packager
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM functions/of-watchdog:build as build
FROM openfaas/of-watchdog:build as build
FROM scratch

ARG PLATFORM
Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

if [ ! "$http_proxy" = "" ]
then
docker build --no-cache --build-arg "https_proxy=$https_proxy" --build-arg "http_proxy=$http_proxy" -t functions/of-watchdog:build .
docker build --no-cache --build-arg "https_proxy=$https_proxy" --build-arg "http_proxy=$http_proxy" -t openfaas/of-watchdog:build .
else
docker build -t functions/of-watchdog:build .
docker build -t openfaas/of-watchdog:build .
fi

docker build --no-cache --build-arg PLATFORM="-darwin" -t openfaas/of-watchdog:latest-dev-darwin . -f Dockerfile.packager
Expand All @@ -13,7 +13,7 @@ docker build --no-cache --build-arg PLATFORM="-arm64" -t openfaas/of-watchdog:la
docker build --no-cache --build-arg PLATFORM=".exe" -t openfaas/of-watchdog:latest-dev-windows . -f Dockerfile.packager
docker build --no-cache --build-arg PLATFORM="" -t openfaas/of-watchdog:latest-dev-x86_64 . -f Dockerfile.packager

docker create --name buildoutput functions/of-watchdog:build echo
docker create --name buildoutput openfaas/of-watchdog:build echo

docker cp buildoutput:/go/src/github.com/openfaas-incubator/of-watchdog/of-watchdog ./of-watchdog
docker cp buildoutput:/go/src/github.com/openfaas-incubator/of-watchdog/of-watchdog-darwin ./of-watchdog-darwin
Expand Down

0 comments on commit c62e419

Please sign in to comment.