diff --git a/.circleci/config.yml b/.circleci/config.yml index 25d01c5..f21c31e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,18 +9,6 @@ jobs: - run: name: Build Postal Docker Container command: docker build -t catdeployed/postal:latest -t catdeployed/postal:alpine . - - run: - name: Skip this job for Pull Requests - command: '[[ -v CIRCLE_PR_NUMBER ]] && circleci step halt || true' - - run: - name: Login to Docker Hub - command: docker login -u $DOCKER_USER -p $DOCKER_PASS - - run: - name: Push to Docker Hub - command: docker push catdeployed/postal:latest - - run: - name: Push to Docker Hub - command: docker push catdeployed/postal:alpine build-ubuntu: machine: true working_directory: ~/repo/ubuntu @@ -30,15 +18,26 @@ jobs: - run: name: Build Postal Docker Container command: docker build -t catdeployed/postal:ubuntu . - - run: - name: Skip this job for Pull Requests - command: '[[ -v CIRCLE_PR_NUMBER ]] && circleci step halt || true' + deploy: + machine: true + working_directory: ~/repo/ubuntu + steps: - run: name: Login to Docker Hub command: docker login -u $DOCKER_USER -p $DOCKER_PASS - run: name: Push to Docker Hub command: docker push catdeployed/postal:ubuntu + - run: + name: Push to Docker Hub + command: docker push catdeployed/postal:alpine + - run: + name: Login to Docker Hub + command: docker push catdeployed/postal:ubuntu + push-alpine: + machine: true + working_directory: ~/repo/ubuntu + steps: workflows: version: 2 nightly: @@ -49,9 +48,19 @@ workflows: branches: only: - master + - dev jobs: - build-alpine - build-ubuntu + - deploy: + requires: + - build-alpine + - build-ubuntu + filters: + branches: + only: + - master + - dev commit: jobs: - build-alpine