Skip to content

Commit 705a29e

Browse files
committed
update version
1 parent cf02910 commit 705a29e

File tree

27 files changed

+82
-88
lines changed

27 files changed

+82
-88
lines changed

mse-simple-demo/A/Dockerfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.3-labs
22

3-
FROM maven:3-eclipse-temurin-8-alpine
3+
FROM maven:3-eclipse-temurin-8-alpine as build
44

55
# copy arthas
66
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
@@ -15,14 +15,9 @@ COPY <<EOF /root/.m2/settings.xml
1515
<mirror>
1616
<id>alimaven</id>
1717
<name>aliyun maven</name>
18-
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
18+
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
1919
<mirrorOf>central</mirrorOf>
2020
</mirror>
21-
<mirror>
22-
<id>maven-default-http-blocker</id>
23-
<mirrorOf>!*</mirrorOf>
24-
<url>http://0.0.0.0/</url>
25-
</mirror>
2621
</mirrors>
2722
</settings>
2823
EOF
@@ -34,6 +29,14 @@ COPY ./ ./
3429
RUN --mount=type=cache,target=/root/.m2/repository/ \
3530
mvn clean package --batch-mode
3631

32+
33+
FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
34+
35+
# copy arthas
36+
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
37+
38+
COPY --from=build /app/target/A.jar /app/target/A.jar
39+
3740
EXPOSE 20001
3841
ENTRYPOINT ["sh", "-c"]
3942
CMD ["java -jar /app/target/A.jar"]

mse-simple-demo/A/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

44
cd "$(dirname "$0")"
55

6-
docker build . -t ${REGISTRY}spring-cloud-a:1.1.0
6+
docker build . -t ${REGISTRY}spring-cloud-a:1.2.0
77

88
if [ -n "${REGISTRY}" ]; then
9-
docker push ${REGISTRY}spring-cloud-a:1.1.0
9+
docker push ${REGISTRY}spring-cloud-a:1.2.0
1010
fi

mse-simple-demo/A/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>A</artifactId>
8-
<version>1.1.0</version>
8+
<version>1.2.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>A</name>

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class AController {
4646
@Autowired
4747
InetUtils inetUtils;
4848

49-
@Reference(application = "${dubbo.application.id}", version = "1.1.0")
49+
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
5050
private HelloServiceB helloServiceB;
5151

5252
@Autowired

mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceAImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.cloud.commons.util.InetUtils;
88

9-
@Service(version = "1.1.0")
9+
@Service(version = "1.2.0")
1010
public class HelloServiceAImpl implements HelloServiceA {
1111

1212
@Autowired
1313
InetUtils inetUtils;
1414

15-
@Reference(application = "${dubbo.application.id}", version = "1.1.0")
15+
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
1616
private HelloServiceB helloServiceB;
1717

1818
@Autowired

mse-simple-demo/B/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@ COPY <<EOF /root/.m2/settings.xml
1515
<mirror>
1616
<id>alimaven</id>
1717
<name>aliyun maven</name>
18-
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
18+
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
1919
<mirrorOf>central</mirrorOf>
2020
</mirror>
21-
<mirror>
22-
<id>maven-default-http-blocker</id>
23-
<mirrorOf>!*</mirrorOf>
24-
<url>http://0.0.0.0/</url>
25-
</mirror>
2621
</mirrors>
2722
</settings>
2823
EOF

mse-simple-demo/B/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
cd "$(dirname "$0")"
44

5-
docker build . -t ${REGISTRY}spring-cloud-b:1.1.0
5+
docker build . -t ${REGISTRY}spring-cloud-b:1.2.0
66

77
if [ -n "${REGISTRY}" ]; then
8-
docker push ${REGISTRY}spring-cloud-b:1.1.0
8+
docker push ${REGISTRY}spring-cloud-b:1.2.0
99
fi

mse-simple-demo/B/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>B</artifactId>
8-
<version>1.1.0</version>
8+
<version>1.2.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>B</name>

mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/BController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class BController {
3333
@Qualifier("restTemplate")
3434
private RestTemplate restTemplate;
3535

36-
@Reference(application = "${dubbo.application.id}", version = "1.1.0")
36+
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
3737
private HelloServiceC helloServiceC;
3838

3939
@Autowired

mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceBImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.cloud.commons.util.InetUtils;
77

8-
@Service(version = "1.1.0")
8+
@Service(version = "1.2.0")
99
public class HelloServiceBImpl implements HelloServiceB {
1010

1111
@Autowired
@@ -14,7 +14,7 @@ public class HelloServiceBImpl implements HelloServiceB {
1414
@Autowired
1515
String serviceTag;
1616

17-
@Reference(application = "${dubbo.application.id}", version = "1.1.0")
17+
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
1818
private HelloServiceC helloServiceC;
1919

2020
@Override

0 commit comments

Comments
 (0)