selectively specify workdir for docker interactions

Author: Jeff Frontz

bin/gbuild

@@ -105,7 +105,7 @@ EOF" if build_desc["sudo"] and @options[:allow_sudo]
   case build_desc["distro"]
   when "centos"
     info "Updating yum repository (log in var/install.log)"
-    system! "on-target -u root yum -y makecache fast >> var/install.log 2>&1"
+    system! "on-target -u root -w /root yum -y makecache fast >> var/install.log 2>&1"
   else
     info "Updating apt-get repository (log in var/install.log)"
     system! "on-target -u root apt-get update >> var/install.log 2>&1"
@@ -115,7 +115,7 @@ EOF" if build_desc["sudo"] and @options[:allow_sudo]
 
   case build_desc["distro"]
   when "centos"
-    system! "on-target -u root yum -y install #{build_desc["packages"].join(" ")} > var/install.log 2>&1"
+    system! "on-target -u root -w /root yum -y install #{build_desc["packages"].join(" ")} > var/install.log 2>&1"
   else
     system! "on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install #{build_desc["packages"].join(" ")} >> var/install.log 2>&1"
   end
@@ -131,10 +131,10 @@ EOF" if build_desc["sudo"] and @options[:allow_sudo]
       info "Upgrading system, may take a while (log in var/install.log)"
       case build_desc["distro"]
       when "centos"
-        system! "on-target -u root mkdir -p /var/cache/gitian"
-        system! "on-target -u root yum -y update > var/upgrade.log 2>&1"
+        system! "on-target -u root -w /root mkdir -p /var/cache/gitian"
+        system! "on-target -u root -w /root yum -y update > var/upgrade.log 2>&1"
         system! "copy-to-target #{@quiet_flag} var/upgrade.log /var/cache/gitian/upgrade.log"
-        system! "on-target -u root touch /var/cache/gitian/initial-upgrade"
+        system! "on-target -u root -w /root touch /var/cache/gitian/initial-upgrade"
       else
         system! "on-target -u root bash < target-bin/upgrade-system.sh >> var/install.log 2>&1"
       end
@@ -143,7 +143,7 @@ EOF" if build_desc["sudo"] and @options[:allow_sudo]
 
   case build_desc["distro"]
   when "centos"
-    system! "on-target -u root yumdb get checksum_data | awk '/checksum_data =/ { print $3,  package; next } { package=$1 }' | sort --key 2 > var/base-#{suitearch}.manifest"
+    system! "on-target -u root -w /root yumdb get checksum_data | awk '/checksum_data =/ { print $3,  package; next } { package=$1 }' | sort --key 2 > var/base-#{suitearch}.manifest"
   else
     system! "on-target -u root bash < target-bin/grab-packages.sh > var/base-#{suitearch}.manifest"
   end

libexec/copy-to-target

@@ -49,7 +49,13 @@ fi
 if [ -n "$USE_DOCKER" ]; then
     docker exec -u $TUSER gitian-target mkdir -p "/home/$TUSER/$2"
     docker cp "$1" gitian-target:"/home/$TUSER/$2"
-    docker exec -u root gitian-target chown -R $TUSER:$TUSER "/home/$TUSER/$2"
+	# newer docker version is strict about non-default-user working directories
+    if docker exec -u root -w /root gitian-target true > /dev/null 2>&1
+	then
+		docker exec -u root -w /root gitian-target chown -R $TUSER:$TUSER "/home/$TUSER/$2"
+	else
+		docker exec -u root gitian-target chown -R $TUSER:$TUSER "/home/$TUSER/$2"
+	fi
 elif [ -z "$USE_LXC" ]; then
     src="${1%/}"  # remove trailing / which triggers special rsync behaviour
     rsync --checksum -a $QUIET_FLAG -e "ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_rsa -p $VM_SSH_PORT" "${src}" "$TUSER@localhost:$2"

libexec/on-target

@@ -30,6 +30,14 @@ if [ $# != 0 ] ; then
         ENV="$2"
         shift 2
         ;;
+      --workdir|-w)
+		# newer docker version is strict about non-default-user working dir
+		if docker exec -u root -w /root gitian-target true > /dev/null 2>&1
+		then
+			TWORKDIR="-w $2"
+		fi
+        shift 2
+        ;;
       --*)
         echo "unrecognized option $1"
         exit 1
@@ -47,7 +55,7 @@ fi
 #fi
 
 if [ -n "$USE_DOCKER" ]; then
-    docker exec -u $TUSER -i gitian-target $*
+    docker exec -u $TUSER $TWORKDIR -i gitian-target $*
 elif [ -z "$USE_LXC" ]; then
     ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_rsa -p $VM_SSH_PORT $TUSER@localhost $*
 else