From 5e2112af50cb6298525540cf30714106c58cc440 Mon Sep 17 00:00:00 2001 From: Richard Gee Date: Sun, 14 Apr 2019 18:10:55 +0100 Subject: [PATCH] Bundle watchdog binaries into an image Signed-off-by: Richard Gee --- .travis.yml | 8 ++++++++ watchdog/Dockerfile.packager | 7 +++++++ watchdog/build.sh | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 watchdog/Dockerfile.packager diff --git a/.travis.yml b/.travis.yml index 98362f16..53f052a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,14 @@ after_success: echo $QUAY_PASSWORD | docker login -u=$QUAY_USERNAME --password-stdin quay.io; docker push quay.io/$DOCKER_NS/gateway:$TRAVIS_TAG; + docker tag $DOCKER_NS/watchdog:latest-dev $DOCKER_NS/watchdog:$TRAVIS_TAG; + echo $DOCKER_PASSWORD | docker login -u=$DOCKER_USERNAME --password-stdin; + docker push $DOCKER_NS/watchdog:$TRAVIS_TAG; + + docker tag $DOCKER_NS/watchdog:latest-dev quay.io/$DOCKER_NS/watchdog:$TRAVIS_TAG; + echo $QUAY_PASSWORD | docker login -u=$QUAY_USERNAME --password-stdin quay.io; + docker push quay.io/$DOCKER_NS/watchdog:$TRAVIS_TAG; + fi before_deploy: diff --git a/watchdog/Dockerfile.packager b/watchdog/Dockerfile.packager new file mode 100644 index 00000000..3e228f4e --- /dev/null +++ b/watchdog/Dockerfile.packager @@ -0,0 +1,7 @@ +FROM openfaas/watchdog:build as build +FROM scratch + +COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog ./fwatchdog +COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog-armhf ./fwatchdog-armhf +COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog-arm64 ./fwatchdog-arm64 +COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog.exe ./fwatchdog.exe diff --git a/watchdog/build.sh b/watchdog/build.sh index 5b7c92d1..0de6c1ef 100755 --- a/watchdog/build.sh +++ b/watchdog/build.sh @@ -22,6 +22,8 @@ else docker build --no-cache --build-arg VERSION=$VERSION --build-arg GIT_COMMIT=$GIT_COMMIT -t openfaas/watchdog:build . fi +docker build --no-cache -t openfaas/watchdog:latest-dev . -f Dockerfile.packager + docker create --name buildoutput openfaas/watchdog:build echo docker cp buildoutput:/go/src/github.com/openfaas/faas/watchdog/watchdog ./fwatchdog @@ -30,4 +32,3 @@ docker cp buildoutput:/go/src/github.com/openfaas/faas/watchdog/watchdog-arm64 . docker cp buildoutput:/go/src/github.com/openfaas/faas/watchdog/watchdog.exe ./fwatchdog.exe docker rm buildoutput -