Skip to content

Commit 1bcac95

Browse files
KeRan213539KeRan213539
authored
Ready to release 0.3.0 (#797)
Modified version to 0.3.0; Adjust POM dependencies and use Dubbo's dependency version control; Add display of version on UI; Add 0.3.0 docker related scripts;
1 parent 14c368b commit 1bcac95

13 files changed

Lines changed: 122 additions & 107 deletions

File tree

‎docker/0.3.0/Dockerfile‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
FROM maven:3-openjdk-8
17+
RUN mkdir -p /source/dubbo-admin-snapshot
18+
ADD . /source/dubbo-admin-snapshot
19+
WORKDIR /source/dubbo-admin-snapshot
20+
RUN mvn --batch-mode -Prelease clean package -Dmaven.test.skip=true
21+
22+
FROM openjdk:8-jre
23+
LABEL maintainer="dev@dubbo.apache.org"
24+
RUN apt-get update && apt-get install -y tini
25+
COPY --from=0 /source/dubbo-admin-snapshot/dubbo-admin-distribution/target/dubbo-admin-0.3.0.jar /app.jar
26+
COPY --from=0 /source/dubbo-admin-snapshot/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
27+
28+
ENV JAVA_OPTS ""
29+
30+
ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
31+
EXPOSE 8080

docker/latest/entrypoint.sh renamed to docker/entrypoint.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#!/bin/bash
22
set -e
3-
43
exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar

‎docker/latest/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ FROM maven:3-openjdk-8
1717
RUN mkdir -p /source/dubbo-admin-snapshot
1818
ADD . /source/dubbo-admin-snapshot
1919
WORKDIR /source/dubbo-admin-snapshot
20-
RUN mvn --batch-mode clean package -Dmaven.test.skip=true
20+
RUN mvn --batch-mode -Prelease clean package -Dmaven.test.skip=true
2121

2222
FROM openjdk:8-jre
2323
LABEL maintainer="dev@dubbo.apache.org"
2424
RUN apt-get update && apt-get install -y tini
2525
COPY --from=0 /source/dubbo-admin-snapshot/dubbo-admin-distribution/target/dubbo-admin-0.3.0-SNAPSHOT.jar /app.jar
26-
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
26+
COPY --from=0 /source/dubbo-admin-snapshot/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
2727

2828
ENV JAVA_OPTS ""
2929

‎docker/stack.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ services:
2121
ports:
2222
- 2181:2181
2323
admin:
24-
image: apache/dubbo-admin
24+
image: apache/dubbo-admin:0.3.0
2525
depends_on:
2626
- zookeeper
2727
ports:
28-
- 8080
28+
- 8080:8080
2929
environment:
3030
- admin.registry.address=zookeeper://zookeeper:2181
3131
- admin.config-center=zookeeper://zookeeper:2181

‎dubbo-admin-distribution/src/bin/config/application.properties‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,43 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
server.port=8080
18-
# centers in dubbo2.7
19-
admin.registry.address=nacos://127.0.0.1:8848
20-
admin.config-center=nacos://127.0.0.1:8848
21-
admin.metadata-report.address=nacos://127.0.0.1:8848
2217

23-
#admin.registry.address=nacos://127.0.0.1:8848
24-
#admin.config-center=nacos://127.0.0.1:8848
25-
#admin.metadata-report.address=nacos://127.0.0.1:8848
18+
# centers in dubbo2.7, if you want to add parameters, please add them to the url
19+
admin.registry.address=zookeeper://127.0.0.1:2181
20+
admin.config-center=zookeeper://127.0.0.1:2181
21+
admin.metadata-report.address=zookeeper://127.0.0.1:2181
22+
23+
# nacos config, add parameters to url like username=nacos&password=nacos
24+
#admin.registry.address=nacos://127.0.0.1:8848?group=DEFAULT_GROUP&namespace=public
25+
#admin.config-center=nacos://127.0.0.1:8848?group=dubbo
26+
#admin.metadata-report.address=nacos://127.0.0.1:8848?group=dubbo
27+
28+
#group (Deprecated it is recommended to use URL to add parameters,will be removed in the future)
29+
#admin.registry.group=dubbo
30+
#admin.config-center.group=dubbo
31+
#admin.metadata-report.group=dubbo
32+
33+
#namespace used by nacos. (Deprecated it is recommended to use URL to add parameters,will be removed in the future)
34+
#admin.registry.namespace=public
35+
#admin.config-center.namespace=public
36+
#admin.metadata-report.namespace=public
2637

2738
admin.root.user.name=root
2839
admin.root.user.password=root
29-
#group
30-
admin.registry.group=DEFAULT_GROUP
31-
admin.config-center.group=DEFAULT_GROUP
32-
admin.metadata-report.group=DEFAULT_GROUP
33-
34-
#namespace used by nacos
35-
admin.registry.namespace=public
36-
admin.config-center.namespace=public
37-
admin.metadata-report.namespace=public
38-
39-
admin.apollo.token=e16e5cd903fd0c97a116c873b448544b9d086de9
40-
admin.apollo.appId=test
41-
admin.apollo.env=dev
42-
admin.apollo.cluster=default
43-
admin.apollo.namespace=dubbo
40+
41+
#session timeout, default is one hour
42+
admin.check.sessionTimeoutMilli=3600000
43+
44+
45+
# apollo config
46+
# admin.config-center = apollo://localhost:8070?token=e16e5cd903fd0c97a116c873b448544b9d086de9&app.id=test&env=dev&cluster=default&namespace=dubbo
47+
48+
# (Deprecated it is recommended to use URL to add parameters,will be removed in the future)
49+
#admin.apollo.token=e16e5cd903fd0c97a116c873b448544b9d086de9
50+
#admin.apollo.appId=test
51+
#admin.apollo.env=dev
52+
#admin.apollo.cluster=default
53+
#admin.apollo.namespace=dubbo
4454

4555
#compress
4656
server.compression.enabled=true

‎dubbo-admin-server/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141
<artifactId>spring-boot-starter-web</artifactId>
4242
</dependency>
4343

44+
<dependency>
45+
<groupId>org.springframework.boot</groupId>
46+
<artifactId>spring-boot-starter-validation</artifactId>
47+
</dependency>
48+
4449
<dependency>
4550
<groupId>org.springframework.boot</groupId>
4651
<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -179,6 +184,11 @@
179184
<scope>test</scope>
180185
</dependency>
181186

187+
<dependency>
188+
<groupId>org.apache.zookeeper</groupId>
189+
<artifactId>zookeeper</artifactId>
190+
</dependency>
191+
182192
</dependencies>
183193

184194
<build>

‎dubbo-admin-test/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
<dependency>
8080
<groupId>com.google.guava</groupId>
8181
<artifactId>guava</artifactId>
82-
<version>29.0-jre</version>
8382
</dependency>
8483

8584
<dependency>

‎dubbo-admin-ui/dubbo-admin-info.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"version": "${revision}"
3+
}

‎dubbo-admin-ui/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,23 @@
7777
</executions>
7878
</plugin>
7979
</plugins>
80+
<resources>
81+
<resource>
82+
<directory>${basedir}</directory>
83+
<targetPath>${basedir}/target/dist</targetPath>
84+
<includes>
85+
<include>dubbo-admin-info.json</include>
86+
</includes>
87+
<filtering>true</filtering>
88+
</resource>
89+
<resource>
90+
<directory>${basedir}</directory>
91+
<targetPath>${basedir}/public</targetPath>
92+
<includes>
93+
<include>dubbo-admin-info.json</include>
94+
</includes>
95+
<filtering>true</filtering>
96+
</resource>
97+
</resources>
8098
</build>
8199
</project>

‎dubbo-admin-ui/public/dubbo-admin-info.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"version": "0.3.0"
3+
}

0 commit comments

Comments
 (0)