Minor changes

build.sh

@@ -14,7 +14,7 @@ export PACKER_BINARY=${PACKER_BINARY:-packerio}
 # Directory where all the images will be stored
 export PACKER_IMAGES_OUTPUT_DIR=${PACKER_IMAGES_OUTPUT_DIR:-/var/tmp/packer-templates-images}
 # Directory where to store the logs
-export LOG_DIR=${LOG_DIR:-$PACKER_IMAGES_OUTPUT_DIR}
+export LOGDIR=${LOGDIR:-$PACKER_IMAGES_OUTPUT_DIR}
 
 readonly PROGNAME=$(basename $0)
 readonly ARGS="$@"
@@ -85,7 +85,7 @@ cmdline() {
 
     test -d $TMPDIR                   || mkdir -v $TMPDIR
     test -d $PACKER_IMAGES_OUTPUT_DIR || mkdir -v $PACKER_IMAGES_OUTPUT_DIR
-    test -d $LOG_DIR                  || mkdir -v $LOG_DIR
+    test -d $LOGDIR                   || mkdir -v $LOGDIR
 
     echo -e "\n\n*** $MY_NAME | $MYBUILD - $PACKER_VAGRANT_PROVIDER/$PACKER_BUILDER_TYPE"
 
@@ -164,9 +164,9 @@ packer_build() {
         -v $PWD:/home/docker/packer \
         -v $TMPDIR:/home/docker/packer/packer_cache/ \
         $DOCKER_ENV_PARAMETERS -e PACKER_IMAGES_OUTPUT_DIR=$PACKER_IMAGES_OUTPUT_DIR \
-        peru/packer_qemu_virtualbox_ansible build -only="$PACKER_BUILDER_TYPE" -color=false -var "headless=$HEADLESS" $PACKER_FILE 2>&1 | tee "${LOG_DIR}/${NAME}-${PACKER_BUILDER_TYPE}-packer.log"
+        peru/packer_qemu_virtualbox_ansible build -only="$PACKER_BUILDER_TYPE" -color=false -var "headless=$HEADLESS" $PACKER_FILE 2>&1 | tee "${LOGDIR}/${NAME}-${PACKER_BUILDER_TYPE}-packer.log"
     else
-      $PACKER_BINARY build -only="$PACKER_BUILDER_TYPE" -color=false -var "headless=$HEADLESS" $PACKER_FILE 2>&1 | tee "${LOG_DIR}/${NAME}-${PACKER_BUILDER_TYPE}-packer.log"
+      $PACKER_BINARY build -only="$PACKER_BUILDER_TYPE" -color=false -var "headless=$HEADLESS" $PACKER_FILE 2>&1 | tee "${LOGDIR}/${NAME}-${PACKER_BUILDER_TYPE}-packer.log"
     fi
   else
     echo -e "\n* File ${PACKER_IMAGES_OUTPUT_DIR}/${NAME}-${PACKER_VAGRANT_PROVIDER}.box already exists. Skipping....\n";

vagrant_init_destroy_boxes.sh

@@ -1,8 +1,8 @@
 #!/bin/bash -eu
 
 BOXES_LIST=${*:-`find . -maxdepth 1 \( -name "*ubuntu*.box" -o -name "*centos*.box" -o -name "*windows*.box" \) -printf "%f\n" | sort | tr "\n" " "`}
-TMPDIR=${TMPDIR:-/tmp}
-LOGFILE=${LOGFILE:-$TMPDIR/vagrant_init_destroy_boxes.log}
+TMPDIR=${TMPDIR:-/var/tmp}
+LOGDIR=${LOGDIR:-$TMPDIR}
 
 
 vagrant_box_add() {
@@ -69,21 +69,20 @@ vagrant_destroy() {
 
 main() {
   if [ -n "$BOXES_LIST" ]; then
-    test -f $LOGFILE && rm $LOGFILE
     for VAGRANT_BOX_FILE in $BOXES_LIST; do
       export VAGRANT_BOX_NAME=`basename ${VAGRANT_BOX_FILE%.*}`
       export VAGRANT_BOX_NAME_SHORT=`basename $VAGRANT_BOX_FILE | cut -d - -f 1,2,3`
       export VAGRANT_BOX_PROVIDER=${VAGRANT_BOX_NAME##*-}
       export VAGRANT_CWD="$TMPDIR/$VAGRANT_BOX_NAME_SHORT"
 
-      echo -e "\n\n*** ${VAGRANT_BOX_FILE} [$VAGRANT_BOX_NAME] ($VAGRANT_BOX_PROVIDER) ($TMPDIR/$VAGRANT_BOX_NAME_SHORT)" | tee -a $LOGFILE
+      echo -e "*** ${VAGRANT_BOX_FILE} [$VAGRANT_BOX_NAME] ($VAGRANT_BOX_PROVIDER) ($TMPDIR/$VAGRANT_BOX_NAME_SHORT)" | tee $LOGDIR/$VAGRANT_BOX_NAME
       test -d "$VAGRANT_CWD" && rm -rf "$VAGRANT_CWD"
       mkdir "$VAGRANT_CWD"
 
       vagrant_box_add
       vagrant_init_up
 
-      check_vagrant_vm 2>&1 | tee -a $LOGFILE
+      check_vagrant_vm 2>&1 | tee -a $LOGDIR/$VAGRANT_BOX_NAME
 
       #echo "Press ENTER to destroy the VMs"
       #read A
@@ -94,8 +93,6 @@ main() {
       rm -rf $VAGRANT_CWD/{Vagrantfile,.vagrant}
       rmdir $VAGRANT_CWD
     done
-
-    echo "*** Check the summary in: $LOGFILE"
   fi
 }
 

vagrant_init_destroy_boxes_docker.sh

@@ -1,13 +1,13 @@
 #!/bin/bash -eu
 
 VAGRANT_INIT_DESTROY_BOXES_SCRIPT_PATH=$PWD
-
+LOGDIR=${LOGDIR:-/var/tmp}
 VAGRANT_BOX_FILE=$1
 
 vagrant_box() {
   docker run --rm -t -u $(id -u):$(id -g) --privileged --net=host \
   -e HOME=/home/docker \
-  -e LOGFILE=/home/docker/vagrant/vagrant_init_destroy_boxes.log \
+  -e LOGDIR=$LOGDIR \
   -v /dev/vboxdrv:/dev/vboxdrv \
   -v /var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock \
   -v $VAGRANT_INIT_DESTROY_BOXES_SCRIPT_PATH:/home/docker/vagrant_script \