Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add NOBUILD ARG to script #161

Merged
merged 1 commit into from
Jul 6, 2018
Merged

add NOBUILD ARG to script #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ WORKDIR /go/src/github.com/fission/fission-workflows

COPY . .

RUN if [ "_$NOBUILD" = "_" ] ; then \
RUN if ! $NOBUILD ; then \
go get github.com/Masterminds/glide; \
glide install -v; \
build/build-linux.sh; \
Expand All @@ -19,4 +19,4 @@ RUN if [ "_$NOBUILD" = "_" ] ; then \
FROM scratch

COPY --from=builder /go/src/github.com/fission/fission-workflows/fission-workflows-bundle /fission-workflows-bundle
COPY --from=builder /go/src/github.com/fission/fission-workflows/wfcli /wfcli
COPY --from=builder /go/src/github.com/fission/fission-workflows/wfcli /wfcli
5 changes: 3 additions & 2 deletions build/docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ set -eo pipefail
BUILD_ROOT=$(dirname $0)
IMAGE_REPO=${1:-fission}
IMAGE_TAG=${2:-latest}
NOBUILD=${3:-false}

# Build bundle images
bundleImage=${IMAGE_REPO}/fission-workflows-bundle
pushd ${BUILD_ROOT}/..
if [ ! -z "$NOBUILD" ]; then
if $NOBUILD ; then
if [ ! -f ./fission-workflows-bundle ]; then
echo "Executable './fission-workflows-bundle' not found!"
exit 1;
Expand Down Expand Up @@ -47,4 +48,4 @@ docker build --tag="${IMAGE_REPO}/wfcli:${IMAGE_TAG}" ${BUILD_ROOT}/wfcli/ \
--build-arg BUNDLE_TAG=${IMAGE_TAG}

# Remove intermediate images
# docker rmi $(docker images -f "dangling=true" -q)
# docker rmi $(docker images -f "dangling=true" -q)