You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2022/11/30 08:41:54 UTC
[sling-org-apache-sling-starter] branch master updated (a3e51cd -> 4cc6a0e)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
from a3e51cd SLING-11158 use feature launcher assembly to launch the starter (#63)
new 58e27f2 SLING-11701 - Starter CI builds are sometimes failing with an error about a conflict with the docker container name
new 4cc6a0e SLING-11701 - Starter CI builds are sometimes failing with an error about a conflict with the docker container name
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
[sling-org-apache-sling-starter] 02/02: SLING-11701 - Starter CI builds are sometimes failing with an error about a conflict with the docker container name
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 4cc6a0e7824867648390c72cb900b0a1e2aeaf30
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Nov 29 20:47:29 2022 +0100
SLING-11701 - Starter CI builds are sometimes failing with an error about a conflict with the docker container name
Don't run the Sling Starter image during integration tests as it's not used.
---
pom.xml | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8828225..e19c328 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,13 +272,6 @@
</wait>
</run>
</image>
- <image>
- <name>apache/sling:${docker.label}</name>
- <build>
- <dockerFile>Dockerfile</dockerFile>
- <contextDir>${project.basedir}</contextDir>
- </build>
- </image>
</images>
<stopMode>kill</stopMode>
</configuration>
@@ -305,6 +298,18 @@
<goals>
<goal>build</goal>
</goals>
+ <configuration>
+ <!-- Configure the sling image only for build, we don't want to run it -->
+ <images>
+ <image>
+ <name>apache/sling:${docker.label}</name>
+ <build>
+ <dockerFile>Dockerfile</dockerFile>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
</execution>
</executions>
</plugin>
[sling-org-apache-sling-starter] 01/02: SLING-11701 - Starter CI builds are sometimes failing with an error about a conflict with the docker container name
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 58e27f2a527e3ee68fea0954e6bde835c927b306
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Nov 29 17:50:07 2022 +0100
SLING-11701 - Starter CI builds are sometimes failing with an error about a conflict with the docker container name
Use random container names to prevent naming conflicts while running CI builds concurrently.
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 31f4bfb..8828225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,6 +257,7 @@
<version>0.39.0</version>
<configuration>
<skip>${docker.skip}</skip>
+ <containerNamePattern>%e</containerNamePattern>
<images>
<image>
<alias>mongo</alias>