Skip to content

Commit

Permalink
Merge pull request #50 from derschatta/tbuild-tdocker
Browse files Browse the repository at this point in the history
Use tdocker inside of tbuild
  • Loading branch information
derschatta authored Jul 18, 2019
2 parents 9d280b0 + e3b47ef commit 661540c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
12 changes: 1 addition & 11 deletions bin/tbuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,4 @@
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
PROJECTPATH="$( cd $SCRIPTPATH && cd ..; pwd -P )"

cd $PROJECTPATH && docker-compose \
-f docker-compose.yml \
-f compose/nginx.yml \
-f compose/mariadb.yml \
-f compose/mssql.yml \
-f compose/mysql.yml \
-f compose/pgsql.yml \
-f compose/php.yml \
-f compose/selenium.yml \
-f compose/build.yml \
build "$@"
$SCRIPTPATH/tdocker build "$@"
6 changes: 5 additions & 1 deletion bin/tdocker
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ files=(
"compose/selenium.yml"
)

if [ -f "$PROJECTPATH/.use-mutagen" ]; then
if [[ "$1" -eq "build" ]]; then
files+=(
"compose/build.yml"
)
elif [[ -f "$PROJECTPATH/.use-mutagen" ]]; then
files+=(
"compose/sync.yml"
)
Expand Down

0 comments on commit 661540c

Please sign in to comment.