Skip to content

Commit

Permalink
remove .env
Browse files Browse the repository at this point in the history
  • Loading branch information
mikz committed Feb 12, 2018
1 parent 71e00e4 commit e5a60d9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
8 changes: 3 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ version: 2
jobs:
deploy:
docker:
- image: quay.io/3scale/s2i:v1.1.5-ce
- image: quay.io/3scale/s2i:v1.1.8-ce
environment:
APICAST_VERSION: master
environment:
REGISTRY: "${DOCKER_REGISTRY}/3scale"
working_directory: /root/apicast-cloud
steps:
- checkout
Expand Down Expand Up @@ -58,11 +56,11 @@ jobs:
environment:
JUNIT_OUTPUT_FILE: tmp/junit/prove.xml
TEST_NGINX_ERROR_LOG: tmp/prove.log
- store_test_results:
path: apicast/tmp/junit
- store_artifacts:
path: apicast/tmp
destination: tmp
- store_test_results:
path: apicast/tmp/junit
workflows:
version: 2
build_and_test:
Expand Down
1 change: 0 additions & 1 deletion apicast/.env

This file was deleted.

2 changes: 1 addition & 1 deletion apicast/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ REMOTE_IMAGE_NAME ?= $(IMAGE_NAME):$(IMAGE_TAG)
LOG_LEVEL ?= notice

build: ## Build the image
s2i build . $(BUILDER_IMAGE) $(LOCAL_IMAGE_NAME) --environment-file=.env --runtime-image=$(RUNTIME_IMAGE) --loglevel=5
s2i build . $(BUILDER_IMAGE) $(LOCAL_IMAGE_NAME) --runtime-image=$(RUNTIME_IMAGE) --loglevel=5

test: ## Run tests (try to start the image)
docker run -it --rm $(LOCAL_IMAGE_NAME) bin/apicast -d
Expand Down

0 comments on commit e5a60d9

Please sign in to comment.