Skip to content
This repository has been archived by the owner on Jun 15, 2021. It is now read-only.

Commit

Permalink
Merge pull request #18 from kindlyops/deployment-stuff1
Browse files Browse the repository at this point in the history
Rename complianceops container to havenweb
  • Loading branch information
statik committed Apr 4, 2017
2 parents 7d358d3 + 1ecd329 commit 30af508
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 7 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ Once you have docker set up:
docker-compose up
curl -s http://localhost:3001/ | jq

## to access the main webUI

Open http://localhost:2015/, click the login button.

## to access tellform

Open http://localhost:3000/, you can sign in with admin/admin in the dev env.
Expand Down
14 changes: 7 additions & 7 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test:
timeout: 900
pwd:
web
- docker build --rm=false -t kindlyops/complianceops web
- docker build --rm=false -t kindlyops/havenweb web


deployment:
Expand All @@ -50,24 +50,24 @@ deployment:
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
- docker tag kindlyops/mappamundi kindlyops/mappamundi:$CIRCLE_SHA1
- docker tag kindlyops/complianceopsmarketing kindlyops/complianceopsmarketing:$CIRCLE_SHA1
- docker tag kindlyops/complianceops kindlyops/complianceops:$CIRCLE_SHA1
- docker tag kindlyops/havenweb kindlyops/havenweb:$CIRCLE_SHA1
- docker push kindlyops/mappamundi:$CIRCLE_SHA1
- docker push kindlyops/complianceopsmarketing:$CIRCLE_SHA1
- docker push kindlyops/complianceops:$CIRCLE_SHA1
- docker push kindlyops/havenweb:$CIRCLE_SHA1
release:
tag: /v[0-9]+(\.[0-9]+)*/
owner: kindlyops
commands:
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
- docker tag kindlyops/mappamundi kindlyops/mappamundi:$CIRCLE_TAG
- docker tag kindlyops/complianceopsmarketing kindlyops/complianceopsmarketing:$CIRCLE_TAG
- docker tag kindlyops/complianceops kindlyops/complianceops:$CIRCLE_TAG
- docker tag kindlyops/havenweb kindlyops/havenweb:$CIRCLE_TAG
- docker tag kindlyops/mappamundi kindlyops/mappamundi:$CIRCLE_SHA1
- docker tag kindlyops/complianceopsmarketing kindlyops/complianceopsmarketing:$CIRCLE_SHA1
- docker tag kindlyops/complianceops kindlyops/complianceops:$CIRCLE_SHA1
- docker tag kindlyops/havenweb kindlyops/havenweb:$CIRCLE_SHA1
- docker push kindlyops/mappamundi:$CIRCLE_TAG
- docker push kindlyops/complianceops:$CIRCLE_TAG
- docker push kindlyops/havenweb:$CIRCLE_TAG
- docker push kindlyops/complianceopsmarketing:$CIRCLE_TAG
- docker push kindlyops/complianceopsmarketing:$CIRCLE_SHA1
- docker push kindlyops/mappamundi:$CIRCLE_SHA1
- docker push kindlyops/complianceops:$CIRCLE_SHA1
- docker push kindlyops/havenweb:$CIRCLE_SHA1
16 changes: 16 additions & 0 deletions k8s/webui-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: apps/v1beta1
kind: Deployment
metadata:
name: webui-deployment
spec:
replicas: 2
template:
metadata:
labels:
app: webui
spec:
containers:
- name: nginx
image: nginx:1.7.9
ports:
- containerPort: 2015

0 comments on commit 30af508

Please sign in to comment.