Merge branch 'master' into development

ontoportal-lirmm · Jun 5, 2024 · a834f5b · a834f5b
2 parents ad6c578 + a90b97c
commit a834f5b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -1,12 +1,17 @@
-name: Docker Image CI
+name: Docker branch Images build
 
 on:
+  push:
+    branches:
+      - master
+      - development
+      - stage
+      - test
   release:
-    types: [published]
-
+    types: [ published ]
 jobs:
   push_to_registry:
-    name: Push Docker image to Docker Hub
+    name: Push Docker branch image to Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
@@ -19,24 +24,33 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: bioportal/ncbo_cron
+          images: |
+            agroportal/ncbo_cron
+            ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           build-args: |
-            RUBY_VERSION=2.7
+            RUBY_VERSION=2.7.8
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/bin/ncbo_ontology_import b/bin/ncbo_ontology_import
@@ -89,7 +89,7 @@ def create_ontology(ont_info)
     has_domains << category if category
   end
 
-  new_ontology.groups = groups
+  new_ontology.group = groups
   new_ontology.hasDomain = has_domains
   new_ontology
 end
@@ -106,6 +106,10 @@ def upload_submission(sub_info, ontology)
     sub_info['pullLocation'] = "#{sub_info['ontology']['links']['download']}?apikey=#{SOURCE_APIKEY}"
   end
 
+  if sub_info['URI'].blank?
+    sub_info['URI'] = "#{sub_info['id']}"
+  end
+
   # Build the json body
   # hasOntologyLanguage options: OWL, UMLS, SKOS, OBO
   # status: alpha, beta, production, retired