Merge pull request #3 from DCOR-dev/enhance_ci_jobs

Create separate CI files for build and push
DCOR-dev · Jan 31, 2025 · 302ef19 · 302ef19
2 parents 64c1a0f + 8e0ed70
commit 302ef19
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 6 deletions.
diff --git a/.github/workflows/build_and_push_dcor.yml → .github/workflows/build_and_push.yml b/.github/workflows/build_and_push_dcor.yml → .github/workflows/build_and_push.yml
@@ -1,11 +1,13 @@
-name: Build and Push DCOR-CKAN Docker Image
+name: Build and Push DCOR-CKAN Docker Images
 
 on:
+  # Trigger the workflow on tag creation in X.Y.Z format,
+  # but only for the master branch
   push:
     branches:
       - master
     tags:
-      - '*.*.*'  # This triggers the workflow on tags that follow the X.Y.Z format
+      - '*.*.*'
 
 jobs:
   build:
@@ -24,6 +26,11 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Set version tag from git tag
+        # Extract version from ref (e.g., refs/tags/0.0.1 => 0.0.1)
+        run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
+
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
@@ -34,7 +41,7 @@ jobs:
           file: ./nginx/Dockerfile
           push: true
           tags: |
-            ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-nginx:${{ github.ref_name  }}
+            ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-nginx:${{ env.VERSION }}
             ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-nginx:latest
 
       - name: Build and Push PostgreSQL Image
@@ -44,7 +51,7 @@ jobs:
           file: ./postgresql/Dockerfile
           push: true
           tags: |
-            ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-postgresql:${{ github.ref_name  }}
+            ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-postgresql:${{ env.VERSION }}
             ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-postgresql:latest
 
       - name: Build and Push CKAN Image
@@ -54,5 +61,5 @@ jobs:
           file: ./ckan/Dockerfile.dev  # Build dcor image from dev
           push: true
           tags: |
-            ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-ckan:${{ github.ref_name  }}
-            ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-ckan:latest
+            ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-ckan:${{ env.VERSION }}
+            ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-ckan:latest
diff --git a/.github/workflows/only_build.yml b/.github/workflows/only_build.yml
@@ -0,0 +1,41 @@
+name: Build DCOR-CKAN Docker Images
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Build NGINX Image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./nginx
+          file: ./nginx/Dockerfile
+          push: false
+          tags: ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-nginx:test-build-only
+
+      - name: Build PostgreSQL Image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./postgresql
+          file: ./postgresql/Dockerfile
+          push: false
+          tags: ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-postgresql:test-build-only
+
+      - name: Build DCOR-CKAN Image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./ckan
+          file: ./ckan/Dockerfile.dev  # Build dcor image from dev
+          push: false
+          tags: ${{ secrets.DOCKER_USERNAME }}/dcor-ckan-docker-ckan:test-build-only
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+0.1.0
+ - enh: create separate ci files for build and push (#1)
 0.1.0
  - initial version of dcor-ckan image
  - build and push dcor-ckan image to dockerhub