transition to using github releases for distribution

README.md

@@ -15,6 +15,7 @@ The Labtainers website, and downloads (including VM appliances with Labtainers p
 
 Distribution created: mm/dd/yyyy
 Revision:
+Commit:
 Branch:
 
 ## Content
@@ -72,6 +73,12 @@ The installation script and the update-designer.sh script set environment variab
 so you may want to logout/login, or start a new bash shell before using Labtainers the
 first time.
 
+December 4, 2020
+- Transition distribution of tar to GitHub releaese artifacts
+- Eliminate seperate designer tar file, use git repo tarball.
+- Testing of grader web functions for analysis of student lab artifacts
+- Clear logs from full smoketest and delete grader container in removelab command.
+
 December 1, 2020
 - The iptables2 lab assessment relied on random ports being "unknown" to nmap.
 - Use a sync diretory to delay smoketests from starting prior to lab startup.

distrib/mkdist.sh

@@ -18,7 +18,8 @@ function contains() {
     echo "n"
     return 1
 }
-revision=`git describe --always`
+commit=`git describe --always`
+revision=`git tag`
 skip="skip-labs"
 skiplist=""
 lines=`cat $skip`
@@ -51,6 +52,7 @@ git archive $branch README.md | tar -x -C $ltrunk
 #git archive $branch | tar -x -C $ltrunk
 sed -i "s/mm\/dd\/yyyy/$(date '+%m\/%d\/%Y %H:%M')/" $ltrunk/README.md
 sed -i "s/^Revision:/Revision: $revision/" $ltrunk/README.md
+sed -i "s/^Commit:/Commit: $commit/" $ltrunk/README.md
 sed -i "s/^Branch:/Branch: $branch/" $ltrunk/README.md
 #git archive master config | tar -x -C $ltrunk
 $here/fix-git-dates.py config $ltrunk $branch
@@ -106,6 +108,7 @@ cd $here
 cp labtainer.tar $myshare
 cp labtainer_pdf.zip $myshare
 if [[ "$1" == "-r" ]]; then
+    mkdir -p artifacts
     cp labtainer.tar artifacts/
     cp labtainer_pdf.zip artifacts/
 fi

distrib/release/README.txt

@@ -0,0 +1,3 @@
+Temporary directory resulting from botched change in distribution strategy.
+Had used github large files.  Moving instead to github releases. This "update"
+is just the update-add.sh script that will download from the proper url.

setup_scripts/update-add.sh

@@ -3,3 +3,10 @@ if [[ -z $hasnew ]];then
     #echo "nope"
     $LABTAINER_DIR/setup_scripts/pull-all.py
 fi
+hascommit=$(grep "^Commit:" labtainer/trunk/README.md)
+if [[ -z "$hascommit" ]]; then
+    wget --quiet https://github.com/mfthomps/Labtainers/releases/latest/download/labtainer.tar -O labtainer.tar
+    sync
+    cd ..
+    tar xf labtainer/labtainer.tar --keep-newer-files --warning=none
+fi

setup_scripts/update-labtainer.sh

@@ -103,6 +103,7 @@ fi
 grep "^Distribution created:" labtainer/trunk/README.md | awk '{print "Updated to release of: ", $3, $4}'
 grep "^Branch:" labtainer/trunk/README.md | awk '{print "branch: ", $2}'
 grep "^Revision:" labtainer/trunk/README.md | awk '{print "Revision: ", $2}'
+grep "^Commit:" labtainer/trunk/README.md | awk '{print "Commit: ", $2}'
 # fix broken LABTAINER_DIR
 isbroken=$(grep LABTAINER_DIR=/trunk ~/.bashrc)
 if [[ ! -z $isbroken ]]; then