Added dockerization.

Author: developersCradle

README.md

@@ -62,7 +62,7 @@ You get bonus points if:
     - ❌ **RestTemplate** ❌ Older way to make calls in Spring and synchronous. [RestTemplate](https://www.baeldung.com/rest-template).
     - ❌ **Feign Client** ❌ Also synchronous. [Feign Client](https://www.baeldung.com/spring-boot-feignclient-vs-webclient).
 - [![Netty](https://img.shields.io/badge/Netty-grey?style=for-the-badge&logo=googleearth&logoColor=FFFFFF)](https://projectreactor.io/docs/netty/1.1.21/reference/index.html).
-    - ✅**Netty**✅ is suited for Microservices Architecture, for its non-blocking I/O client-server nature.
+    - ✅**Netty**✅ is suited for Microservices Architecture, for its non-blocking I/O client-server nature. This for bank end.
 - [![Lombok](https://img.shields.io/badge/Lombok-green?style=for-the-badge)](https://docs.spring.io/spring-framework/reference/web/webflux.html). 
     - ✅**Lombok**✅ For reducing boilerplate code.
 
@@ -78,6 +78,7 @@ You get bonus points if:
 - I have decided to use **ResponseEntity** in **Controller** class. [ReadMore](https://www.baeldung.com/spring-response-entity).
 
 > While **ResponseEntity** is very powerful, we shouldn’t overuse it. In simple cases, there are other options that satisfy our needs and they result in much cleaner code.
+
 - We are making tests!
     - **Unit Tests**:
         - For Bean Validation.
@@ -86,7 +87,15 @@ You get bonus points if:
         - [![WebTestClient](https://img.shields.io/badge/WebTestClient-grey?style=for-the-badge&logo=spring)](https://docs.spring.io/spring-framework/reference/testing/webtestclient.html).
             - Inside Spring application.
         - [![WireMock](https://img.shields.io/badge/WireMock%20-grey?style=for-the-badge)](https://wiremock.org/).
-            - For testing external APIs. In progress ♻️ **Could not get this working, for now** ♻️.
+            - ✅**WireMock**✅ for testing external APIs. In progress ♻️ **Could not get this working, for now** ♻️.
+- [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://www.docker.com/) 
+    - ✅**Docker**✅ for easy deployment. 
+
+- [![Angular](https://img.shields.io/badge/Angular-DD0031?style=for-the-badge&logo=angular&logoColor=white)](#)
+    - ✅**Angular**✅  front end, because i like it!
+
+- [![nginx](https://img.shields.io/badge/nginx-grey?style=for-the-badge&logo=nginx)](https://nginx.org/en/)
+    - ✅**Nginx**✅ for hosting front end.
 
 - API versioning:
     - ✅**URI Path Versioning**✅, were chosen for its popularity.
@@ -98,6 +107,10 @@ You get bonus points if:
 
 - Country letter representation "**two letters**" [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) will be used, since it was in specifications.
 
+### Prerequisites:
+- Lates java JDK is fine to run commands.
+- Latest Docker.
+
 # Not sure things ⚠️👀?
 
 - I am not sure that, am i  utilizing the  **.subscribe** rightly. Like in this example, i don't have any of such in code directly `.subscribe(this::someFunction, this::someFunctionIfErrorHappened);`. My service is simple passing data to front end by means of **Project Reactor**. Well, yes if there would be db attached, then this would be suitable approach, but i didn't come any use for such case.
@@ -112,19 +125,18 @@ Get the repository.
 git clone https://github.com/developersCradle/springboot-microservices.git
 ```
 
-# Docker way (Preferred!). ⚠️ Start separately fe and be for now! ⚠️
+# Docker way (Preferred!).
 
--  Compile your Maven project, run tests, and package it into a JAR.
+For now just start the containers by running the following command: 
 
 ```bash
-./mvnw package
+docker-compose up --build
 ```
 
- ♻️ **Under progress** ♻️ This could possible in one command leveraging a multi-step process. For now just start the containers by running the following command: 
+- Front end will be in `http://localhost:8081/`.
+- Back end will be example `http://localhost:8080/countries/v1/`. 
 
-```bash
-docker compose up
-```
+⚠️ fix WireMock, so you can remove skip test flag! ⚠️
 
 # Front end.
 

country-service-backend/Dockerfile

@@ -0,0 +1,27 @@
+#Includes maven!
+FROM maven:3.8.7-eclipse-temurin-17 AS build
+
+# Set the working directory
+WORKDIR /app
+
+# Copy the pom.xml and source code to the container
+COPY pom.xml .
+COPY src ./src
+
+# Build the application, skipping tests. TODO(HEIKKI) WireMock wokring, so can test integration test correctly.
+RUN mvn clean package -DskipTests
+
+# Use a lightweight JDK image to run the app
+FROM openjdk:17-jdk-slim
+
+# Set the working directory
+WORKDIR /app
+
+# Copy the built JAR file from the Maven build stage
+COPY --from=build /app/target/*.jar app.jar
+
+# Expose the application port (default 8080 for Spring Boot)
+EXPOSE 8080
+
+# Run the application
+ENTRYPOINT ["java", "-jar", "app.jar"]

country-service-backend/src/main/resources/application.yml

@@ -1,12 +1,17 @@
 # We are making this configuration here, because if there would be more environments for this microservice to be ran on it would be easier for uss. Also for better manage the API versioning.
 spring:
     profiles:
-        active: local
+        active: local # By default local is activated.
     application:
         name: country-service-backend
 restClient:
     countriesNowUrl: https://countriesnow.space/api/v0.1/countries/
 ---
-# different env non-pod
+spring:
+    config:
+        activate:
+            on-profile: 
+                - non-prod # If profile is non-prod, use what inside these ones.
+---
+# Different env prod
 ---
-# different env prod

country-service-front/Dockerfile

@@ -0,0 +1,32 @@
+# Build the Angular application
+FROM node:16 AS build
+
+# Set the working directory
+WORKDIR /app
+
+# Copy package.json and package-lock.json
+COPY package.json package-lock.json ./
+
+# Install dependencies
+RUN npm install --production
+
+# Copy the rest of the application code
+COPY . .
+
+# Build the Angular application
+RUN npm run build --prod
+
+# Serve the application using Nginx
+FROM nginx:alpine
+
+# Remove default Nginx index page
+RUN rm /usr/share/nginx/html/*
+
+# Copy the built Angular app from the previous stage
+COPY --from=build /app/dist/country-service-front /usr/share/nginx/html
+
+# Expose the port that Nginx will run on
+EXPOSE 80
+
+# Start Nginx
+CMD ["nginx", "-g", "daemon off;"]

country-service-front/nginx.conf

@@ -0,0 +1,18 @@
+server {
+    listen 80;
+    server_name localhost;
+
+    location / {
+        root /usr/share/nginx/html;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location / {  # Assuming your API endpoints start with /api
+        proxy_pass http://backend-service:8080;  # Spring WebFlux service URL
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_cache_bypass $http_upgrade;
+    }
+}

country-service-front/src/environments/environment.prod.ts

@@ -1,3 +1,4 @@
 export const environment = {
-  production: true
+  production: true,
+  apiUrl: 'http://localhost:8080/countries/v1/'
 };

docker-compose.yml

@@ -0,0 +1,27 @@
+version: '3.8'
+
+services:
+  spring-app:
+    build:
+      context: ./country-service-backend  # Path to the folder where your backend Dockerfile is located.
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080" # Standard way to map, same port inside and outside.
+    environment:
+      SPRING_PROFILES_ACTIVE: local  # Set active Spring profile, this is default usually.
+    restart: always  # Should always restart if it stops, regardless of the exit status.
+
+  frontend:
+    build:
+      context: ./country-service-front  # Path to the folder where your Angular Dockerfile is located.
+      dockerfile: Dockerfile
+    ports:
+      - "8081:80"  # Exposing the Angular app on port 8081 and nginx exposing inside port 80.
+    depends_on:
+      - spring-app  # Front end waits for backend
+    restart: always # Should always restart if it stops, regardless of the exit status.
+
+
+
+
+