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:56 UTC
[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
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>