From fd486228a7b62dfbf0357f4b0350ec7e90742450 Mon Sep 17 00:00:00 2001
From: niusmallnan <niusmallnan@gmail.com>
Date: Thu, 18 Jan 2018 23:10:33 +0800
Subject: [PATCH] Update build scripts

---
 Dockerfile.dapper    | 60 +++++++++++---------------------------------
 scripts/build-images |  1 -
 2 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 9b28b5f..4bac0ec 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -14,63 +14,33 @@ CMD ["ci"]
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 
-######################
-ENV DAPPER_ENV ARCH VERSION DEV_BUILD GITHUB_TOKEN KERNEL_TAG
+ARG DAPPER_HOST_ARCH=amd64
+ENV HOST_ARCH=${DAPPER_HOST_ARCH}
+
 ENV DAPPER_DOCKER_SOCKET true
 ENV DAPPER_SOURCE /source
 ENV DAPPER_OUTPUT ./dist
 #ENV DAPPER_RUN_ARGS --privileged
-
-######################
-ARG KERNEL_TAG=${KERNEL_TAG}
-ARG DAPPER_HOST_ARCH=amd64
-ARG HOST_ARCH=${DAPPER_HOST_ARCH}
-ARG ARCH=${HOST_ARCH}
-
 ENV SHELL /bin/bash
 ENV HOME ${DAPPER_SOURCE}
 WORKDIR ${DAPPER_SOURCE}
 
-########## General Configuration #####################
-
 ARG OS_REPO=rancher
-ARG DOCKER_VERSION=1.10.3
-ARG DOCKER_PATCH_VERSION=v${DOCKER_VERSION}-ros1
+ARG KERNEL_TAG
+ARG KERNEL_VERSION=${KERNEL_TAG}-${OS_REPO}
+ARG ARCH=x86
 
-ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}
-ARG DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm
-ARG DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm64
-
-######################################################
-
-# Export all ARGS as ENV
-ENV DOCKER_URL=DOCKER_URL_${ARCH} \
+ENV OS_REPO=${OS_REPO} \
     ARCH=${ARCH} \
-    DISTRIB_ID=${DISTRIB_ID} \
-    DOCKER_PATCH_VERSION=${DOCKER_PATCH_VERSION} \
-    DOCKER_URL=${DOCKER_URL} \
-    DOCKER_URL_amd64=${DOCKER_URL_amd64} \
-    DOCKER_URL_arm64=${DOCKER_URL_arm64} \
-    DOCKER_URL_arm=${DOCKER_URL_arm} \
-    DOCKER_VERSION=${DOCKER_VERSION} \
-    HOST_ARCH=${HOST_ARCH} \
-    OS_REPO=${OS_REPO} \
-    KERNEL_TAG=${KERNEL_TAG}
-
-#RUN rm /bin/sh && \
-#    ln -s /bin/bash /bin/sh
+    DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
+    KERNEL_TAG=${KERNEL_TAG} \
+    KERNEL_VERSION=${KERNEL_VERSION} \
+    KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/ \
+    KERNEL_TAR=linux-${KERNEL_TAG}.tar.xz \
+    KERNEL_SIGN=linux-${KERNEL_TAG}.tar.sign
+# for rc testing
+#ENV KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-${KERNEL_TAG}.tar.xz
 
 # Install Docker
 RUN curl -fL ${DOCKER_URL_amd64} > /usr/bin/docker && \
     chmod +x /usr/bin/docker
-
-########## Kernel version Configuration #############################
-#ENV KERNEL_TAG=4.9.9
-ENV KERNEL_VERSION=${KERNEL_TAG}-rancher
-#ENV KERNEL_SHA1=fa46da077c077467776cdc45a7b50d327a081ab4
-ENV KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/
-ENV KERNEL_TAR=linux-${KERNEL_TAG}.tar.xz
-ENV KERNEL_SIGN=linux-${KERNEL_TAG}.tar.sign
-# for rc testing
-#ENV KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-${KERNEL_TAG}.tar.xz
-
diff --git a/scripts/build-images b/scripts/build-images
index 93d2665..ecf1272 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e
 
-export ARCH=${ARCH:-"amd64"}
 BASE=images
 
 source $(dirname $0)/version