Fix #2928 - add ddi containers volume (#2935)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
2026-02-24 12:26:15 +02:00
parent 6631bf8344
commit ea9519deae
20 changed files with 37 additions and 30 deletions
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The following vendors offer free trial accounts for their hawkBit compatible pro

 # Device Integration (Client libraries)

-hawkBit exposes HTTP/JSON based [Direct Device Integration (API) API](https://www.eclipse.org/hawkbit/apis/ddi_api/)
+hawkBit exposes HTTP/JSON based [Direct Device Integration (API) API](https://hawkbit.eclipse.dev/#/direct-device-integration-api)
 that allow any update client to integrate quite easily.

 The [Eclipse Hara subproject](https://projects.eclipse.org/projects/iot.hawkbit.hara) aims to provide a reference agent
--- a/docker/mysql/docker-compose-micro-services-dbinit-mysql.yml
+++ b/docker/mysql/docker-compose-micro-services-dbinit-mysql.yml
@@ -57,6 +57,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit-ddi"
+    volumes:
+      - artifactrepo:/app/artifactrepo

  # ---------------------
  # HawkBit DMF
@@ -90,8 +92,6 @@ services:
      - 'SPRING_RABBITMQ_HOST=rabbitmq'
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
-    volumes:
-      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
@@ -100,6 +100,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit-mgmt"
+    volumes:
+      - artifactrepo:/app/artifactrepo

 volumes:
  artifactrepo:
--- a/docker/mysql/docker-compose-micro-services-dbinit-with-ui-mysql.yml
+++ b/docker/mysql/docker-compose-micro-services-dbinit-with-ui-mysql.yml
--- a/docker/mysql/docker-compose-micro-services-mysql.yml
+++ b/docker/mysql/docker-compose-micro-services-mysql.yml
@@ -34,6 +34,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit-ddi"
+    volumes:
+      - artifactrepo:/app/artifactrepo

  # ---------------------
  # HawkBit DMF
@@ -66,8 +68,6 @@ services:
      - 'SPRING_RABBITMQ_HOST=rabbitmq'
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
-    volumes:
-      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
@@ -76,6 +76,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit-mgmt"
+    volumes:
+      - artifactrepo:/app/artifactrepo

 volumes:
  artifactrepo:
--- a/docker/mysql/docker-compose-monolith-dbinit-mysql.yml
+++ b/docker/mysql/docker-compose-monolith-dbinit-mysql.yml
@@ -50,8 +50,6 @@ services:
      - 'SPRING_RABBITMQ_HOST=rabbitmq'
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
-    volumes:
-      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
@@ -60,6 +58,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit"
+    volumes:
+      - artifactrepo:/app/artifactrepo

 volumes:
  artifactrepo:
--- a/docker/mysql/docker-compose-monolith-mysql.yml
+++ b/docker/mysql/docker-compose-monolith-mysql.yml
@@ -26,8 +26,6 @@ services:
      - 'SPRING_RABBITMQ_HOST=rabbitmq'
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
-    volumes:
-      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
@@ -36,6 +34,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit"
+    volumes:
+      - artifactrepo:/app/artifactrepo

 volumes:
  artifactrepo:
--- a/docker/postgres/docker-compose-micro-services-dbinit-postgres.yml
+++ b/docker/postgres/docker-compose-micro-services-dbinit-postgres.yml
@@ -59,6 +59,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit-ddi"
+    volumes:
+      - artifactrepo:/app/artifactrepo

  # ---------------------
  # HawkBit DMF
@@ -94,8 +96,6 @@ services:
      - 'SPRING_RABBITMQ_HOST=rabbitmq'
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
-    volumes:
-      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
@@ -104,6 +104,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit-mgmt"
+    volumes:
+      - artifactrepo:/app/artifactrepo

 volumes:
  artifactrepo:
--- a/docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml
+++ b/docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml
--- a/docker/postgres/docker-compose-micro-services-postgres.yml
+++ b/docker/postgres/docker-compose-micro-services-postgres.yml
@@ -35,6 +35,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit-ddi"
+    volumes:
+      - artifactrepo:/app/artifactrepo

  # ---------------------
  # HawkBit DMF
@@ -69,8 +71,6 @@ services:
      - 'SPRING_RABBITMQ_HOST=rabbitmq'
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
-    volumes:
-      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
@@ -79,6 +79,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit-mgmt"
+    volumes:
+      - artifactrepo:/app/artifactrepo

 volumes:
  artifactrepo:
--- a/docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml
+++ b/docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml
--- a/docker/postgres/docker-compose-monolith-dbinit-postgres.yml
+++ b/docker/postgres/docker-compose-monolith-dbinit-postgres.yml
@@ -52,8 +52,6 @@ services:
      - 'SPRING_RABBITMQ_HOST=rabbitmq'
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
-    volumes:
-      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
@@ -62,6 +60,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit"
+    volumes:
+      - artifactrepo:/app/artifactrepo

 volumes:
  artifactrepo:
--- a/docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml
+++ b/docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml
--- a/docker/postgres/docker-compose-monolith-postgres.yml
+++ b/docker/postgres/docker-compose-monolith-postgres.yml
@@ -27,8 +27,6 @@ services:
      - 'SPRING_RABBITMQ_HOST=rabbitmq'
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
-    volumes:
-      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
@@ -37,6 +35,8 @@ services:
        condition: service_healthy
    labels:
      NAME: "hawkbit"
+    volumes:
+      - artifactrepo:/app/artifactrepo

 volumes:
  artifactrepo:
--- a/docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml
+++ b/docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml
--- a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/banner.txt
+++ b/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/banner.txt
@@ -10,5 +10,5 @@ ______     _ _                  _                    _    ____  _ _     _____  _
 Eclipse hawkBit DDI Server ${application.formatted-version}
 using Spring Boot ${spring-boot.formatted-version}

-Go to https://www.eclipse.org/hawkbit for more information.
+Go to https://hawkbit.eclipse.dev for more information.
        
--- a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/banner.txt
+++ b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/banner.txt
@@ -10,5 +10,5 @@ ______     _ _                  _                    _    ____  _ _     _____  _
 Eclipse hawkBit DMF Server ${application.formatted-version}
 using Spring Boot ${spring-boot.formatted-version}

-Go to https://www.eclipse.org/hawkbit for more information.
+Go to https://hawkbit.eclipse.dev for more information.
        
--- a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/banner.txt
+++ b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/banner.txt
@@ -10,5 +10,5 @@ ______     _ _                  _                    _    ____  _ _     __  __
 Eclipse hawkBit Management Server ${application.formatted-version}
 using Spring Boot ${spring-boot.formatted-version}

-Go to https://www.eclipse.org/hawkbit for more information.
+Go to https://hawkbit.eclipse.dev for more information.
        
--- a/hawkbit-monolith/hawkbit-update-server/src/main/resources/banner.txt
+++ b/hawkbit-monolith/hawkbit-update-server/src/main/resources/banner.txt
@@ -10,5 +10,5 @@
 Eclipse hawkBit Update Server ${application.formatted-version}
 using Spring Boot ${spring-boot.formatted-version}

-Go to https://www.eclipse.org/hawkbit for more information.
+Go to https://hawkbit.eclipse.dev for more information.
        
--- a/hawkbit-ui/src/main/resources/banner.txt
+++ b/hawkbit-ui/src/main/resources/banner.txt
@@ -4,15 +4,14 @@ ______     _ _                  _                    _    ____  _ _
 |  __| / __| | | '_ \/ __|/ _ \ | '_ \ / _` \ \ /\ / / |/ /  _ <| | __|
 | |___| (__| | | |_) \__ \  __/ | | | | (_| |\ V  V /|   <| |_) | | |_ 
 |______\___|_|_| .__/|___/\___|_|_| |_|\__,_|_\_/\_/ |_|\_\____/|_|\__|
-   / ____(_)| |            | |      | |  | |_   _|                  
-  | (___  _ |_|_ ___  _ __ | | ___  | |  | | | |                    
-   \___ \| | '_ ` _ \| '_ \| |/ _ \ | |  | | | |                    
-   ____) | | | | | | | |_) | |  __/ | |__| |_| |_                   
-  |_____/|_|_| |_| |_| .__/|_|\___|  \____/|_____|                  
-					 | |                                            
-					 |_|                     
+                       | |  | |_   _|
+                       | |  | | | |
+                       | |  | | | |
+                       | |__| |_| |_
+                        \____/|_____|
+

 Eclipse hawkBit UI ${application.formatted-version}
 using Spring Boot ${spring-boot.formatted-version}

-Go to https://www.eclipse.org/hawkbit for more information.
+Go to https://hawkbit.eclipse.dev for more information.
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
        <sonar.branch.name>LOCAL_SCAN</sonar.branch.name>
        <sonar.qualitygate.wait>true</sonar.qualitygate.wait>
        <sonar.qualitygate.timeout>600</sonar.qualitygate.timeout>
-        <sonar.links.homepage>https://www.eclipse.org/hawkbit</sonar.links.homepage>
+        <sonar.links.homepage>https://hawkbit.eclipse.dev/</sonar.links.homepage>
        <sonar.links.ci>https://github.com/eclipse-hawkbit/hawkbit/actions</sonar.links.ci>
        <sonar.coverage.exclusions>
            **/*Configuration.java,