Skip to content

Commit

Permalink
[s2i] use --copy only when not running on CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mikz committed Dec 7, 2017
1 parent 3c3d805 commit f4f855e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ ifeq ($(ROVER),)
ROVER := lua_modules/bin/rover
endif

ifneq ($(CI),true)
S2I_OPTIONS += --copy
endif

export COMPOSE_PROJECT_NAME

test: ## Run all tests
Expand Down Expand Up @@ -69,7 +73,7 @@ prove-docker: ## Test nginx inside docker
$(DOCKER_COMPOSE) run --rm -T prove | awk '/Result: NOTESTS/ { print "FAIL: NOTESTS"; print; exit 1 }; { print }'

builder-image: ## Build builder image
$(S2I) build . $(BUILDER_IMAGE) $(IMAGE_NAME) --context-dir=$(S2I_CONTEXT) --copy --incremental $(S2I_OPTIONS)
$(S2I) build . $(BUILDER_IMAGE) $(IMAGE_NAME) --context-dir=$(S2I_CONTEXT) --incremental $(S2I_OPTIONS)

runtime-image: PULL_POLICY ?= always
runtime-image: IMAGE_NAME = apicast-runtime-test
Expand Down

0 comments on commit f4f855e

Please sign in to comment.