github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-31 14:41:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #417 from nathanleclaire/editions_downstream_additions

Browse Source 
Add modifications to help with downstream build
This commit is contained in:
Justin Cormack 2016-08-18 10:40:52 +01:00 committed by GitHub
commit a832a83bde
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
alpine/cloud/aws/common.sh
View File

@ -2,9 +2,8 @@
set -e set -e
# When changing this value, ensure to change TAG_KEY_PREV to its old value. TAG_KEY=${TAG_KEY:-editionsdev}
TAG_KEY="aws-1.12.0-beta-4" TAG_KEY_PREV=${TAG_KEY_PREV:-editionsdev}
TAG_KEY_PREV="aws-1.12.0-rc3-beta-3-dev"
INSTANCE_ENDPOINT="http://169.254.169.254/latest" INSTANCE_ENDPOINT="http://169.254.169.254/latest"
INSTANCE_METADATA_API_ENDPOINT="${INSTANCE_ENDPOINT}/meta-data/" INSTANCE_METADATA_API_ENDPOINT="${INSTANCE_ENDPOINT}/meta-data/"

4
alpine/cloud/azure/bake-azure.sh
View File

@ -70,6 +70,7 @@ case "$1" in
AZURE_STG_ACCOUNT_NAME=${AZURE_STG_ACCOUNT_NAME:-"dockereditions"} AZURE_STG_ACCOUNT_NAME=${AZURE_STG_ACCOUNT_NAME:-"dockereditions"}
CONTAINER_NAME=${CONTAINER_NAME:-"mobylinux"} CONTAINER_NAME=${CONTAINER_NAME:-"mobylinux"}
BLOBNAME=${BLOBNAME:-$(md5sum "${MOBY_SRC_ROOT}/mobylinux.vhd" | awk '{ print $1; }')-mobylinux.vhd} BLOBNAME=${BLOBNAME:-$(md5sum "${MOBY_SRC_ROOT}/mobylinux.vhd" | awk '{ print $1; }')-mobylinux.vhd}
BLOB_URL="https://${AZURE_STG_ACCOUNT_NAME}.blob.core.windows.net/${CONTAINER_NAME}/${BLOBNAME}"
azure-vhd-utils-for-go upload \ azure-vhd-utils-for-go upload \
--localvhdpath "${MOBY_SRC_ROOT}/mobylinux.vhd" \ --localvhdpath "${MOBY_SRC_ROOT}/mobylinux.vhd" \
@ -80,7 +81,8 @@ case "$1" in
--overwrite --overwrite
arrowecho "VHD uploaded." arrowecho "VHD uploaded."
arrowecho "https://${AZURE_STG_ACCOUNT_NAME}.blob.core.windows.net/${CONTAINER_NAME}/${BLOBNAME}" arrowecho "${BLOB_URL}"
echo "${BLOB_URL}" >vhd_blob_url.out
;; ;;
*) *)