Skip to content

Commit 029ed17

Browse files
authored
Merge pull request #56 from itk-dev/revert-12-feature/handle-stdin
Revert "Add additional environment variables to docker-compose call"
2 parents 0005461 + 1dfb7e6 commit 029ed17

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

scripts/itkdev-docker-compose

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -288,23 +288,9 @@ fi
288288

289289
# Helper function to call `docker-compose` in the right context
290290
docker_compose () {
291-
local command="$1"
292-
shift
293-
local command_options=()
294-
295-
# We must pass "-T" to docker-compose exec when piping input
296-
if [ "$command" = "exec" ] && [ ! -t 0 ]; then
297-
command_options+=(-T)
298-
fi
299-
300-
# Set screen size
301-
if [[ "$command" =~ exec|run ]]; then
302-
command_options+=(-e COLUMNS=$(tput cols) -e LINES=$(tput lines))
303-
fi
304-
305291
# Note: Apparently, using --project-directory or --file options for `docker-compose` will break use of `$PWD` in
306292
# docker-compose.yml. Therefore, we `cd` before running `docker-compose` command.
307-
(cd "$docker_compose_dir" && COMPOSE_DOMAIN=${COMPOSE_DOMAIN} docker-compose "$command" ${command_options[@]:+${command_options[@]}} "$@")
293+
(cd "$docker_compose_dir" && COMPOSE_DOMAIN=${COMPOSE_DOMAIN} docker-compose "$@")
308294
}
309295

310296
cmd="$1"

0 commit comments

Comments
 (0)