From 1bc7668da75f625dcaf07c1bf10d7a9bf5d4f8db Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Feb 20 2018 22:13:30 +0000
Subject: nightly.sh: update the syncing of composes


Sync the new Modular variant, 	primary aarch64, armhfp, x86_64
				alt: i386, ppc64, ppc64le, s390x
rename the syncing from Docker to Container for recent change

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/nightly.sh b/nightly.sh
index 5e01996..309ca8e 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -117,20 +117,24 @@ if [ ! -d "$RSYNCTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
+    --variant Everything --variant Atomic --variant CloudImages --variant Container \
+    --variant Server --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
+    --variant Everything --variant Atomic --variant CloudImages --variant Container \
+    --variant Server --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
 # aarch64 for Server and Everything is primary
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server --variant CloudImages --variant Docker \
+    --variant Everything --variant Server --variant CloudImages --variant Container \
+    --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server --variant CloudImages --variant Docker \
+    --variant Everything --variant Server --variant CloudImages --variant Container \
+    --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
@@ -163,11 +167,13 @@ $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch
 # aarch64 is alternative for Atomic Labs Spins Workstation
 $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
+    --variant Atomic --variant Cloud --variant CloudImages --variant Container \
+    --variant Labs --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
+    --variant Atomic --variant Cloud --variant CloudImages --variant Container \
+    --variant Labs --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCSECTARGET/" \