This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new ab7ac34 feat docker-compose pg (#2502)
ab7ac34 is described below
commit ab7ac343a1837bec48981e3adb3e20e6f6a0a97f
Author: Sinsy <[email protected]>
AuthorDate: Wed Dec 1 19:49:25 2021 +0800
feat docker-compose pg (#2502)
---
.../src/main/assembly/source.xml | 26 ++++++++++++++++++++++
.../stand-alone-mysql/docker-compose.yaml | 12 ++++++++--
.../docker-compose.yaml | 17 +++++++++-----
3 files changed, 48 insertions(+), 7 deletions(-)
diff --git
a/shenyu-dist/shenyu-docker-compose-dist/src/main/assembly/source.xml
b/shenyu-dist/shenyu-docker-compose-dist/src/main/assembly/source.xml
index 86342e3..143e694 100644
--- a/shenyu-dist/shenyu-docker-compose-dist/src/main/assembly/source.xml
+++ b/shenyu-dist/shenyu-docker-compose-dist/src/main/assembly/source.xml
@@ -79,5 +79,31 @@
</includes>
<outputDirectory>stand-alone-h2/shenyu-bootstrap/conf</outputDirectory>
</fileSet>
+ <!-- pg -->
+ <fileSet>
+ <directory>src/main/resources/stand-alone-pg</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <outputDirectory>stand-alone-pg</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../../shenyu-admin/src/main/resources</directory>
+ <includes>
+ <include>application.yml</include>
+ <include>application-pg.yml</include>
+ <include>logback.xml</include>
+ </includes>
+ <outputDirectory>stand-alone-pg/shenyu-admin/conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../../shenyu-bootstrap/src/main/resources</directory>
+ <includes>
+ <include>application.yml</include>
+ <include>application-local.yml</include>
+ <include>logback.xml</include>
+ </includes>
+
<outputDirectory>stand-alone-pg/shenyu-bootstrap/conf</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
diff --git
a/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-mysql/docker-compose.yaml
b/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-mysql/docker-compose.yaml
index e136748..a2c5c04 100644
---
a/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-mysql/docker-compose.yaml
+++
b/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-mysql/docker-compose.yaml
@@ -3,10 +3,17 @@ services:
shenyu-bootstrap:
image: apache/shenyu-bootstrap:latest
container_name: shenyu-bootstrap
+ ports:
+ - "9195:9195"
volumes:
- ./shenyu-bootstrap/logs/:/opt/shenyu-bootstrap/logs
- ./shenyu-bootstrap/conf/:/opt/shenyu-bootstrap/conf
- network_mode: host
+ links:
+ - shenyu-admin:admin
+ depends_on:
+ - shenyu-admin
+ environment:
+ - shenyu.sync.websocket.urls=ws://admin:9095/websocket
shenyu-admin:
image: apache/shenyu-admin:latest
container_name: shenyu-admin
@@ -16,4 +23,5 @@ services:
- ./shenyu-admin/logs/:/opt/shenyu-admin/logs
- ./shenyu-admin/conf/:/opt/shenyu-admin/conf
- ./shenyu-admin/ext-lib/:/opt/shenyu-admin/ext-lib
- network_mode: host
\ No newline at end of file
+ ports:
+ - "9095:9095"
\ No newline at end of file
diff --git
a/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-mysql/docker-compose.yaml
b/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-pg/docker-compose.yaml
similarity index 65%
copy from
shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-mysql/docker-compose.yaml
copy to
shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-pg/docker-compose.yaml
index e136748..68b23e6 100644
---
a/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-mysql/docker-compose.yaml
+++
b/shenyu-dist/shenyu-docker-compose-dist/src/main/resources/stand-alone-pg/docker-compose.yaml
@@ -3,17 +3,24 @@ services:
shenyu-bootstrap:
image: apache/shenyu-bootstrap:latest
container_name: shenyu-bootstrap
+ ports:
+ - "9195:9195"
volumes:
- ./shenyu-bootstrap/logs/:/opt/shenyu-bootstrap/logs
- ./shenyu-bootstrap/conf/:/opt/shenyu-bootstrap/conf
- network_mode: host
+ links:
+ - shenyu-admin:admin
+ depends_on:
+ - shenyu-admin
+ environment:
+ - shenyu.sync.websocket.urls=ws://admin:9095/websocket
shenyu-admin:
image: apache/shenyu-admin:latest
container_name: shenyu-admin
- environment:
- - spring.profiles.active=mysql
volumes:
- ./shenyu-admin/logs/:/opt/shenyu-admin/logs
- ./shenyu-admin/conf/:/opt/shenyu-admin/conf
- - ./shenyu-admin/ext-lib/:/opt/shenyu-admin/ext-lib
- network_mode: host
\ No newline at end of file
+ environment:
+ - spring.profiles.active=pg
+ ports:
+ - "9095:9095"
\ No newline at end of file
