Merge remote-tracking branch 'origin/develop' into develop

jaguililla · Dec 7, 2024 · a7d9da0 · a7d9da0
2 parents e68da79 + ee06202
commit a7d9da0
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 35 deletions.
diff --git a/.mvn/parent.xml b/.mvn/parent.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.4</version>
+    <version>3.4.0</version>
     <relativePath/>
   </parent>
 
@@ -127,42 +127,13 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <docker>
-            <publishRegistry>
-              <username>${env.REGISTRY_USERNAME}</username>
-              <password>${env.REGISTRY_PASSWORD}</password>
-            </publishRegistry>
-          </docker>
-          <image>
-            <name>${image.registry}/${image.name}:${project.version}</name>
-            <tags>
-              <tag>${image.registry}/${image.name}:latest</tag>
-            </tags>
-            <env>
-              <JAVA_TOOL_OPTIONS>
-                -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
-              </JAVA_TOOL_OPTIONS>
-              <BPL_SPRING_AOT_ENABLED>true</BPL_SPRING_AOT_ENABLED>
-              <BP_SPRING_AOT_ENABLED>true</BP_SPRING_AOT_ENABLED>
-              <BP_JVM_VERSION>${java.version}</BP_JVM_VERSION>
-            </env>
-          </image>
-        </configuration>
-        <executions>
-          <execution>
-            <id>image</id>
-            <goals>
-              <goal>build-image</goal>
-            </goals>
-            <phase>verify</phase>
-          </execution>
-        </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
@@ -421,5 +392,48 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>buildpack</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-maven-plugin</artifactId>
+            <configuration>
+              <docker>
+                <publishRegistry>
+                  <username>${env.REGISTRY_USERNAME}</username>
+                  <password>${env.REGISTRY_PASSWORD}</password>
+                </publishRegistry>
+              </docker>
+              <image>
+                <name>${image.registry}/${image.name}:${project.version}</name>
+                <tags>
+                  <tag>${image.registry}/${image.name}:latest</tag>
+                </tags>
+                <env>
+                  <JAVA_TOOL_OPTIONS>
+                    -XX:+AlwaysPreTouch -XX:+UseParallelGC -XX:+UseNUMA
+                  </JAVA_TOOL_OPTIONS>
+                  <BPL_SPRING_AOT_ENABLED>true</BPL_SPRING_AOT_ENABLED>
+                  <BP_SPRING_AOT_ENABLED>true</BP_SPRING_AOT_ENABLED>
+                  <BP_JVM_VERSION>${java.version}</BP_JVM_VERSION>
+                </env>
+              </image>
+            </configuration>
+            <executions>
+              <execution>
+                <id>image</id>
+                <goals>
+                  <goal>build-image</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - data:/var/lib/postgresql/data
       - ./src/test/resources/db:/docker-entrypoint-initdb.d
     ports:
-      - "15432:5432"
+      - "127.0.0.1:15432:5432"
 
   kafka:
     image: docker.io/apache/kafka-native:3.8.0
@@ -33,7 +33,7 @@ services:
       KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
       KAFKA_LOG_DIRS: /tmp/kraft-combined-logs
     ports:
-      - "9092:9092"
+      - "127.0.0.1:9092:9092"
 
   appointments:
     profiles: [ local ]
@@ -49,7 +49,7 @@ services:
       JDBC_PASSWORD: root
       KAFKA_SERVER: kafka:19092
     ports:
-      - "18080:8080"
+      - "127.0.0.1:18080:8080"
 
 volumes:
   data: