Merge branch 'master' into 'master'

Full emulab clientside build for alpine containers

See merge request emulab/emulab-devel!31

clientside/tmcc/linux/docker/dockerfiles/alpine/fs/etc/service/pubsubd/finish

 #!/bin/sh
 
-# Never run if systemd is running; it will do this.
-[ -f /bin/systemctl ] && /bin/systemctl show-environment >/dev/null 2>&1 \
-    && (touch /etc/service/pubsubd/down ; exit 0)
-
 if [ -f /etc/init.d/pubsubd ]; then
     exec /etc/init.d/pubsubd stop
 else

clientside/tmcc/linux/docker/dockerfiles/alpine/fs/etc/service/pubsubd/run

 #!/bin/sh
 
-# Never run if systemd is running; it will do this.
-[ -f /bin/systemctl ] && /bin/systemctl show-environment >/dev/null 2>&1 \
-    && (touch /etc/service/pubsubd/down ; exit 0)
-
 if [ -f /etc/init.d/pubsubd ]; then
     /etc/init.d/pubsubd start
     if [ ! $? -eq 0 ]; then

clientside/tmcc/linux/docker/dockerfiles/alpine/fs/etc/service/rsyslog/run

 #!/bin/sh
 
-# Never run if systemd is running; it will do this.
-[ -f /bin/systemctl ] && /bin/systemctl show-environment >/dev/null 2>&1 && exit 0
-
-. /etc/default/rsyslog
-
 exec /usr/sbin/rsyslogd -n $RSYSLOGD_OPTIONS

clientside/tmcc/linux/docker/dockerfiles/alpine/fs/etc/service/sshd/run

 #!/bin/sh
 
-# Never run if systemd is running; it will do this.
-[ -f /bin/systemctl ] && /bin/systemctl show-environment >/dev/null 2>&1 && exit 0
-
 mkdir -p /var/run/sshd
 
 exec /usr/sbin/sshd -D

clientside/tmcc/linux/docker/dockerfiles/alpine/fs/etc/service/tbprepare/finish

 #!/bin/sh
 
-# Never run if systemd is running; it will do this.
-[ -f /bin/systemctl ] && /bin/systemctl show-environment >/dev/null 2>&1 && exit 0
-
 if [ -f /usr/local/etc/emulab/initscripts/tbprepare ]; then
     exec /usr/local/etc/emulab/initscripts/tbprepare stop
 fi

clientside/tmcc/linux/docker/dockerfiles/alpine/fs/etc/service/testbed/finish

 #!/bin/sh
 
-# Never run if systemd is running; it will do this.
-[ -f /bin/systemctl ] && /bin/systemctl show-environment >/dev/null 2>&1 \
-    && (touch /etc/service/testbed/down ; exit 0)
-
 if [ -f /usr/local/etc/emulab/initscripts/testbed ]; then
     exec /usr/local/etc/emulab/initscripts/testbed stop
 fi

clientside/tmcc/linux/docker/dockerfiles/alpine/fs/etc/service/testbed/run

 #!/bin/sh
 
-# Never run if systemd is running; it will do this.
-[ -f /bin/systemctl ] && /bin/systemctl show-environment >/dev/null 2>&1 \
-    && (touch /etc/service/testbed/down ; exit 0)
-
-if [ -f /usr/local/etc/emulab/initscripts/testbed ]; then
-    /usr/local/etc/emulab/initscripts/testbed start
+if [ -f /usr/local/etc/emulab/rc/rc.testbed ]; then
+    /usr/local/etc/emulab/rc/rc.testbed start
     if [ ! $? -eq 0 ]; then
-	echo "Failed to start /usr/local/etc/emulab/initscripts/testbed: $?"
+	echo "Failed to start /usr/local/etc/emulab/rc/rc.testbed: $?"
 	exit $?
     fi
     #

clientside/tmcc/linux/docker/dockerfiles/alpine3/basic.sh

@@ -5,7 +5,7 @@ set -x
 apk update
 
 # missing iputils-ping package from ubuntu process
-apk add openssh-server rsyslog logrotate iproute2 iputils net-tools sudo
+apk add openssh-server rsyslog logrotate iproute2 iputils net-tools sudo bash
 
 ## Permissions on these should be the same as the host, so preserve them.
 #cp -p /tmp/src/ssh-host-keys/ssh_host* /etc/ssh/

clientside/tmcc/linux/docker/dockerfiles/alpine3/buildenv.sh

@@ -10,24 +10,30 @@
 
 set -x
 
+DIRNAME=`pwd`
+
+echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+
 apk update
 
-apk add git ca-certificates \
+apk add git ca-certificates tcsh@testing perl \
     gcc make libc-dev byacc libtool openssl-dev 'g++' \
     sudo python python-dev libpcap-dev boost-dev wget patch flex
 
-if [ -z "$EMULABSRC" ]; then
+ln -s /bin/tcsh /bin/csh
+
+if [ -z "$EMULABTMPSRC" ]; then
     echo "WARNING: missing EMULABSRC environment variable pointer to src; cloning!"
     export EMULABSRC=/tmp/emulab-devel
     cd /tmp
-    git clone https://gitlab.flux.utah.edu/emulab/emulab-devel $EMULABSRC
+    git clone https://gitlab.flux.utah.edu/emulab/emulab-devel.git $EMULABSRC
     [ ! $? -eq 0 ] && exit 1
 fi
 if [ -z "$PUBSUBSRC" ]; then
     echo "WARNING: missing PUBSUBSRC environment variable pointer to src; cloning!"
     export PUBSUBSRC=/tmp/pubsub
     cd /tmp
-    git clone https://gitlab.flux.utah.edu/emulab/pubsub $PUBSUBSRC
+    git clone https://gitlab.flux.utah.edu/emulab/pubsub.git $PUBSUBSRC
     [ ! $? -eq 0 ] && exit 1
 fi
 
@@ -53,15 +59,15 @@ fi
 echo /usr/local/lib > /etc/ld.so.conf.d/pubsub.conf
 ldconfig
 
-# mkdir -p /tmp/emulab.obj
-# cd /tmp/emulab.obj
-# export NONTP=1
-# $EMULABSRC/clientside/configure --with-TBDEFS=$EMULABSRC/defs-utahclient \
-#     && make client && make client-install \
-#     && make -C tmcc/linux docker-guest-install
-# [ ! $? -eq 0 ] && exit 1
-# cd /tmp
-# rm -rf /tmp/emulab.obj
+mkdir -p /tmp/emulab.obj
+cd /tmp/emulab.obj
+export NONTP=1
+$EMULABSRC/clientside/configure --with-TBDEFS=$EMULABSRC/defs-utahclient \
+    && make client && make client-install \
+    && make -C tmcc/linux docker-guest-install
+[ ! $? -eq 0 ] && exit 1
+cd /tmp
+rm -rf /tmp/emulab.obj
 
 #
 # Create these traditional NFS mountpoints now.  Scripts get unhappy

clientside/tmcc/linux/docker/dockerfiles/alpine3/core.sh

@@ -9,7 +9,11 @@ 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
+    perl perl-libwww psmisc tcsh@testing zsh mksh shadow \
+    'g++' gcc openssl-dev boost
+
+# the apk tcsh doesnt include a csh symlink so we'll add one
+ln -s /bin/tcsh /bin/csh
 
 #
 # Create these traditional NFS mountpoints now.  Scripts get unhappy

clientside/tmcc/linux/docker/dockerfiles/alpine3/runit-packager.sh

@@ -8,8 +8,5 @@ set -x
 
 # sudo chown packager:packager ~/.abuild/
 abuild-keygen -a -i -n
-cd /tmp/runit
-ls -la
-cd alpine
-ls -la
+cd /tmp/runit/alpine
 abuild -r -P /tmp