From d2502824dc55052d18048fa630e833b9bddd5e62 Mon Sep 17 00:00:00 2001 From: "Wilkins, Emily (Counterpointe Solutions)" <80470879+ewilkins-csi@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:48:34 -0600 Subject: [PATCH] [#513] detect docker socket location automatically --- README.md | 6 +- build-parent/pom.xml | 90 +++++++++++++++++++ .../extensions-alerting-teams/pom.xml | 28 ------ .../pom.xml | 30 ------- .../pom.xml | 30 ------- .../pom.xml | 27 ------ 6 files changed, 91 insertions(+), 120 deletions(-) diff --git a/README.md b/README.md index c5d6bb446..366fd8d2b 100644 --- a/README.md +++ b/README.md @@ -69,13 +69,9 @@ The following steps will build aiSSEMBLE. *You must follow the configuration gui ### Helpful Profiles The aiSSEMBLE baseline project provides several build profiles that may be helpful for different development environments. To activate each one, use the standard Maven syntax: `./mvnw clean install -P[profile_name]`, for -instance, `./mvnw clean install -PnoRdAdmin`. There are many profiles you can find in the root `pom.xml` file. The +instance, `./mvnw clean install -Pintegration-test`. There are many profiles you can find in the root `pom.xml` file. The following profiles are often useful when first starting with aiSSEMBLE: -* *noRdAdmin*: For configurations that disallow granting administrator privileges to Rancher Desktop. Testing frameworks - leveraged by aiSSEMBLE may, at times, assume that the docker unix socket is located at `/var/run/docker.sock`, which is - not the case when presented with a non-elevated Rancher installation. Activating this profile will override the - `DOCKER_HOST` seen by these dependencies, pointing it instead at `unix://$HOME/.rd/docker.sock`. * *integration-test*: Some integration tests require Docker and automatically start/stop Docker Compose services while executing tests (i.e. see the test/test-mda-models/test-data-delivery-pyspark-patterns module). **Note that the Maven build does not build the Docker images directly. The images are built within the Kubernetes cluster to speed up diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 2c1b8a4b4..651bfd9f1 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -1132,6 +1132,96 @@ To suppress enforce-helm-version rule, you must add following plugin to the root true + + + + + docker-socket-rd + + + /var/run/docker.sock + ${user.home}/.rd/docker.sock + + + + !env.DOCKER_HOST + + + + unix://${user.home}/.rd/docker.sock + + + + + + ${group.fabric8.plugin} + docker-maven-plugin + + ${docker.host} + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.jboss.logmanager.LogManager + ${maven.home} + + + ${docker.host} + ${docker.host} + + + + + + + + + + docker-socket-dd + + + /var/run/docker.sock + ${user.home}/.docker/desktop/docker.sock + + + + !env.DOCKER_HOST + + + + unix://${user.home}/.rd/desktop/docker.sock + + + + + + ${group.fabric8.plugin} + docker-maven-plugin + + ${docker.host} + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.jboss.logmanager.LogManager + ${maven.home} + + + ${docker.host} + ${docker.host} + + + + + + + diff --git a/extensions/extensions-alerting/extensions-alerting-teams/pom.xml b/extensions/extensions-alerting/extensions-alerting-teams/pom.xml index f162a3a38..e888a8435 100644 --- a/extensions/extensions-alerting/extensions-alerting-teams/pom.xml +++ b/extensions/extensions-alerting/extensions-alerting-teams/pom.xml @@ -121,32 +121,4 @@ - - - noRdAdmin - - - BAH_MACHINE - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.jboss.logmanager.LogManager - ${maven.home} - - - unix://$HOME/.rd/docker.sock - $HOME/.rd/docker.sock - - - - - - - diff --git a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml index 72830e7b9..9d608eb38 100644 --- a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml +++ b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml @@ -136,34 +136,4 @@ - - - - noRdAdmin - - - BAH_MACHINE - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.jboss.logmanager.LogManager - ${maven.home} - - - unix://$HOME/.rd/docker.sock - $HOME/.rd/docker.sock - - - - - - - - diff --git a/extensions/extensions-pipeline-invocation-service/pom.xml b/extensions/extensions-pipeline-invocation-service/pom.xml index de918996a..53015b226 100644 --- a/extensions/extensions-pipeline-invocation-service/pom.xml +++ b/extensions/extensions-pipeline-invocation-service/pom.xml @@ -149,34 +149,4 @@ - - - - - noRdAdmin - - - BAH_MACHINE - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.jboss.logmanager.LogManager - ${maven.home} - - - unix://$HOME/.rd/docker.sock - $HOME/.rd/docker.sock - - - - - - - diff --git a/foundation/foundation-drift-detection/foundation-drift-detection-service/pom.xml b/foundation/foundation-drift-detection/foundation-drift-detection-service/pom.xml index 6c63b87c5..458c70c36 100644 --- a/foundation/foundation-drift-detection/foundation-drift-detection-service/pom.xml +++ b/foundation/foundation-drift-detection/foundation-drift-detection-service/pom.xml @@ -148,31 +148,4 @@ - - - noRdAdmin - - - BAH_MACHINE - - - - - - maven-surefire-plugin - - - org.jboss.logmanager.LogManager - ${maven.home} - - - unix://$HOME/.rd/docker.sock - $HOME/.rd/docker.sock - - - - - - -