Skip to content

Commit

Permalink
Merge pull request #334 from dickschoeller/new-script
Browse files Browse the repository at this point in the history
some new script work
  • Loading branch information
dickschoeller authored May 8, 2017
2 parents 3f1c7b6 + 8c35ebb commit fafb018
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion config/before-deploy.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
echo TRAVIS_BRANCH=$TRAVIS_BRANCH
echo TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST
if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.1.3' || $TRAVIS_BRANCH == 'development' ) ]]; then
if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.2.0' || $TRAVIS_BRANCH == 'development' ) ]]; then
openssl aes-256-cbc -K $encrypted_0b79b78d9b0a_key -iv $encrypted_0b79b78d9b0a_iv -in config/codesigning.asc.enc -out config/codesigning.asc -d
gpg --fast-import config/codesigning.asc
else
Expand Down
2 changes: 1 addition & 1 deletion config/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.1.3' || $TRAVIS_BRANCH == 'development' ) ]]; then
if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.2.0' || $TRAVIS_BRANCH == 'development' ) ]]; then
mvn --batch-mode --settings=config/settings.xml -Psign,deploy -DpushImage deploy
else
echo "Only deploy on push to development or label"
Expand Down
18 changes: 18 additions & 0 deletions config/gedbrowser_restart.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
export GEDBROWSER_HOME=/var/lib/gedbrowser
export DATA_DIR=/home/dick/data

docker stop gedbrowser gedbrowser-snapshot
docker stop geoservice geoservice-snapshot
docker stop mongo

docker rm gedbrowser gedbrowser-snapshot geoservice geoservice-snapshot mongo
docker rmi $(docker images | grep none | awk '{ print $3 }' )
docker rmi mongo
docker rmi dickschoeller/geoservice:latest
docker rmi dickschoeller/gedbrowser:latest
docker rmi $(docker images | grep dickschoeller | awk '{ print $3 }' )

docker run -v ${DATA_DIR}:/data/db --name mongo -p 28001:27017 -d mongo
docker run --link mongo:mongo -v ${GEDBROWSER_HOME}:/var/lib/gedbrowser -p 8086:8080 -p 8087:8081 --name geoservice -d dickschoeller/geoservice
docker run --link geoservice:geoservice --link mongo:mongo -v ${GEDBROWSER_HOME}:/var/lib/gedbrowser -p 8082:8080 -p 8083:8081 --name gedbrowser -d dickschoeller/gedbrowser

0 comments on commit fafb018

Please sign in to comment.