[Don't merge] Have options in release scripts to make AMI's public (docker-archive#462)

Have options in release scripts to make AMI's public

Author: kencochrane

README.md

@@ -43,7 +43,7 @@ To run the automated release process:
     - make sure the file is made public.
 7. Run the release script: (change variables to match the release)
     - `cd aws/release/`
-    - example: `./run_release.sh -d 1.12.1-rc1 -e beta5 -a ami-61f6b501 -r us-west-1 -c beta`
+    - example: `./run_release.sh -d 1.12.1-rc1 -e beta5 -a ami-61f6b501 -r us-west-1 -c beta -p no`
 8. Get the URL output from release script, give to person creating release notes and sending emails.
 9. Test out CloudFormation template before sending out emails.
 10. Update beta docs site

aws/release/Makefile

@@ -1,2 +1,2 @@
 default:
-	./run_release.sh -d $(EDITIONS_DOCKER_VERSION) -e $(EDITIONS_TAG) -a $(AMI) -r $(REGION) -c $(CHANNEL) -u $(CHANNEL_CLOUD)
+	./run_release.sh -d $(EDITIONS_DOCKER_VERSION) -e $(EDITIONS_TAG) -a $(AMI) -r $(REGION) -c $(CHANNEL) -u $(CHANNEL_CLOUD) -p $(MAKE_AMI_PUBLIC)

aws/release/README.md

@@ -20,13 +20,14 @@ This script will take some parameters and then it will do the following.
 1. Checkout the master branch from `https://github.com/docker/editions` and make sure local copy is up to date.
 2. Calling `aws/release/run_release.sh` script, passing in correct variables. For example:
 
-    $ aws/release/run_release.sh -d docker_version -e edition_version -a ami_id -r ami_src_region
+    $ aws/release/run_release.sh -d docker_version -e edition_version -a ami_id -r ami_src_region -p no
 
-    $ aws/release/run_release.sh -d "1.12.0" -e "beta4" -a "ami-148c4e74" -r "us-west-2"
+    $ aws/release/run_release.sh -d "1.12.0" -e "beta4" -a "ami-148c4e74" -r "us-west-2" -p no
 
     optional fields:
     -c channel (defaults to beta) [beta, nightly, alpha, etc]
     -l AWS account list url, url for the list of Answers4AWS accounts we want to give access to the AMI.
+    -p make the ami public? (yes, no)
 
 3. Look at the logs and find the CloudFormation s3 url, and give that to who needs it.
 4. Tag the code and push tags to github, and create release from tag.

aws/release/files/aws_release.py

@@ -3,13 +3,14 @@
 import argparse
 
 from utils import (
-    get_ami, wait_for_ami_to_be_available, copy_amis, strip_and_padd, get_account_list,
+    copy_amis, get_account_list, set_ami_public,
     approve_accounts, ACCOUNT_LIST_FILE_URL, create_cfn_template)
 
 
 CFN_TEMPLATE = '/home/docker/docker_for_aws.template'
 CFN_CLOUD_TEMPLATE = '/home/docker/docker_for_aws_cloud.template'
 
+
 def main():
     parser = argparse.ArgumentParser(description='Release Docker for AWS')
     parser.add_argument('-d', '--docker_version',
@@ -33,6 +34,9 @@ def main():
     parser.add_argument('-l', '--account_list_url',
                         dest='account_list_url', default=ACCOUNT_LIST_FILE_URL,
                         help="The URL for the aws account list for ami approvals")
+    parser.add_argument('-p', '--public',
+                        dest='make_ami_public', default="no",
+                        help="Make the AMI public")
 
     args = parser.parse_args()
 
@@ -53,36 +57,55 @@ def main():
     print(u"ami_id={}".format(args.ami_id))
     print(u"ami_src_region={}".format(args.ami_src_region))
     print(u"account_list_url={}".format(args.account_list_url))
+    print(u"make_ami_public={}".format(args.make_ami_public))
     if not args.account_list_url:
         print("account_list_url parameter is None, defaulting")
         account_list_url = ACCOUNT_LIST_FILE_URL
     else:
         account_list_url = args.account_list_url
     print(u"account_list_url={}".format(account_list_url))
 
+    if not args.make_ami_public:
+        make_ami_public = False
+    else:
+        make_ami_public = args.make_ami_public
+        if make_ami_public.lower() == 'yes':
+            make_ami_public = True
+        else:
+            make_ami_public = False
+    print(u"make_ami_public={}".format(make_ami_public))
+
     print("Copy AMI to each region..")
     ami_list = copy_amis(args.ami_id, args.ami_src_region,
                          image_name, image_description, release_channel)
     ami_list_json = json.dumps(ami_list, indent=4, sort_keys=True)
     print(u"AMI copy complete. AMI List: \n{}".format(ami_list_json))
-    print("Get account list..")
-    account_list = get_account_list(account_list_url)
-    print(u"Approving AMIs for {} accounts..".format(len(account_list)))
-    approve_accounts(ami_list, account_list)
+
+    if make_ami_public:
+        print("Make AMI's public.")
+        # we want to make this public.
+        set_ami_public(ami_list)
+        print("Finished making AMI's public.")
+    else:
+        print("Get account list..")
+        account_list = get_account_list(account_list_url)
+        print(u"Approving AMIs for {} accounts..".format(len(account_list)))
+        approve_accounts(ami_list, account_list)
     print("Accounts have been approved.")
 
     print("Create CloudFormation template..")
     s3_url = create_cfn_template(ami_list, release_channel, docker_version,
                                  docker_for_aws_version, edition_version, CFN_TEMPLATE,
                                  docker_for_aws_version)
     s3_cloud_url = create_cfn_template(ami_list, release_cloud_channel, docker_version,
-                                 docker_for_aws_version, edition_version, CFN_CLOUD_TEMPLATE,
-                                 docker_for_aws_version)
+                                       docker_for_aws_version, edition_version, CFN_CLOUD_TEMPLATE,
+                                       docker_for_aws_version)
 
     # TODO: git commit, tag release. requires github keys, etc.
 
     print("------------------")
-    print(u"Finshed.. CloudFormation \n\t URL={0} \n\t CLOUD_URL={1} \n".format(s3_url, s3_cloud_url))
+    print(u"Finshed.. CloudFormation \n\t URL={0} \n\t CLOUD_URL={1} \n".format(
+        s3_url, s3_cloud_url))
     print("Don't forget to tag the code (git tag -a v{0}-{1} -m {0}; git push --tags)".format(
         docker_version, flat_edition_version))
     print("------------------")

aws/release/files/release.sh

@@ -7,10 +7,13 @@
 # EDITION_VERSION
 # AMI_ID
 # AMI_SRC_REGION
+# MAKE_AMI_PUBLIC
 
 # don't buffer the output
 export PYTHONUNBUFFERED=1
 
 python /home/docker/aws_release.py --docker_version="$DOCKER_VERSION" \
     --edition_version="$EDITION_VERSION" --ami_id="$AMI_ID" \
-    --ami_src_region="$AMI_SRC_REGION" --channel="$CHANNEL" --channel_cloud="$CHANNEL_CLOUD" --account_list_url="$AWS_ACCOUNT_LIST_URL"
+    --ami_src_region="$AMI_SRC_REGION" --channel="$CHANNEL" \
+    --channel_cloud="$CHANNEL_CLOUD" --account_list_url="$AWS_ACCOUNT_LIST_URL" \
+    --public="$MAKE_AMI_PUBLIC"

aws/release/files/utils.py

@@ -147,6 +147,25 @@ def approve_accounts(ami_list, account_list):
     return ami_list
 
 
+def set_ami_public(ami_list):
+    """ set the AMI's to public """
+    for ami in ami_list:
+        print(u"Set AMI public: {}".format(ami))
+        region = ami
+        ami_id = ami_list.get(region).get('HVM64')
+        print(u"Set public AMI: {} ; Region: {} ".format(ami_id, region))
+        con = ec2.connect_to_region(region, aws_access_key_id=AWS_ACCESS_KEY_ID,
+                                    aws_secret_access_key=AWS_SECRET_ACCESS_KEY)
+
+        print("Wait until the AMI is available before we continue.")
+        wait_for_ami_to_be_available(con, ami_id)
+
+        con.modify_image_attribute(ami_id,
+                                   operation='add',
+                                   attribute='launchPermission',
+                                   groups='all')
+
+
 def upload_cfn_template(release_channel, cloudformation_template_name, tempfile, cfn_type=''):
 
     # upload to s3, make public, return s3 URL

aws/release/full_aws_release.sh

@@ -12,6 +12,7 @@ DOCKER_VERSION=
 EDITION_VERSION=
 CHANNEL=
 DOCKER_AWS_ACCOUNT_URL=
+MAKE_AMI_PUBLIC="no"
 
 usage()
 {
@@ -32,10 +33,11 @@ OPTIONS:
    -b      Docker Bin URL (location where tar.gz file can be downloaded)
    -c      Release Channel (beta, nightly, etc)
    -l      AWS account list URL
+   -p      Make AMI public (yes, no)
 EOF
 }
 
-while getopts "hc:l:d:e:b:" OPTION
+while getopts "hc:l:d:e:b:p:" OPTION
 do
      case $OPTION in
          h)
@@ -57,6 +59,9 @@ do
          l)
              DOCKER_AWS_ACCOUNT_URL=$OPTARG
              ;;
