only run npm in docker if user is ubuntu

pull/248/head
Fabian Jakobs 2016-02-08 14:03:28 +00:00
rodzic 00ba2fe346
commit 174b81e7ec
1 zmienionych plików z 18 dodań i 13 usunięć

Wyświetl plik

@ -3,19 +3,24 @@
_b9_npm() {
local WORKDIR=$1
shift
docker run \
--rm \
-w /home/ubuntu/newclient \
-v $WORKDIR:/home/ubuntu/newclient \
--sig-proxy -a STDIN -a STDOUT -a STDERR \
$(_b9_get_newclient_image) bash -c "
echo \"$(_b9_npm_get_github_ssh)\" >> /home/ubuntu/.ssh/id_rsa_deploy
chmod 600 /home/ubuntu/.ssh/id_rsa_deploy
npm "$@"
"
# pushd $WORKDIR
# npm "$@"
# popd
# TODO run all build steps in a container
if [ $(id -u) == "1000" ]; then
docker run \
--rm \
-w /home/ubuntu/newclient \
-v $WORKDIR:/home/ubuntu/newclient \
--sig-proxy -a STDIN -a STDOUT -a STDERR \
$(_b9_get_newclient_image) bash -c "
echo \"$(_b9_npm_get_github_ssh)\" >> /home/ubuntu/.ssh/id_rsa_deploy
chmod 600 /home/ubuntu/.ssh/id_rsa_deploy
npm "$@"
"
else
pushd $WORKDIR &> /dev/null
npm "$@"
popd &> /dev/null
fi
}
_b9_npm_get_github_ssh() {