Modified to push to ghcr & version bump

FNNDSC · Oct 19, 2021 · d05ded6 · d05ded6
1 parent 00f8c85
commit d05ded6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -88,6 +88,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v2
@@ -98,6 +105,7 @@ jobs:
           tags: |
             ${{ steps.determine.outputs.dock_image }}
             localhost:5000/${{ steps.determine.outputs.dock_image }}
+            ghcr.io/${{ steps.determine.outputs.dock_image }}
           platforms: linux/amd64
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache

diff --git a/dcm_tagExtract/dcm_tagExtract.py b/dcm_tagExtract/dcm_tagExtract.py
@@ -210,8 +210,8 @@ class Dcm_tagExtract(ChrisApp):
     ICON                    = ''   # url of an icon image
     MIN_NUMBER_OF_WORKERS   = 1    # Override with the minimum number of workers as int
     MAX_NUMBER_OF_WORKERS   = 1    # Override with the maximum number of workers as int
-    MIN_CPU_LIMIT           = 1000 # Override with millicore value as int (1000 millicores == 1 CPU core)
-    MIN_MEMORY_LIMIT        = 200  # Override with memory MegaByte (MB) limit as int
+    MIN_CPU_LIMIT           = 2000 # Override with millicore value as int (1000 millicores == 1 CPU core)
+    MIN_MEMORY_LIMIT        = 2000  # Override with memory MegaByte (MB) limit as int
     MIN_GPU_LIMIT           = 0    # Override with the minimum number of GPUs as int
     MAX_GPU_LIMIT           = 0    # Override with the maximum number of GPUs as int
 

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name             = 'dcm_tagExtract',
-    version          = '3.1.2',
+    version          = '3.1.3',
     description      = 'This app performs a recursive walk down an input tree, and for each location with a DICOM file, will generate a report in the corresponding location in the output tree.',
     long_description = readme,
     author           = 'Sandip Samal',