Merge pull request #71 from NFDI4Chem/dev-nisha

feat: add automated build for nmr-cli
NFDI4Chem · Jan 12, 2024 · 175a1ec · 175a1ec
2 parents e237621 + f7f8e42
commit 175a1ec
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -16,7 +16,8 @@ on:
 env:
   DOCKER_HUB_USERNAME : ${{ secrets.DOCKER_USERNAME  }}
   DOCKER_HUB_PASSWORD : ${{ secrets.DOCKER_PASSWORD  }}
-  REPOSITORY_NAME: nmrkit
+  NMRKIT_REPOSITORY_NAME: nmrkit
+  NMR_CLI_REPOSITORY_NAME: nmr-cli
   REPOSITORY_NAMESPACE: nfdi4chem
   RELEASE_TAG: dev-latest
 
@@ -27,7 +28,7 @@ jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
-    needs: test_and_lint
+    #needs: test_and_lint
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
@@ -38,14 +39,26 @@ jobs:
           username: ${{ env.DOCKER_HUB_USERNAME  }}
           password: ${{ env.DOCKER_HUB_PASSWORD  }}
 
-      - name: Build and push Docker image
+      - name: Build and push nmrKit Docker image
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile
           push: true
           build-args: |
             RELEASE_VERSION=dev-latest
-          tags: ${{ env.REPOSITORY_NAMESPACE }}/${{ env.REPOSITORY_NAME }}:${{ env.RELEASE_TAG }}
+          tags: ${{ env.REPOSITORY_NAMESPACE }}/${{ env.NMRKIT_REPOSITORY_NAME }}:${{ env.RELEASE_TAG }}
+          username: ${{ env.DOCKER_HUB_USERNAME  }}
+          password: ${{ env.DOCKER_HUB_PASSWORD  }}
+
+      - name: Build and push nmr-cli Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: ./app/scripts/nmr-cli/
+          file: ./app/scripts/nmr-cli/Dockerfile
+          push: true
+          build-args: |
+            RELEASE_VERSION=dev-latest
+          tags: ${{ env.REPOSITORY_NAMESPACE }}/${{ env.NMR_CLI_REPOSITORY_NAME }}:${{ env.RELEASE_TAG }}
           username: ${{ env.DOCKER_HUB_USERNAME  }}
           password: ${{ env.DOCKER_HUB_PASSWORD  }}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,13 +28,15 @@ services:
     env_file:
       - ./.env
   nmr-load-save:
-    build: ./app/scripts/nmr-cli
+    #build: ./app/scripts/nmr-cli
+    image: nfdi4chem/nmr-cli:dev-latest
     entrypoint: /bin/sh
     stdin_open: true
     tty: true
     container_name: nmr-converter
   nmr-respredict:
-    build: ./app/scripts/nmr-respredict
+    #build: ./app/scripts/nmr-respredict
+    image: nfdi4chem/nmr-respredict:dev-latest
     entrypoint: /bin/sh
     stdin_open: true
     tty: true