Merge pull request #179 from xiao201208/fix/wordpress

fix wordpress
aliyun · Jan 22, 2024 · 40b7112 · 40b7112
2 parents 9ce86a9 + a927d63
commit 40b7112
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/documents/solution/high-availability-architecture/classic-architecture-on-the-cloud.yml b/documents/solution/high-availability-architecture/classic-architecture-on-the-cloud.yml
@@ -3,15 +3,32 @@ Description:
   en: Classic architecture on the cloud.
   zh-cn: 云上经典架构。
 Parameters:
-  EcsInstanceType:
+  EcsInstanceType1:
     Type: String
     Label:
-      en: Instance Type
-      zh-cn: 实例类型
+      en: Instance Type for Availability Zone1
+      zh-cn: 可用区1对应实例类型
     AssociationProperty: 'ALIYUN::ECS::Instance::InstanceType'
     AssociationPropertyMetadata:
       InstanceChargeType: PostPaid
       SpotStrategy: SpotAsPriceGo
+      ZoneId: ${Zone1}
+    Description:
+      en: >-
+        If no available specifications are displayed, please select Modify
+        Availability Zone and try again.
+      zh-cn: 如果没有可用规格显示，请选择修改可用区后重试。
+    Default: ecs.s6-c1m1.small
+  EcsInstanceType2:
+    Type: String
+    Label:
+      en: Instance Type for Availability Zone2
+      zh-cn: 可用区2对应实例类型
+    AssociationProperty: 'ALIYUN::ECS::Instance::InstanceType'
+    AssociationPropertyMetadata:
+      InstanceChargeType: PostPaid
+      SpotStrategy: SpotAsPriceGo
+      ZoneId: ${Zone2}
     Description:
       en: >-
         If no available specifications are displayed, please select Modify
@@ -175,11 +192,11 @@ Resources:
         Ref: EcsVSwitch1
       SecurityGroupId:
         Ref: EcsSecurityGroup
-      ImageId: centos_7_6
+      ImageId: centos_7_9
       IoOptimized: optimized
       SystemDiskSize: 20
       InstanceType:
-        Ref: EcsInstanceType
+        Ref: EcsInstanceType1
       Password:
         Ref: InstancePassword
       InstanceName:
@@ -197,11 +214,11 @@ Resources:
         Ref: EcsVSwitch2
       SecurityGroupId:
         Ref: EcsSecurityGroup
-      ImageId: centos_7_6
+      ImageId: centos_7_9
       IoOptimized: optimized
       SystemDiskSize: 20
       InstanceType:
-        Ref: EcsInstanceType
+        Ref: EcsInstanceType2
       Password:
         Ref: InstancePassword
       InstanceName:
@@ -227,7 +244,7 @@ Resources:
 
           systemctl enable docker.service
 
-          docker pull docker.io/library/wordpress
+          docker pull docker.io/library/wordpress:5.6
 
           mkdir /wordpress
 
@@ -236,7 +253,7 @@ Resources:
           WORDPRESS_DB_HOST=${PolarDBCluster.ClusterConnectionString} --env
           WORDPRESS_DB_USER=${PolarDBAccountName} --env
           WORDPRESS_DB_PASSWORD=${PolarDBPassword} --env
-          WORDPRESS_DB_NAME=${PolarDBName} wordpress
+          WORDPRESS_DB_NAME=${PolarDBName} wordpress:5.6
   PolarDBCluster:
     Type: 'ALIYUN::POLARDB::DBCluster'
     Properties:
@@ -366,7 +383,8 @@ Metadata:
             en: Availability Zone
             zh-cn: 可用区配置
       - Parameters:
-          - EcsInstanceType
+          - EcsInstanceType1
+          - EcsInstanceType2
           - InstancePassword
         Label:
           default: