Updated flow

davisdre · Sep 11, 2024 · f9226b9 · f9226b9
1 parent 4da1530
commit f9226b9
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 23 deletions.
diff --git a/.github/workflows/docker-image-main.yml b/.github/workflows/docker-image-main.yml
@@ -1,26 +1,32 @@
-name: Docker image (main)
+name: Build and Push Docker Image (Main)
 
 on:
   push:
     branches:
-      - "main"
+      - main    # Adjust this to your preferred branch
 
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
-      -
-        name: Login to Docker Hub
+      # Step 1: Checkout the repository
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # Step 2: Login to Docker
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          tags: ${{ vars.DOCKERHUB_USERNAME }}/littlelink:latest
+
+      # Step 3: Build and Push Docker image (Docker CLI is pre-installed in GitHub-hosted runners)
+      - name: Build and Push Docker Image
+        run: |
+
+          # Build the Docker image
+          docker build -t ${{ vars.DOCKERHUB_USERNAME }}/littlelink:latest .
+
+          # Push the Docker image to Docker Hub
+          docker push ${{ vars.DOCKERHUB_USERNAME }}/littlelink:latest
diff --git a/.github/workflows/docker-image-release.yml b/.github/workflows/docker-image-release.yml
@@ -1,4 +1,4 @@
-name: Docker image (release)
+name: Build and Push Docker Image (Main)
 
 on:
   release:
@@ -7,18 +7,25 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
+      # Step 1: Checkout the repository
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # Step 2: Login to Docker
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          tags: ${{ vars.DOCKERHUB_USERNAME }}/littlelink:${{ github.event.release.tag_name }}
+
+      # Step 3: Build and Push Docker image (Docker CLI is pre-installed in GitHub-hosted runners)
+      - name: Build and Push Docker Image
+        run: |
+
+          # Build the Docker image
+          docker build -t ${{ vars.DOCKERHUB_USERNAME }}/littlelink:${{ github.event.release.tag_name }} .
+
+          # Push the Docker image to Docker Hub
+          docker push ${{ vars.DOCKERHUB_USERNAME }}/littlelink:${{ github.event.release.tag_name }}