added cd.yml, nginx.conf and updated dockerfiles

Author: paradoxpiyush

.github/workflows/cd.yml

@@ -0,0 +1,146 @@
+name: CD - Deploy to AWS EC2
+
+on:
+  workflow_run:
+    workflows: ["CI - Build and Push Docker Images"]
+    types:
+      - completed
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Setup SSH to EC2 instance
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            # Create docker-compose file if not exists
+            mkdir -p ~/app
+            
+            # Create or update docker-compose.yml
+            cat > ~/app/docker-compose.yml << 'EOL'
+            version: '3.8'
+            
+            services:
+              postgres:
+                image: postgres:13
+                container_name: postgres
+                restart: always
+                environment:
+                  POSTGRES_USER: postgres
+                  POSTGRES_PASSWORD: postgres
+                  POSTGRES_DB: orderdb
+                volumes:
+                  - postgres-data:/var/lib/postgresql/data
+                networks:
+                  - app-network
+            
+              order-api:
+                image: ${{ secrets.DOCKERHUB_USERNAME }}/order-api:latest
+                container_name: order-api
+                restart: always
+                depends_on:
+                  - postgres
+                environment:
+                  SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/orderdb
+                  SPRING_DATASOURCE_USERNAME: postgres
+                  SPRING_DATASOURCE_PASSWORD: postgres
+                ports:
+                  - "8080:8080"
+                networks:
+                  - app-network
+            
+              order-ui:
+                image: ${{ secrets.DOCKERHUB_USERNAME }}/order-ui:latest
+                container_name: order-ui
+                restart: always
+                depends_on:
+                  - order-api
+                environment:
+                  REACT_APP_API_URL: http://${{ secrets.EC2_HOST }}:8080
+                ports:
+                  - "80:80"
+                networks:
+                  - app-network
+            
+              prometheus:
+                image: prom/prometheus:v2.40.0
+                container_name: prometheus
+                restart: always
+                volumes:
+                  - ~/app/prometheus.yml:/etc/prometheus/prometheus.yml
+                  - prometheus-data:/prometheus
+                ports:
+                  - "9090:9090"
+                networks:
+                  - app-network
+            
+              grafana:
+                image: grafana/grafana:9.2.4
+                container_name: grafana
+                restart: always
+                depends_on:
+                  - prometheus
+                volumes:
+                  - grafana-data:/var/lib/grafana
+                ports:
+                  - "3000:3000"
+                networks:
+                  - app-network
+            
+            volumes:
+              postgres-data:
+              prometheus-data:
+              grafana-data:
+            
+            networks:
+              app-network:
+                driver: bridge
+            EOL
+            
+            # Create prometheus.yml configuration
+            cat > ~/app/prometheus.yml << 'EOL'
+            global:
+              scrape_interval: 15s
+            
+            scrape_configs:
+              - job_name: 'prometheus'
+                static_configs:
+                  - targets: ['localhost:9090']
+              
+              - job_name: 'spring-actuator'
+                metrics_path: '/actuator/prometheus'
+                static_configs:
+                  - targets: ['order-api:8080']
+            EOL
+            
+            # Pull the latest images
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/order-api:latest
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/order-ui:latest
+            
+            # Stop and remove existing containers
+            cd ~/app
+            docker-compose down || true
+            
+            # Start new containers
+            docker-compose up -d
+            
+            # Clean up unused images
+            docker image prune -af

order-api/Dockerfile

@@ -1,3 +1,18 @@
+FROM maven:3.8-openjdk-17-slim AS build
+WORKDIR /app
+COPY pom.xml .
+COPY .mvn/ .mvn/
+COPY mvnw .
+RUN chmod +x mvnw
+# Download dependencies first (for better caching)
+RUN ./mvnw dependency:go-offline -B
+
+# Copy source and build
+COPY src/ src/
+RUN ./mvnw package -DskipTests
+
+################################################################################3
+
 # Use a lightweight JRE for runtime
 FROM eclipse-temurin:17-jre-alpine
 
@@ -7,11 +22,19 @@ WORKDIR /app
 # Install jq
 RUN apk --no-cache add jq
 
-# Copy the built jar file
-COPY target/order-api-0.0.1-SNAPSHOT.jar app.jar
+# Create a non-root user
+RUN addgroup -S spring && adduser -S spring -G spring
+USER spring:spring
+
+# Copy the jar file from the build stage
+COPY --from=build /app/target/*.jar app.jar
 
 # Expose the application port
 EXPOSE 8080
 
+# Set healthcheck
+HEALTHCHECK --interval=30s --timeout=3s CMD wget -qO- http://localhost:8080/actuator/health || exit 1
+
+
 # Run the application
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "/app/app.jar"]

order-ui/Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 
 # Install dependencies
-RUN npm install
+RUN npm ci
 
 # Copy the entire project
 COPY . .
@@ -21,9 +21,13 @@ FROM nginx:alpine
 
 # Copy the built files to Nginx's HTML directory
 COPY --from=builder /app/build /usr/share/nginx/html
+COPY --from=builder /app/nginx.conf /etc/nginx/conf.d/default.conf
 
 # Expose Nginx default port
 EXPOSE 80
 
+# Health check
+HEALTHCHECK --interval=30s --timeout=3s CMD wget -qO- http://localhost:80 || exit 1
+
 # Start Nginx
 CMD ["nginx", "-g", "daemon off;"]

order-ui/nginx.conf

@@ -0,0 +1,20 @@
+server {
+    listen 80;
+    server_name localhost;
+    
+    location / {
+        root /usr/share/nginx/html;
+        index index.html;
+        try_files $uri $uri/ /index.html;
+    }
+
+    # Proxy API requests to the backend
+    location /api/ {
+        proxy_pass http://order-api:8080/;
+        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;
+    }
+}