Changeset 2356 in ProjectBuilder for devel/contrib

Timestamp:

Feb 18, 2019, 6:33:12 PM (6 years ago)

Author:

Bruno Cornec

Message:

Fix container build scripts

Location:

devel/contrib

Files:

• mkallctn (modified) (1 diff)
• mkctn (modified) (2 diffs)

devel/contrib/mkallctn

@@ -4 +4 @@
 distros=`grep -2 velist $vedir/.pbrc.yml | grep default: | cut -d: -f2`
 
-for pbos in `echo $distros | sed 's/,/ /g';
+for pbos in `echo $distros | sed 's/,/ /g'`;
 do
-    d=`echo $pbos | cut -d- -f1`
-    v=`echo $pbos | cut -d- -f2`
-    docker pull ${d}:$v
+    d=`echo $pbos | cut -d'-' -f1`
+    v=`echo $pbos | cut -d'-' -f2`
     # Check status to see whether we shodl go further
     if [ _"$d" = _"mageia" ]; then

devel/contrib/mkctn

@@ -11 +11 @@
 fi
 
+echo "Working on ${DISTRO}:$DISTROVER ..."
+echo "-----------------------------------"
 docker pull ${DISTRO}:$DISTROVER
 pb -p pb -T docker -m $M newve -i ${DISTRO}:$DISTROVER
@@ -16 +18 @@
 pb -p pb -T docker -m $M prepve
 pb -p pb -T docker -m $M build2ve
+docker image prune -f