rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-19 15:26:49 +00:00
Code Issues Releases Wiki Activity

Add APPEND_SYSTEM_IMAGES arg for build

Browse Source
This commit is contained in:
niusmallnan 2018-11-15 14:13:02 +08:00
parent f6ee3042c9
commit de73e0551c
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.dapper
View File

@ -40,7 +40,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
########## Dapper Configuration ##################### ########## 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_DOCKER_SOCKET true
ENV DAPPER_SOURCE /go/src/github.com/rancher/os ENV DAPPER_SOURCE /go/src/github.com/rancher/os
ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel 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 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 VMWARE_AUTOFORMAT=1
ARG OPEN_VMTOOLS_VERSION=10.2.5-3
###################################################### ######################################################
# Set up environment and export all ARGS as ENV # 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=SYSTEM_DOCKER_URL_${ARCH} \
SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \ SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \
SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \ SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \
VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT} \ VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT}
OPEN_VMTOOLS_VERSION=${OPEN_VMTOOLS_VERSION}
ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH
RUN mkdir -p ${DOWNLOADS} RUN mkdir -p ${DOWNLOADS}

3
Makefile
View File

@ -67,8 +67,9 @@ rpi64:
vmware: .dapper vmware: .dapper
mkdir -p dist mkdir -p dist
INTEGRATION_TESTS=0 \ 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" \ 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: help:
@./scripts/help @./scripts/help

12
scripts/tar-images
View File

@ -11,9 +11,14 @@ cd $(dirname $0)/..
IMAGES=$(bin/host_ros c images -i build/initrd/usr/share/ros/os-config.yml) IMAGES=$(bin/host_ros c images -i build/initrd/usr/share/ros/os-config.yml)
INIT_IMAGES="" INIT_IMAGES=""
SYSTEM_IMAGES="" SYSTEM_IMAGES=""
for i in ${APPEND_SYSTEM_IMAGES};do
IMAGES="${IMAGES} ${i}"
done
for i in ${IMAGES}; do for i in ${IMAGES}; do
echo "tar-image: pull($i)" 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} docker pull ${i}
fi fi
@ -26,11 +31,6 @@ for i in ${IMAGES}; do
fi fi
done 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: SYSTEM_IMAGES=$SYSTEM_IMAGES"
echo "tar-image: INIT_IMAGES=$INIT_IMAGES" echo "tar-image: INIT_IMAGES=$INIT_IMAGES"