Merge pull request #173 from aliyun/eclipse-temurin

robberphex · web-flow · commit a7338c2706c5 · 2023-10-23T09:31:40.000-04:00
Eclipse temurin
diff --git a/mse-simple-demo/A/Dockerfile b/mse-simple-demo/A/Dockerfile
@@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
 
-FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
+FROM eclipse-temurin:8-jdk-alpine
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
diff --git a/mse-simple-demo/A/build.sh b/mse-simple-demo/A/build.sh
@@ -3,14 +3,15 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-a
-export version=3.0.3
+export VERSION="${VERSION:-3.0.4}"
 
 set -e
 
 cd "$(dirname "$0")"
 
-docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${version}
+docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${VERSION}
 
 if [ -n "${REGISTRY}" ]; then
-    docker push ${REGISTRY}${appName}:${version}
-fi
+    docker push ${REGISTRY}${appName}:${VERSION}
+fi
+
diff --git a/mse-simple-demo/A/pom.xml b/mse-simple-demo/A/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>A</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <packaging>jar</packaging>
 
     <name>A</name>
diff --git a/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/Swagger2Config.java b/mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/a/Swagger2Config.java
@@ -26,8 +26,8 @@ public Docket api() {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.
-                addResourceHandler("/swagger-ui/**")
+        registry
+                .addResourceHandler("/swagger-ui/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
                 .resourceChain(false);
     }
diff --git a/mse-simple-demo/A/src/main/resources/application.properties b/mse-simple-demo/A/src/main/resources/application.properties
@@ -22,4 +22,6 @@ rocketmq.consumer.topic=TEST_MQ
 rocketmq.consumer.group=test-a
 middleware.mq.address=mqnamesrv:9876
 
-custom.config.value=base
+custom.config.value=base
+
+springfox.documentation.auto-startup=false
diff --git a/mse-simple-demo/B/Dockerfile b/mse-simple-demo/B/Dockerfile
@@ -26,7 +26,7 @@ COPY ./ ./
 RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
-FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
+FROM eclipse-temurin:8-jdk-alpine
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
diff --git a/mse-simple-demo/B/build.sh b/mse-simple-demo/B/build.sh
@@ -3,14 +3,14 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-b
-export version=3.0.3
+export VERSION="${VERSION:-3.0.4}"
 
 set -e
 
 cd "$(dirname "$0")"
 
-docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${version}
+docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${VERSION}
 
 if [ -n "${REGISTRY}" ]; then
-    docker push ${REGISTRY}${appName}:${version}
+    docker push ${REGISTRY}${appName}:${VERSION}
 fi
diff --git a/mse-simple-demo/B/pom.xml b/mse-simple-demo/B/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>B</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <packaging>jar</packaging>
 
     <name>B</name>
diff --git a/mse-simple-demo/C/Dockerfile b/mse-simple-demo/C/Dockerfile
@@ -25,7 +25,7 @@ COPY ./ ./
 RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
-FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
+FROM eclipse-temurin:8-jdk-alpine
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
diff --git a/mse-simple-demo/C/build.sh b/mse-simple-demo/C/build.sh
@@ -3,14 +3,14 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-c
-export version=3.0.3
+export VERSION="${VERSION:-3.0.4}"
 
 set -e
 
 cd "$(dirname "$0")"
 
-docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${version}
+docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${VERSION}
 
 if [ -n "${REGISTRY}" ]; then
-    docker push ${REGISTRY}${appName}:${version}
+    docker push ${REGISTRY}${appName}:${VERSION}
 fi
diff --git a/mse-simple-demo/C/pom.xml b/mse-simple-demo/C/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>C</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <packaging>jar</packaging>
 
     <name>C</name>
diff --git a/mse-simple-demo/README.ZH.md b/mse-simple-demo/README.ZH.md
@@ -7,12 +7,11 @@ mse-simple-demo是一个简单的微服务demo，架构如下：
 # 如何部署
 
 ```sh
-helm3 upgrade mse-simple-demo1 \
+helm upgrade mse-simple-demo1 \
   helm/mse-simple-demo \
   --install \
   --namespace default --create-namespace \
-  --set registry=registry.cn-shanghai.aliyuncs.com/yizhan/ \
-  --set mse.namespace=mse-test
+  --values ./helm/mse-simple-demo/values.example.yaml
 ```
 
 * `namespace`: 要安装到的k8s命名空间
diff --git a/mse-simple-demo/SpringCloudGateway/Dockerfile b/mse-simple-demo/SpringCloudGateway/Dockerfile
@@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
 
-FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
+FROM eclipse-temurin:8-jdk-alpine
 
 
 # copy arthas
diff --git a/mse-simple-demo/SpringCloudGateway/build.sh b/mse-simple-demo/SpringCloudGateway/build.sh
@@ -2,14 +2,14 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-gateway
-export version=3.0.3
+export VERSION="${VERSION:-3.0.4}"
 
 set -e
 
 cd "$(dirname "$0")"
 
-docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${version}
+docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${VERSION}
 
 if [ -n "${REGISTRY}" ]; then
-    docker push ${REGISTRY}${appName}:${version}
+    docker push ${REGISTRY}${appName}:${VERSION}
 fi
diff --git a/mse-simple-demo/SpringCloudGateway/pom.xml b/mse-simple-demo/SpringCloudGateway/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>SpringCloudGateway</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/mse-simple-demo/ZuulGateway/Dockerfile b/mse-simple-demo/ZuulGateway/Dockerfile
@@ -25,7 +25,7 @@ COPY ./ ./
 RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
-FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
+FROM eclipse-temurin:8-jdk-alpine
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
diff --git a/mse-simple-demo/ZuulGateway/build.sh b/mse-simple-demo/ZuulGateway/build.sh
@@ -3,14 +3,14 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-zuul
-export version=3.0.3
+export VERSION="${VERSION:-3.0.4}"
 
 set -e
 
 cd "$(dirname "$0")"
 
-docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${version}
+docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${VERSION}
 
 if [ -n "${REGISTRY}" ]; then
-    docker push ${REGISTRY}${appName}:${version}
+    docker push ${REGISTRY}${appName}:${VERSION}
 fi
diff --git a/mse-simple-demo/ZuulGateway/pom.xml b/mse-simple-demo/ZuulGateway/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>ZuulGateway</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/mse-simple-demo/build.sh b/mse-simple-demo/build.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Select the correct warehouse prefix
 export REGISTRY=${REGISTRY}
+export VERSION="${VERSION:-3.0.4}"
 
 set -e
 
diff --git a/mse-simple-demo/helm/mse-simple-demo/Chart.yaml b/mse-simple-demo/helm/mse-simple-demo/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mse-simple-demo
-version: "3.0.3"
-appVersion: "3.0.3"
+version: "3.0.4"
+appVersion: "3.0.4"
 home: https://mse.console.aliyun.com/
 keywords:
   - mse
diff --git a/mse-simple-demo/helm/mse-simple-demo/values.yaml b/mse-simple-demo/helm/mse-simple-demo/values.yaml
@@ -2,7 +2,7 @@
 registry: registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/
 
 images:
-  version: 3.0.3
+  version: 3.0.4
 
 mse:
   namespace: mse-demo
diff --git a/mse-simple-demo/mysql/build.sh b/mse-simple-demo/mysql/build.sh
@@ -2,14 +2,15 @@
 export REGISTRY=${REGISTRY}
 
 export appName=demo-mysql
-export version=3.0.3
+export VERSION="${VERSION:-3.0.4}"
 
 set -e
 
 cd "$(dirname "$0")"
 
-docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${version}
+docker build --platform linux/amd64 . -t ${REGISTRY}${appName}:${VERSION}
 
 if [ -n "${REGISTRY}" ]; then
-    docker push ${REGISTRY}${appName}:${version}
-fi
+    docker push ${REGISTRY}${appName}:${VERSION}
+fi
+
diff --git a/mse-simple-demo/pom.xml b/mse-simple-demo/pom.xml
@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <all.project.version>3.0.3</all.project.version>
+        <all.project.version>3.0.4</all.project.version>
     </properties>
 
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>mse-simple-demo</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <modules>
         <module>A</module>
         <module>B</module>
