rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-25 14:31:33 +00:00
Code Issues Releases Wiki Activity

Fix make vmware

Browse Source
This commit is contained in:
niusmallnan 2018-05-12 17:18:30 +08:00
parent aa14311c8c
commit 4611e07d90
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile.dapper
View File

@ -85,7 +85,9 @@ ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2018
ARG SYSTEM_DOCKER_VERSION=17.06-ros4 ARG SYSTEM_DOCKER_VERSION=17.06-ros4
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/niusmallnan/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz ARG SYSTEM_DOCKER_URL_amd64=https://github.com/niusmallnan/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/niusmallnan/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz ARG SYSTEM_DOCKER_URL_arm64=https://github.com/niusmallnan/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-1
###################################################### ######################################################
# Set up environment and export all ARGS as ENV # Set up environment and export all ARGS as ENV
@ -125,7 +127,8 @@ 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}

5
Makefile
View File

@ -64,8 +64,9 @@ rpi64:
cd scripts/images/raspberry-pi-hypriot64/ \ cd scripts/images/raspberry-pi-hypriot64/ \
&& ../../../.dapper && ../../../.dapper
vmware: vmware: .dapper
INTEGRATION_TESTS=0 ./.dapper vmware-release mkdir -p dist
INTEGRATION_TESTS=0 ./.dapper vmware-release 2>&1 | tee dist/release.log
help: help:
@./scripts/help @./scripts/help

4
scripts/tar-images
View File

@ -13,8 +13,8 @@ for i in $IMAGES; do
done done
if [ -e ".make-vmware" ]; then if [ -e ".make-vmware" ]; then
docker pull rancher/os-openvmtools:10.2.5-1 docker pull rancher/os-openvmtools:${OPEN_VMTOOLS_VERSION}
IMAGES="$IMAGES rancher/os-openvmtools:10.2.5-1" IMAGES="$IMAGES rancher/os-openvmtools:${OPEN_VMTOOLS_VERSION}"
fi fi
echo "tar-images: docker save ${IMAGES} > build/images.tar" echo "tar-images: docker save ${IMAGES} > build/images.tar"

12
scripts/vmware-release
View File

@ -5,4 +5,16 @@ cd $(dirname $0)/..
touch .make-vmware touch .make-vmware
source ./scripts/version
./scripts/release ./scripts/release
ISO_NAME="rancheros-vmware.iso"
mkdir -p /tmp/dist && mv ./dist/* /tmp/dist/
mkdir -p ./dist/vmware && mv /tmp/dist/* ./dist/vmware/
mkdir -p ./dist/artifacts && cp ./dist/vmware/artifacts/rancheros.iso ./dist/artifacts/${ISO_NAME}
echo "github-release upload --user rancher --repo os --tag ${VERSION} --file ./dist/artifacts/${ISO_NAME} --name ${ISO_NAME}" > ./dist/publish.sh
echo "gsutil cp dist/artifacts/${ISO_NAME} gs://releases.rancher.com/os/latest/${ISO_NAME}" > ./dist/publish_gss_latest.sh
echo "gsutil cp dist/artifacts/${ISO_NAME} gs://releases.rancher.com/os/${VERSION}/${ISO_NAME}" > ./dist/publish_gss_${VERSION}.sh
chmod 755 ./dist/*.sh