[ https://issues.apache.org/jira/browse/SCB-630?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16512536#comment-16512536 ]
ASF GitHub Bot commented on SCB-630: ------------------------------------ WillemJiang closed pull request #209: SCB-630 Active the -Pdocker profile if detect the docker installation URL: https://github.com/apache/incubator-servicecomb-saga/pull/209 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/acceptance-tests/acceptance-dubbo-demo/pom.xml b/acceptance-tests/acceptance-dubbo-demo/pom.xml index 1dd257af..79e76370 100644 --- a/acceptance-tests/acceptance-dubbo-demo/pom.xml +++ b/acceptance-tests/acceptance-dubbo-demo/pom.xml @@ -44,6 +44,11 @@ <profiles> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/acceptance-tests/acceptance-spring-cloud-demo/pom.xml b/acceptance-tests/acceptance-spring-cloud-demo/pom.xml index c4185d11..a9c7cc5b 100644 --- a/acceptance-tests/acceptance-spring-cloud-demo/pom.xml +++ b/acceptance-tests/acceptance-spring-cloud-demo/pom.xml @@ -82,6 +82,11 @@ </profile> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml index 7d154a21..bfb88434 100644 --- a/alpha/alpha-server/pom.xml +++ b/alpha/alpha-server/pom.xml @@ -158,6 +158,11 @@ <profiles> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml index fce01ed7..fe23dec8 100644 --- a/integration-tests/pack-tests/pom.xml +++ b/integration-tests/pack-tests/pom.xml @@ -150,6 +150,11 @@ </profile> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/saga-demo/saga-dubbo-demo/servicea/pom.xml b/saga-demo/saga-dubbo-demo/servicea/pom.xml index dc2370ba..9dad60d0 100644 --- a/saga-demo/saga-dubbo-demo/servicea/pom.xml +++ b/saga-demo/saga-dubbo-demo/servicea/pom.xml @@ -60,6 +60,11 @@ <profiles> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/saga-demo/saga-dubbo-demo/serviceb/pom.xml b/saga-demo/saga-dubbo-demo/serviceb/pom.xml index d8dea590..7aa8bbc4 100644 --- a/saga-demo/saga-dubbo-demo/serviceb/pom.xml +++ b/saga-demo/saga-dubbo-demo/serviceb/pom.xml @@ -56,6 +56,11 @@ <profiles> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/saga-demo/saga-dubbo-demo/servicec/pom.xml b/saga-demo/saga-dubbo-demo/servicec/pom.xml index 465df541..6046ed81 100644 --- a/saga-demo/saga-dubbo-demo/servicec/pom.xml +++ b/saga-demo/saga-dubbo-demo/servicec/pom.xml @@ -56,6 +56,11 @@ <profiles> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/saga-demo/saga-spring-cloud-demo/booking/pom.xml b/saga-demo/saga-spring-cloud-demo/booking/pom.xml index 45f47901..0f0275a5 100644 --- a/saga-demo/saga-spring-cloud-demo/booking/pom.xml +++ b/saga-demo/saga-spring-cloud-demo/booking/pom.xml @@ -64,6 +64,11 @@ <profiles> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/saga-demo/saga-spring-cloud-demo/car/pom.xml b/saga-demo/saga-spring-cloud-demo/car/pom.xml index bfad217a..389da02f 100644 --- a/saga-demo/saga-spring-cloud-demo/car/pom.xml +++ b/saga-demo/saga-spring-cloud-demo/car/pom.xml @@ -64,6 +64,11 @@ <profiles> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> diff --git a/saga-demo/saga-spring-cloud-demo/hotel/pom.xml b/saga-demo/saga-spring-cloud-demo/hotel/pom.xml index 40395ed4..a4ba9652 100644 --- a/saga-demo/saga-spring-cloud-demo/hotel/pom.xml +++ b/saga-demo/saga-spring-cloud-demo/hotel/pom.xml @@ -64,6 +64,11 @@ <profiles> <profile> <id>docker</id> + <activation> + <file> + <exists>/var/run/docker.sock</exists> + </file> + </activation> <build> <plugins> <plugin> ---------------------------------------------------------------- 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: us...@infra.apache.org > Active the -Pdocker profile if detect the docker installation > -------------------------------------------------------------- > > Key: SCB-630 > URL: https://issues.apache.org/jira/browse/SCB-630 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Saga > Reporter: Willem Jiang > Assignee: Gao Xin > Priority: Major > Labels: easyfix, newbie > Fix For: saga-0.3.0 > > > Currently we use the -Pdocker to use the docker enabled feature to avoid the > build failure if there is no docker installation. > Now we can use the maven [profile with > activation|https://books.sonatype.com/mvnref-book/reference/profiles-sect-activation.html] > to enable the docker profile automatically. > {code} > <activation> > <file> > <exists>/var/run/docker.sock</exists> > </file> > <property> > <name>env.DOCKER_HOST</name> > </property> > </activation> > {code} -- This message was sent by Atlassian JIRA (v7.6.3#76005)