Skip to content

Commit

Permalink
Merge pull request #9 from josegonzalez/master
Browse files Browse the repository at this point in the history
Release 0.1.2
  • Loading branch information
josegonzalez authored Jul 29, 2018
2 parents 1fc361a + ed9c2b8 commit a156417
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
13 changes: 8 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ jobs:
docker_layer_caching: true
steps:
- checkout
- run: make version
- run:
command: |
make version
if [[ "$CIRCLE_BRANCH" == "release" ]]; then
export PACKAGECLOUD_REPOSITORY=dokku/dokku
make .env.docker
fi
- run: make circleci
- run: make build-docker-image
- run:
Expand All @@ -25,8 +31,5 @@ jobs:
command: |
if [[ "$CIRCLE_BRANCH" == "release" ]]; then
make release-in-docker
export PACKAGECLOUD_REPOSITORY=dokku/dokku
make release-packagecloud-in-docker
else
make release-packagecloud-in-docker
fi
make release-packagecloud-in-docker
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER = josegonzalez
MAINTAINER_NAME = Jose Diaz-Gonzalez
REPOSITORY = go-procfile-util
HARDWARE = $(shell uname -m)
BASE_VERSION ?= 0.1.1
BASE_VERSION ?= 0.1.2
IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY)
PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish

Expand Down

0 comments on commit a156417

Please sign in to comment.