From de73e0551c5bc25280fac8c3c7b7c1d19b958508 Mon Sep 17 00:00:00 2001
From: niusmallnan <niusmallnan@gmail.com>
Date: Thu, 15 Nov 2018 14:13:02 +0800
Subject: [PATCH] Add APPEND_SYSTEM_IMAGES arg for build

---
 Dockerfile.dapper  |  6 ++----
 Makefile           |  3 ++-
 scripts/tar-images | 12 ++++++------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 49c530d9..0e71c29f 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -40,7 +40,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
 
 ########## Dapper Configuration #####################
 
-ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR INTEGRATION_TESTS KERNEL_CHECK VMWARE_APPEND
+ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR INTEGRATION_TESTS KERNEL_CHECK APPEND_SYSTEM_IMAGES VMWARE_APPEND
 ENV DAPPER_DOCKER_SOCKET true
 ENV DAPPER_SOURCE /go/src/github.com/rancher/os
 ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel
@@ -82,7 +82,6 @@ ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases
 ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
 
 ARG VMWARE_AUTOFORMAT=1
-ARG OPEN_VMTOOLS_VERSION=10.2.5-3
 ######################################################
 
 # Set up environment and export all ARGS as ENV
@@ -118,8 +117,7 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
     SYSTEM_DOCKER_URL=SYSTEM_DOCKER_URL_${ARCH} \
     SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \
     SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \
-    VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT} \
-    OPEN_VMTOOLS_VERSION=${OPEN_VMTOOLS_VERSION}
+    VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT}
 ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH
 
 RUN mkdir -p ${DOWNLOADS}
diff --git a/Makefile b/Makefile
index 977a0b4e..46fdbe0e 100755
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,9 @@ rpi64:
 vmware: .dapper
 	mkdir -p dist
 	INTEGRATION_TESTS=0 \
+	APPEND_SYSTEM_IMAGES="rancher/os-openvmtools:10.2.5-3" \
 	VMWARE_APPEND="console=tty1 console=ttyS0,115200n8 printk.devkmsg=on rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 panic=10" \
-	    ./.dapper vmware-release 2>&1 | tee dist/release.log
+	./.dapper vmware-release 2>&1 | tee dist/release.log
 
 help:
 	@./scripts/help
diff --git a/scripts/tar-images b/scripts/tar-images
index de991432..462a67fa 100755
--- a/scripts/tar-images
+++ b/scripts/tar-images
@@ -11,9 +11,14 @@ cd $(dirname $0)/..
 IMAGES=$(bin/host_ros c images -i build/initrd/usr/share/ros/os-config.yml)
 INIT_IMAGES=""
 SYSTEM_IMAGES=""
+
+for i in ${APPEND_SYSTEM_IMAGES};do
+    IMAGES="${IMAGES} ${i}"
+done
+
 for i in ${IMAGES}; do
     echo "tar-image: pull($i)"
-    if [ "${FORCE_PULL}" = "1" ] || ! docker inspect $i >/dev/null 2>&1; then
+    if ! docker inspect $i >/dev/null 2>&1; then
         docker pull ${i}
     fi
 
@@ -26,11 +31,6 @@ for i in ${IMAGES}; do
     fi
 done
 
-if [ -e ".make-vmware" ]; then
-    docker pull rancher/os-openvmtools:${OPEN_VMTOOLS_VERSION}
-    SYSTEM_IMAGES="$SYSTEM_IMAGES rancher/os-openvmtools:${OPEN_VMTOOLS_VERSION}"
-fi
-
 echo "tar-image: SYSTEM_IMAGES=$SYSTEM_IMAGES"
 echo "tar-image: INIT_IMAGES=$INIT_IMAGES"