ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-01 03:23:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

docker-image: Pass -t flag to vere if not in an interactive container

Browse Source 
Vere will not run a ship if STDIN is closed, unless passed the `-t`
flag. Hosted docker containers will not be interactive, but we would
like the docker image to be usable locally and interactively as well.

Thus, we check for STDIN being closed in the shell prior to launching
Vere, and if it is closed, pass the `-t` flag.
This commit is contained in:
Edward Amsden 2021-01-16 19:44:04 -05:00
parent 72834a6ad2
commit 8d8dc826cb
No known key found for this signature in database
GPG Key ID: 548EDF608CA956F6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nix/pkgs/docker-image/default.nix
View File

@ -5,6 +5,15 @@ let
set -eu
# If the container is not started with the `-i` flag
# then STDIN will be closed and we need to start
# Urbit/vere with the `-t` flag.
ttyflag=""
if [ ! -t 0 ]; then
echo "Running with no STDIN"
ttyflag="-t"
fi
# Check if there is a keyfile, if so boot a ship with its name, and then remove the key
if [ -e *.key ]; then
# Get the name of the key
@ -14,7 +23,7 @@ let
mv $keyname /tmp
# Boot urbit with the key, exit when done booting
urbit -w $(basename $keyname .key) -k /tmp/$keyname -c $(basename $keyname .key) -p ${toString amesPort} -x
urbit $ttyflag -w $(basename $keyname .key) -k /tmp/$keyname -c $(basename $keyname .key) -p ${toString amesPort} -x
# Remove the keyfile for security
rm /tmp/$keyname
@ -25,7 +34,7 @@ let
cometname=''${comets[0]}
rm *.comet
urbit -c $(basename $cometname .comet) -p ${toString amesPort} -x
urbit $ttyflag -c $(basename $cometname .comet) -p ${toString amesPort} -x
fi
# Find the first directory and start urbit with the ship therein
@ -33,7 +42,7 @@ let
dirs=( $dirnames )
dirname=''${dirnames[0]}
urbit -p ${toString amesPort} $dirname
urbit $ttyflag -p ${toString amesPort} $dirname
'';