WillemJiang closed pull request #150: SCB-330 fix guide of mysql
URL: https://github.com/apache/incubator-servicecomb-saga/pull/150
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/faq/cn/how_to_use_mysql_as_alpha_backend_database.md
b/docs/faq/cn/how_to_use_mysql_as_alpha_backend_database.md
index f241b36f..0ef18abf 100644
--- a/docs/faq/cn/how_to_use_mysql_as_alpha_backend_database.md
+++ b/docs/faq/cn/how_to_use_mysql_as_alpha_backend_database.md
@@ -11,15 +11,20 @@
2. ??Saga
```bash
- mvn clean install -Pdocker -DskipTests
+ mvn clean package -Pdocker -DskipTests
```
??????????????alpha-server?????????`alpha/alpha-server/target/saga/alpha-server-${version}-exec.jar`?
- **??**: ???????docker????????`mvn clean install -DskipTests`???
- **??**: ?????????alpha-server?docker?????????????????
+
+ **??**: ???????docker????????`mvn clean package -DskipTests`???
+
+ **??**: ?????????alpha-server?docker??????????????????
+ ```bash
+ docker rmi -f $(docker images | grep alpha-server | awk '{print $3}')
+ ```
3. ??MySQL
```bash
- docker run -d -e "MYSQL_ROOT_PASSWORD=password" "-e "MYSQL_DATABASE=saga"
-e "MYSQL_USER=saga" -e "MYSQL_PASSWORD=password" -p 3306:3306
mysql/mysql-server:5.7
+ docker run -d -e "MYSQL_ROOT_PASSWORD=password" -e "MYSQL_DATABASE=saga" -e
"MYSQL_USER=saga" -e "MYSQL_PASSWORD=password" -p 3306:3306
mysql/mysql-server:5.7
```
4. ??alpha????MySQL?????????alpha??????docker??????????
diff --git a/docs/faq/en/how_to_use_mysql_as_alpha_backend_database.md
b/docs/faq/en/how_to_use_mysql_as_alpha_backend_database.md
index 2bb2954d..14fd5980 100644
--- a/docs/faq/en/how_to_use_mysql_as_alpha_backend_database.md
+++ b/docs/faq/en/how_to_use_mysql_as_alpha_backend_database.md
@@ -11,15 +11,20 @@
2. install Saga
```bash
- mvn clean install -Pdocker -DskipTests
+ mvn clean package -Pdocker -DskipTests
```
After that, you will find the generated docker image `alpha-server` and
executable file
`alpha/alpha-server/target/saga/alpha-server-${version}-exec.jar`.
- **Notice**: If you do not want to build the docker image, run `mvn clean
install -DskipTests` is enough.
+
+ **Notice**: If you do not want to build the docker image, run `mvn clean
package -DskipTests` is enough.
+
**Notice**: If you have installed saga with docker before, you need to
remove the alpha-server's docker image first.
+ ```bash
+ docker rmi -f $(docker images | grep alpha-server | awk '{print $3}')
+ ```
3. run MySQL
```bash
- docker run -d -e "MYSQL_ROOT_PASSWORD=password" "-e "MYSQL_DATABASE=saga"
-e "MYSQL_USER=saga" -e "MYSQL_PASSWORD=password" -p 3306:3306
mysql/mysql-server:5.7
+ docker run -d -e "MYSQL_ROOT_PASSWORD=password" -e "MYSQL_DATABASE=saga" -e
"MYSQL_USER=saga" -e "MYSQL_PASSWORD=password" -p 3306:3306
mysql/mysql-server:5.7
```
4. Run alpha. Please make sure MySQL is up before this step. You can run alpha
through docker or executable file.
@@ -31,4 +36,4 @@
```bash
java -Dspring.profiles.active=mysql
-D"spring.datasource.url=jdbc:mysql://${host_address}:3306/saga?useSSL=false"
-jar alpha-server-${saga_version}-exec.jar
```
- **Notice**: Please change `${saga_version}` and `${host_address}` to the
actual value before you execute the command.
\ No newline at end of file
+ **Notice**: Please change `${saga_version}` and `${host_address}` to the
actual value before you execute the command.
diff --git a/saga-demo/booking/README.md b/saga-demo/booking/README.md
index 6a97537b..8e2dfc3f 100644
--- a/saga-demo/booking/README.md
+++ b/saga-demo/booking/README.md
@@ -35,8 +35,15 @@ You will need:
<artifactId>mysql-connector-java</artifactId>
</dependency>
```
-
- 2. start application up in `saga-demo/booking` with the following command
+ 2. remove alpha server's docker image
+ ```bash
+ docker rmi -f $(docker images | grep alpha-server | awk '{print $3}')
+ ```
+ 3. re-generate saga's docker images
+ ```bash
+ mvn package -DskipTests -Pdocker -Pdemo
+ ```
+ 4. start application up in `saga-demo/booking` with the following command
```
docker-compose -f docker-compose.yaml -f docker-compose.mysql.yaml up
```
diff --git a/saga-demo/booking/docker-compose.yaml
b/saga-demo/booking/docker-compose.yaml
index e528c83a..e1e3e307 100644
--- a/saga-demo/booking/docker-compose.yaml
+++ b/saga-demo/booking/docker-compose.yaml
@@ -32,7 +32,7 @@ services:
retries: 5
alpha:
- image: "alpha-server:0.0.3-SNAPSHOT"
+ image: "alpha-server:0.1.0"
hostname: alpha-server
links:
- "database:postgresql.servicecomb.io"
@@ -48,7 +48,7 @@ services:
condition: service_healthy
pack-hotel:
- image: "pack-hotel:0.0.3-SNAPSHOT"
+ image: "pack-hotel:0.1.0"
hostname: pack-hotel
links:
- "alpha:alpha-server.servicecomb.io"
@@ -59,7 +59,7 @@ services:
condition: service_healthy
pack-car:
- image: "pack-car:0.0.3-SNAPSHOT"
+ image: "pack-car:0.1.0"
hostname: pack-car
links:
- "alpha:alpha-server.servicecomb.io"
@@ -70,7 +70,7 @@ services:
condition: service_healthy
pack-booking:
- image: "pack-booking:0.0.3-SNAPSHOT"
+ image: "pack-booking:0.1.0"
hostname: pack-booking
links:
- "alpha:alpha-server.servicecomb.io"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
