diff --git a/Dockerfile.dapper b/Dockerfile.dapper index e9b1f01c..fa5ccf99 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -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_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 VMWARE_AUTOFORMAT=1 +ARG OPEN_VMTOOLS_VERSION=10.2.5-1 ###################################################### # 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_amd64=${SYSTEM_DOCKER_URL_amd64} \ 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 RUN mkdir -p ${DOWNLOADS} diff --git a/Makefile b/Makefile index ca5628b9..7d91bf54 100755 --- a/Makefile +++ b/Makefile @@ -64,8 +64,9 @@ rpi64: cd scripts/images/raspberry-pi-hypriot64/ \ && ../../../.dapper -vmware: - INTEGRATION_TESTS=0 ./.dapper vmware-release +vmware: .dapper + mkdir -p dist + INTEGRATION_TESTS=0 ./.dapper vmware-release 2>&1 | tee dist/release.log help: @./scripts/help diff --git a/scripts/tar-images b/scripts/tar-images index d678064a..dd98b8c5 100755 --- a/scripts/tar-images +++ b/scripts/tar-images @@ -13,8 +13,8 @@ for i in $IMAGES; do done if [ -e ".make-vmware" ]; then - docker pull rancher/os-openvmtools:10.2.5-1 - IMAGES="$IMAGES rancher/os-openvmtools:10.2.5-1" + docker pull rancher/os-openvmtools:${OPEN_VMTOOLS_VERSION} + IMAGES="$IMAGES rancher/os-openvmtools:${OPEN_VMTOOLS_VERSION}" fi echo "tar-images: docker save ${IMAGES} > build/images.tar" diff --git a/scripts/vmware-release b/scripts/vmware-release index bafd9cf8..99999917 100755 --- a/scripts/vmware-release +++ b/scripts/vmware-release @@ -5,4 +5,16 @@ cd $(dirname $0)/.. touch .make-vmware +source ./scripts/version ./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