Skip to content

Commit

Permalink
Merge branch 'develop' into issue-30-secureAPI
Browse files Browse the repository at this point in the history
  • Loading branch information
titouanfreville committed Mar 10, 2017
2 parents da169de + 22099ab commit a389698
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions scripts/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ function usage(){
echo -e "\t--tag=$TAG"
echo ""
}
function install_docs_require() {
./scripts/slate_require.sh
}
function build_images() {
# First args is tags
docker build --no-cache -t ${REPO}/popcubedocs:$1 -f docker/slateserver.Dockerfile .
Expand Down Expand Up @@ -112,6 +115,7 @@ fi
if [ ${TAG+x} ];
then
echo "TAG is set to '$TAG'";
install_docs_require
build_images "$TAG"
push_images "$TAG"
elif [ ${BRANCH+x} ];
Expand All @@ -120,13 +124,15 @@ then
if [ ${BRANCH} = "master" ];
then
echo "branch develop : OK"
install_docs_require
build_images "master"
push_images "master"
build_images "latest"
push_images "latest"
elif [ ${BRANCH} = "develop" ];
then
echo "branch develop : OK"
install_docs_require
build_images "dev"
push_images "dev"
else
Expand Down

0 comments on commit a389698

Please sign in to comment.