Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into Port80Support
Browse files Browse the repository at this point in the history
  • Loading branch information
jkelvie authored Mar 12, 2019
2 parents 5a91d4a + 2a95916 commit 4b10961
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ deploy-steps: &deploy-steps
command: |
echo -e $EC2_SSL_KEY > bst-server.pem
chmod 400 bst-server.pem
ssh -i bst-server.pem [email protected] "
ssh -i bst-server.pem $BST_CONTAINER "
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker pull bespoken/bst:$CIRCLE_TAG
docker stop \$(docker ps -aq)
docker run -d --env-file .env -p 443:443 -p 5000:5000 bespoken/bst:$CIRCLE_TAG
docker run -d --env-file .env -p 443:443 -p 5000:5000 -p 80:80 bespoken/bst:$CIRCLE_TAG
"
version: 2
Expand Down Expand Up @@ -52,15 +52,15 @@ jobs:
environment:
- TYPE_OF_DEPLOY: dev
- SKIP_STATISTICS: "true"

- BST_CONTAINER: [email protected]
working_directory: ~/circleci-deployment
steps: *deploy-steps

bst-server:
machine: true
environment:
- TYPE_OF_DEPLOY: server

- BST_CONTAINER: [email protected]
working_directory: ~/circleci-deployment
steps: *deploy-steps

Expand Down

0 comments on commit 4b10961

Please sign in to comment.