Merge pull request #12435 from eugenp/BAEL-54445-readmes

BAEL-54445 reorganize docker modules

docker-modules/docker-compose/README.md

@@ -1,4 +1,5 @@
 ## Relevant Articles:
 
 - [Introduction to Docker Compose](https://www.baeldung.com/ops/docker-compose)
+- [How to Get Docker-Compose to Always Use the Latest Image](https://www.baeldung.com/ops/docker-compose-latest-image)
 

docker-modules/docker-compose/pom.xml

@@ -3,8 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>docker-sample-app</artifactId>
+    <artifactId>docker-compose</artifactId>
-    <name>docker-sample-app</name>
     <description>Demo project for Spring Boot and Docker</description>
 
      <parent>
@@ -40,8 +39,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <java.version>11</java.version>
-    </properties>
-
 </project>

docker-modules/docker-containers/README.md

@@ -0,0 +1,2 @@
+### Relevant Articles:
+

docker-modules/docker-containers/pom.xml

@@ -4,9 +4,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.docker</groupId>
-    <artifactId>heap-sizing</artifactId>
+    <artifactId>docker-containers</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>heap-sizing</name>
     <description>Demo project for Spring Boot</description>
 
     <parent>
@@ -40,7 +39,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <image>
-                        <name>heapsizing-demo</name>
+                        <name>docker-demo</name>
                     </image>
                 </configuration>
             </plugin>
@@ -50,15 +49,11 @@
                 <version>2.7.1</version>
                 <configuration>
                     <to>
-                        <image>heapsizing-demo-jib</image>
+                        <image>docker-demo-jib</image>
                     </to>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <properties>
-        <java.version>11</java.version>
-    </properties>
-
 </project>

docker-modules/docker-images/README.md

@@ -1,3 +1,4 @@
 ### Relevant Articles:
 
 - [Pushing a Docker Image to a Private Repository](https://www.baeldung.com/ops/docker-push-image-to-private-repository)
+- [How to Include Files Outside of Docker’s Build Context](https://www.baeldung.com/ops/docker-include-files-outside-build-context)

docker-modules/docker-images/pom.xml

@@ -3,9 +3,8 @@
     xmlns="http://maven.apache.org/POM/4.0.0"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>docker-push-to-private-repo</artifactId>
+    <artifactId>docker-images</artifactId>
-    <name>docker-push-to-private-repo</name>
+    <description>Example application to showcase Docker images features</description>
-    <description>Example application to showcase how to push a docker image to a private repository</description>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -40,8 +39,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <java.version>11</java.version>
-    </properties>
-
 </project>

docker-modules/docker-images/src/main/java/com/baeldung/docker/MainApplication.java

@@ -1,13 +1,13 @@
-package com.baeldung.docker.push;
+package com.baeldung.docker;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class PushToPrivateRepoApplication {
+public class MainApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(PushToPrivateRepoApplication.class, args);
+        SpringApplication.run(MainApplication .class, args);
     }
 
 }

docker-modules/docker-images/src/main/java/com/baeldung/docker/controllers/HelloWorldController.java

@@ -1,4 +1,4 @@
-package com.baeldung.docker.push;
+package com.baeldung.docker.controllers;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

docker-modules/docker-include-outside-build-context/README.md

@@ -1,3 +0,0 @@
-## Relevant Articles:
-
-- [How to Include Files Outside of Docker’s Build Context](https://www.baeldung.com/ops/docker-include-files-outside-build-context)