Merge branch 'env-vars' into dev

2026-02-20 11:56:42 +00:00 · 2025-01-14 23:45:12 -05:00
parent 217379d286 5101e6f125
commit fcb3b5de6a
2 changed files with 66 additions and 34 deletions
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,7 +4,11 @@ set -e

 # first arg is `-f` or `--some-option`
 if [ "${1#-}" != "$1" ]; then
+<<<<<<< HEAD
    set -- gerbil "$@"
+=======
+    set -- newt "$@"
+>>>>>>> env-vars
 fi

 exec "$@"