+         p)
+             MAKE_AMI_PUBLIC=$OPTARG
+             ;;
          ?)
              usage
              exit
@@ -99,6 +104,7 @@ echo "AMI_SRC_REGION=$AMI_SRC_REGION"
 echo "CHANNEL=$CHANNEL"
 echo "DOCKER_AWS_ACCOUNT_URL=$DOCKER_AWS_ACCOUNT_URL"
 echo "Docker Hub Login ID=$HUB_LOGIN_ID"
+echo "MAKE_AMI_PUBLIC=$MAKE_AMI_PUBLIC"
 echo "-------"
 echo "== Checking Hub login =="
 
@@ -193,6 +199,6 @@ echo "== Build Docker images =="
 cd $BASE_DIR
 
 # run release, this will create CFN templates and push them to s3, push AMI to different regions and share with list of approved accounts.
-./run_release.sh -d $DOCKER_VERSION -e $EDITION_VERSION -a $AMI_ID -r $AMI_SRC_REGION -c $CHANNEL -l $DOCKER_AWS_ACCOUNT_URL -u cloud-$CHANNEL
+./run_release.sh -d $DOCKER_VERSION -e $EDITION_VERSION -a $AMI_ID -r $AMI_SRC_REGION -c $CHANNEL -l $DOCKER_AWS_ACCOUNT_URL -u cloud-$CHANNEL -p $MAKE_AMI_PUBLIC
 
 echo "===== Done ====="

