cd

Author: Manojkr0

.github/workflows/docker-image.yml

@@ -7,16 +7,14 @@ on:
     branches: [ "main" ]
 
 jobs:
-  runs-on: ubuntu-latest
-
   build:
     needs: analyze
-
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Build the Docker image
-        run: docker build . --file Dockerfile --tag javafile:123
+        run: docker build . --file Dockerfile --tag javafile:${{github.sha}}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -31,10 +29,10 @@ jobs:
         with:
           context: .
           push: true
-          tags: manojkumar8008/javafile:1234
+          tags: javafile:${{github.sha}}
   analyze:
     name: Analyze
-
+    runs-on: ubuntu-latest
     permissions:
       security-events: write  # Required for CodeQL to upload results
       actions: read
@@ -60,16 +58,19 @@ jobs:
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
   deploy:
-    needs: ["build,analyze"]
+    needs: build
+    runs-on: ubuntu-latest
     steps:
       - name: Deploy Docker image on EC2
         uses: appleboy/ssh-action@v1.0.3
         with:
           host: ${{ vars.EC2_HOST }}
           username: ${{ vars.EC2_USER }}
           key: ${{ secrets.EC2_KEY }}
-          script: |
-            docker pull manojkumar8008/javafile:1234
-            docker run -d -p 80:8080 manojkumar8008/javafile:1234
+          script: |
+            sudo docker pull javafile:${{github.sha}}
+            sudo docker stop hello-world || true
+            sudo docker rm hello-world || true
+            sudo docker run -d --name hello-world -p 80:8080 javafile:${{github.sha}}
           
             

src/main/java/com/dockerforjavadevelopers/hello/HelloController.java

@@ -9,7 +9,7 @@ public class HelloController {
 
     @RequestMapping("/")
     public String index() {
-        return "Hello World\n";
+        return "Hello java\n";
     }
 
 }