updated containers, self published and MP to 7.18.6

Amazon/artifactory7/latest/templates/jfrog-artifactory-ec2-instance.template.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: "2010-09-09"
-Description: "Deploys the EC2 Autoscaling, LaunchConfig and Instance for Artifactory (qs-1qpmmjh5o)"
+Description: "Artifactory: Deploys the EC2 Autoscaling, LaunchConfig and instances (qs-1qpmmjh5o)"
 Parameters:
   PrivateSubnetIds:
     Type: List<AWS::EC2::Subnet::Id>
@@ -87,28 +87,40 @@ Parameters:
     Type: String
     Default: '/artifactory-user-data'
 
-# To populate additional mappings use the following with the desired --region
-# aws --region us-west-2 ec2 describe-images --owners amazon --filters 'Name=name,Values=amzn-ami-hvm-2018.03.0.20181129-x86_64-gp2' 'Name=state,Values=available' --output json | jq -r '.Images | sort_by(.CreationDate) | last(.[]).ImageId'
+# To populate additional mappings use following link
+# https://raw.githubusercontent.com/aws-quickstart/quickstart-linux-bastion/master/templates/linux-bastion.template
 Mappings:
   AWSAMIRegionMap:
     ap-northeast-1:
-      CentOS7HVM: "ami-00a5245b4816c38e6"
+      CentOS7HVM: "ami-06a46da680048c8ae"
     ap-northeast-2:
-      CentOS7HVM: "ami-00dc207f8ba6dc919"
+      CentOS7HVM: "ami-06e83aceba2cb0907"
     ap-south-1:
-      CentOS7HVM: "ami-0ad42f4f66f6c1cc9"
+      CentOS7HVM: "ami-026f33d38b6410e30"
     ap-southeast-1:
-      CentOS7HVM: "ami-05b3bcf7f311194b3"
+      CentOS7HVM: "ami-07f65177cb990d65b"
     ap-southeast-2:
-      CentOS7HVM: "ami-02fd0b06f06d93dfc"
+      CentOS7HVM: "ami-0b2045146eb00b617"
     ca-central-1:
-      CentOS7HVM: "ami-07423fb63ea0a0930"
+      CentOS7HVM: "ami-04a25c39dc7a8aebb"
     eu-central-1:
-      CentOS7HVM: "ami-0cfbf4f6db41068ac"
+      CentOS7HVM: "ami-0e8286b71b81c3cc1"
+    me-south-1:
+      CentOS7HVM: "ami-011c71a894b10f35b"
+    ap-east-1:
+      CentOS7HVM: "ami-0e5c29e6c87a9644f"
+    eu-north-1:
+      CentOS7HVM: "ami-05788af9005ef9a93"
+    eu-south-1:
+      CentOS7HVM: "ami-0a84267606bcea16b"
     eu-west-1:
-      CentOS7HVM: "ami-08935252a36e25f85"
+      CentOS7HVM: "ami-0b850cf02cc00fdc8"
+    eu-west-2:
+      CentOS7HVM: "ami-09e5afc68eed60ef4"
+    eu-west-3:
+      CentOS7HVM: "ami-0cb72d2e599cffbf9"
     sa-east-1:
-      CentOS7HVM: "ami-05145e0b28ad8e0b2"
+      CentOS7HVM: "ami-0b30f38d939dd4b54"
     us-east-1:
       CentOS7HVM: "ami-0affd4508a5d2481b"
     us-east-2:
@@ -117,6 +129,15 @@ Mappings:
       CentOS7HVM: "ami-098f55b4287a885ba"
     us-west-2:
       CentOS7HVM: "ami-0bc06212a56393ee1"
+    cn-north-1:
+      CentOS7HVM: "ami-0e02aaefeb74c3373"
+    cn-northwest-1:
+      CentOS7HVM: "ami-07183a7702633260b"
+    us-gov-east-1:
+      CentOS7HVM: "ami-00e30c71"
+    us-gov-west-1:
+      CentOS7HVM: "ami-bbba86da"
+
   ArtifactoryProductMap:
     JFrog-Container-Registry:
       "7153": "Jcr7153"