Details
-
Improvement
-
Status: Resolved
-
Major
-
Resolution: Fixed
-
None
Description
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 to enable the docker profile automatically.
<activation>
<file>
<exists>/var/run/docker.sock</exists>
</file>
<property>
<name>env.DOCKER_HOST</name>
</property>
</activation>
Attachments
Issue Links
- links to
Activity
SingleX opened a new pull request #209: SCB-630 Active the -Pdocker profile if detect the docker installation
URL: https://github.com/apache/incubator-servicecomb-saga/pull/209
Follow this checklist to help us incorporate your contribution quickly and easily:
- [X] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes.
- [X] Each commit in the pull request should have a meaningful subject line and body.
- [X] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue.
- [X] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [X] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
- [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
—
----------------------------------------------------------------
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:
users@infra.apache.org
coveralls commented on issue #209: SCB-630 Active the -Pdocker profile if detect the docker installation
URL: https://github.com/apache/incubator-servicecomb-saga/pull/209#issuecomment-397293759
[![Coverage Status](https://coveralls.io/builds/17490552/badge)](https://coveralls.io/builds/17490552)
Coverage decreased (-0.6%) to 94.02% when pulling *01cacf2a088bda19ad2eb66a1dbbcf913ef99b6a on SingleX:SCB-630* into *55aba24805c1f9db1d6eeb7090b483c1522e3826 on apache:master*.
----------------------------------------------------------------
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:
users@infra.apache.org
coveralls commented on issue #209: SCB-630 Active the -Pdocker profile if detect the docker installation
URL: https://github.com/apache/incubator-servicecomb-saga/pull/209#issuecomment-397293759
[![Coverage Status](https://coveralls.io/builds/17490990/badge)](https://coveralls.io/builds/17490990)
Coverage remained the same at 94.572% when pulling *c9d8b221857908dc19493c7393d945b5d7099209 on SingleX:SCB-630* into *55aba24805c1f9db1d6eeb7090b483c1522e3826 on apache:master*.
----------------------------------------------------------------
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:
users@infra.apache.org
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:
users@infra.apache.org
With the newest offical docker CE, it does not need `DOCKER_HOST` any more。
There are other problems in keeping this configuration for compatibility. Unfortunately, maven `<activation>` block changed from a list of `OR` to 'AND' since 3.2.2.
references:
https://stackoverflow.com/questions/4629140/maven-profile-activation-with-multiple-conditions
https://issues.apache.org/jira/browse/MNG-4565