All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 57fc373f authored by David Johnson's avatar David Johnson

Merge branch 'master' into 'master'

Symlinked tcsh to bash to allow user logins for alpine containers

See merge request !32
parents b4ae235d c88364d6
......@@ -12,14 +12,15 @@ set -x
DIRNAME=`pwd`
echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
# echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
apk update
apk add git ca-certificates tcsh@testing perl \
apk add git ca-certificates bash perl \
gcc make libc-dev byacc libtool openssl-dev 'g++' \
sudo python python-dev libpcap-dev boost-dev wget patch flex
ln -s /bin/bash /bin/tcsh
ln -s /bin/tcsh /bin/csh
if [ -z "$EMULABTMPSRC" ]; then
......
......@@ -3,16 +3,17 @@
set -x
# add testing branch to repo for tcsh package
echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
# echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
apk update
# missing perl-modules package from ubuntu version
apk add ca-certificates sudo python wget patch nano file \
perl perl-libwww psmisc tcsh@testing zsh mksh shadow \
perl perl-libwww psmisc bash zsh mksh shadow \
'g++' gcc openssl-dev boost
# the apk tcsh doesnt include a csh symlink so we'll add one
ln -s /bin/bash /bin/tcsh
ln -s /bin/tcsh /bin/csh
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment