fix var names, move paths, upgrade pip
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Jeffrey Paul 2020-04-11 12:18:22 -07:00
parent 07788af7cc
commit f5c7654cc8
3 changed files with 14 additions and 5 deletions

View File

@ -10,5 +10,6 @@ docker run \
-d \ -d \
--name work \ --name work \
-v /:/hostroot \ -v /:/hostroot \
-v /home/sneak:/hosthome \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
sneak/work sneak/work

View File

@ -1,5 +1,9 @@
#!/bin/bash #!/bin/bash
echo "##### build/run.sh"
set -x
TD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)" TD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
cd "$TD" cd "$TD"
@ -19,9 +23,11 @@ for FN in $SSH_HOST_KEY_FILES ; do
ln -s /hostroot/etc/ssh/$FN /etc/ssh/$FN ln -s /hostroot/etc/ssh/$FN /etc/ssh/$FN
done done
ln -s /hostroot/root /root/.home
# install other stuff here # install other stuff here
# update pip pip install -U pip
# install black # install black
# install python packages # install python packages
# install yarn # install yarn

View File

@ -2,16 +2,18 @@
TD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)" TD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
U="$USERNAME_TO_ADD"
# original home # original home
OH="/hostroot/home/$USER_TO_ADD" OH="/hosthome"
# container home # container home
export HOME="/home/$USER_TO_ADD" export HOME="/home/$U"
rsync -avP /home/template/ $HOME/ rsync -avP /home/template/ $HOME/
# link ~/.home to original home # link ~/.home to original home
ln -s "/hostroot/home/$USER_TO_ADD" $HOME/.home ln -s "/hosthome" $HOME/.home
# oh-my-zsh # oh-my-zsh
curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh > /tmp/installomz.sh curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh > /tmp/installomz.sh
@ -22,5 +24,5 @@ bash /tmp/installomz.sh --unattended --keep-zshrc
ln -s ~/.home/.ssh/id_rsa ~/.ssh/id_rsa ln -s ~/.home/.ssh/id_rsa ~/.ssh/id_rsa
ln -s ~/.home/.ssh/id_rsa.pub ~/.ssh/id_rsa.pub ln -s ~/.home/.ssh/id_rsa.pub ~/.ssh/id_rsa.pub
# move this to runtime # move this to runtime FIXME
#DEVDIR="$( cd ~/.home/dev >/dev/null 2>&1 && pwd -P)" #DEVDIR="$( cd ~/.home/dev >/dev/null 2>&1 && pwd -P)"