aws/release/nightly.sh

@@ -94,7 +94,7 @@ cd $CURRPATH
 cd $BUILD_HOME/code/editions/aws/release
 
 # run release
-./run_release.sh -d $DOCKER_VERSION -e $EDITION_VERSION -a $AMI_ID -r $AMI_SOURCE_REGION -c nightly -l $DOCKER_AWS_ACCOUNT_URL -u cloud-nightly
+./run_release.sh -d $DOCKER_VERSION -e $EDITION_VERSION -a $AMI_ID -r $AMI_SOURCE_REGION -c nightly -l $DOCKER_AWS_ACCOUNT_URL -u cloud-nightly -p no
 
 # run cleanup, remove things that are more than X days old.
 python cleanup.py

aws/release/run_release.sh

@@ -13,6 +13,7 @@ AMI_SRC_REGION=
 CHANNEL=
 CHANNEL_CLOUD=
 AWS_ACCOUNT_LIST_URL=
+MAKE_AMI_PUBLIC="no"
 
 usage()
 {
@@ -35,10 +36,11 @@ OPTIONS:
    -c      Release Channel (beta, nightly, etc)
    -u      Cloud Release Channel (beta, nightly, etc)
    -l      AWS account list URL
+   -p      Make AMI public (yes, no)
 EOF
 }
 
-while getopts "hc:u:l:d:e:a:r:" OPTION
+while getopts "hc:u:l:d:e:a:r:p:" OPTION
 do
      case $OPTION in
          h)
@@ -66,6 +68,9 @@ do
          l)
              AWS_ACCOUNT_LIST_URL=$OPTARG
              ;;
+         p)
+             MAKE_AMI_PUBLIC=$OPTARG
+             ;;
          ?)
              usage
              exit
@@ -102,6 +107,7 @@ echo "AMI_SRC_REGION=$AMI_SRC_REGION"
 echo "CHANNEL=$CHANNEL"
 echo "CHANNEL_CLOUD=$CHANNEL_CLOUD"
 echo "AWS_ACCOUNT_LIST_URL=$AWS_ACCOUNT_LIST_URL"
+echo "MAKE_AMI_PUBLIC=$MAKE_AMI_PUBLIC"
 echo "-------"
 echo "== Prepare files =="
 
@@ -134,6 +140,7 @@ docker run -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \
 -e CHANNEL="$CHANNEL" \
 -e CHANNEL_CLOUD="$CHANNEL_CLOUD" \
 -e AWS_ACCOUNT_LIST_URL="$AWS_ACCOUNT_LIST_URL" \
+-e MAKE_AMI_PUBLIC="$MAKE_AMI_PUBLIC" \
 docker4x/release-$BUILD_NUMBER
 
 # posthook