From 6f7841eaf1ca7f52e737c0b5c999e51e3fbba316 Mon Sep 17 00:00:00 2001 From: ionous Date: Sun, 7 Jul 2024 22:23:57 -0700 Subject: [PATCH] normalize usage of docker-compose this change makes it so that macos uses the same compose command as production. this is a "patch" until we can upgrade production. once that's done, then this should be converted to "docker compose" for all platforms. ( the "dash" version is deprecated, but the "space" version doesn't yet exist on production ) i've tested this on apple silicon with local Docker version 26.1.1, build 4cf5afa. and i've tested this previously on my older intel mac with ... a relatively recent version of docker. --- shift | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/shift b/shift index 2fec9eda..242deef0 100755 --- a/shift +++ b/shift @@ -167,15 +167,7 @@ sub_attach() { # - Run bash on a running service } sub_compose() { # - Run a compose with associated files - OS=`uname` - if [ "$OS" == "Darwin" ] ; then - docker compose $@ - elif [ "$OS" == "Linux" ] ; then - docker-compose $@ - else - echo "not sure how to handle your OS' version of docker. One of the above should work!" - exit 255 - fi + docker-compose $@ } sub_logs() { # , ... - Show last 50 lines and attach to a service