diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 01bc2aa1..2f7d17ca 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 KERNEL_CHECK APPEND_SYSTEM_IMAGES +ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR KERNEL_CHECK APPEND_SYSTEM_IMAGES APPEND_USER_IMAGES ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_SOURCE /go/src/github.com/rancher/os ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel diff --git a/scripts/tar-images b/scripts/tar-images index 462a67fa..e2942b16 100755 --- a/scripts/tar-images +++ b/scripts/tar-images @@ -5,12 +5,14 @@ INIT_DEP="rancher/os-bootstrap" SHARED_DEP="rancher/os-base" INIT_IMAGES_DST="build/images-init.tar" SYSTEM_IMAGES_DST="build/images-system.tar" +USER_IMAGES_DST="build/images-user.tar" cd $(dirname $0)/.. IMAGES=$(bin/host_ros c images -i build/initrd/usr/share/ros/os-config.yml) INIT_IMAGES="" SYSTEM_IMAGES="" +USER_IMAGES="" for i in ${APPEND_SYSTEM_IMAGES};do IMAGES="${IMAGES} ${i}" @@ -31,8 +33,13 @@ for i in ${IMAGES}; do fi done +for i in ${APPEND_USER_IMAGES}; do + USER_IMAGES="${USER_IMAGES} ${i}" +done + echo "tar-image: SYSTEM_IMAGES=$SYSTEM_IMAGES" echo "tar-image: INIT_IMAGES=$INIT_IMAGES" +echo "tar-image: USER_IMAGES=$USER_IMAGES" if [ "$COMPRESS" == "" ]; then ARCHIVE_CMD="gzip" @@ -45,4 +52,7 @@ fi docker save ${INIT_IMAGES} | ${ARCHIVE_CMD} > ${INIT_IMAGES_DST} docker save ${SYSTEM_IMAGES} | ${ARCHIVE_CMD} > ${SYSTEM_IMAGES_DST} +if [ ! -z "$USER_IMAGES" ]; then + docker save ${USER_IMAGES} | ${ARCHIVE_CMD} > ${USER_IMAGES_DST} +fi echo "tar-images: DONE"