chore: microcks#953 Preparing next iteration

Signed-off-by: Laurent Broudoux <laurent.broudoux@gmail.com> Signed-off-by: Appadoo Apoorva Srinivas <apoorva.appadoo@orange.com>
Orange-OpenSource · Feb 12, 2024 · e216e84 · e216e84
1 parent d6852bb
commit e216e84
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 15 deletions.
diff --git a/install/docker-compose/docker-compose-async-addon.yml b/install/docker-compose/docker-compose-async-addon.yml
@@ -36,7 +36,7 @@ services:
       - mongo
       - keycloak
       - postman
-    image: quay.io/microcks/microcks:1.8.0-fix-1
+    image: quay.io/microcks/microcks:nightly
     container_name: microcks
     volumes:
       - "./config:/deployments/config"
@@ -61,7 +61,7 @@ services:
       - app
     ports:
       - "8081:8081"
-    image: quay.io/microcks/microcks-async-minion:1.8.0-fix-1
+    image: quay.io/microcks/microcks-async-minion:nightly
     container_name: microcks-async-minion
     restart: on-failure
     volumes:

diff --git a/install/docker-compose/docker-compose-devmode.yml b/install/docker-compose/docker-compose-devmode.yml
@@ -28,7 +28,7 @@ services:
     depends_on:
       - mongo
       - postman
-    image: quay.io/microcks/microcks:1.8.0-fix-1
+    image: quay.io/microcks/microcks:nightly
     container_name: microcks
     volumes:
       - "./config:/deployments/config"
@@ -52,7 +52,7 @@ services:
       - app
     ports:
       - "8081:8081"
-    image: quay.io/microcks/microcks-async-minion:1.8.0-fix-1
+    image: quay.io/microcks/microcks-async-minion:nightly
     container_name: microcks-async-minion
     restart: on-failure
     volumes:

diff --git a/install/docker-compose/docker-compose.yml b/install/docker-compose/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       - mongo
       - keycloak
       - postman
-    image: quay.io/microcks/microcks:1.8.0-fix-1
+    image: quay.io/microcks/microcks:nightly
     container_name: microcks
     ports:
       - "8080:8080"

diff --git a/install/kubernetes/microcks/values.yaml b/install/kubernetes/microcks/values.yaml
@@ -11,7 +11,7 @@ microcks:
   #ingressClassName: nginx
   #grpcIngressClassName: nginx
   generateCert: true
-  image: quay.io/microcks/microcks:1.8.0-fix-1
+  image: quay.io/microcks/microcks:nightly
   replicas: 1
   # Uncomment to change Microcks Service to a NodePort
   #serviceType: NodePort
@@ -138,7 +138,7 @@ features:
     defaultFrequency: 10
     defaultAvroEncoding: RAW
 
-    image: quay.io/microcks/microcks-async-minion:1.8.0-fix-1
+    image: quay.io/microcks/microcks-async-minion:nightly
 
     kafka:
       install: true

diff --git a/install/podman-compose/microcks-template-async-addon.yml b/install/podman-compose/microcks-template-async-addon.yml
@@ -36,7 +36,7 @@ services:
       - mongo
       - keycloak
       - postman
-    image: quay.io/microcks/microcks:1.8.0-fix-1
+    image: quay.io/microcks/microcks:nightly
     container_name: microcks
     volumes:
       - "./config:/deployments/config"
@@ -61,7 +61,7 @@ services:
       - app
     ports:
       - "8081:8081"
-    image: quay.io/microcks/microcks-async-minion:1.8.0-fix-1
+    image: quay.io/microcks/microcks-async-minion:nightly
     container_name: microcks-async-minion
     restart: on-failure
     volumes:

diff --git a/install/podman-compose/microcks-template-devmode.yml b/install/podman-compose/microcks-template-devmode.yml
@@ -18,7 +18,7 @@ services:
     depends_on:
       - mongo
       - postman
-    image: quay.io/microcks/microcks:1.8.0-fix-1
+    image: quay.io/microcks/microcks:nightly
     container_name: microcks
     volumes:
       - "./config:/deployments/config"

diff --git a/install/podman-compose/microcks-template.yml b/install/podman-compose/microcks-template.yml
@@ -34,7 +34,7 @@ services:
       - mongo
       - postman
       - keycloak
-    image: quay.io/microcks/microcks:1.8.0-fix-1
+    image: quay.io/microcks/microcks:nightly
     container_name: microcks
     ports:
       - "8080:8080"

diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -19,7 +19,7 @@
     <maven.compiler.target>17</maven.compiler.target>
     <junit.version>4.13.1</junit.version>
     <bouncycastle.version>1.70</bouncycastle.version>
-    <snakeyaml.version>2.0</snakeyaml.version>
+    <snakeyaml.version>2.2</snakeyaml.version>
     <mongo-java-server.version>1.43.0</mongo-java-server.version>
     <apache-httpclient.version>5.2.1</apache-httpclient.version>
     <commons-lang3.version>3.13.0</commons-lang3.version>
@@ -457,9 +457,7 @@
             <version>1.2.2</version>
             <configuration>
               <imageName>${docker.image.prefix}/${docker.image.name}</imageName>
-              <!-- <dockerDirectory>src/main/docker</dockerDirectory> -->
-              <dockerDirectory>src/main/docker/ubi</dockerDirectory>
-              <!-- <dockerDirectory>src/main/docker/fabric8-ubi</dockerDirectory> -->
+              <dockerDirectory>src/main/docker</dockerDirectory>
               <resources>
                 <resource>
                   <targetPath>/</targetPath>