Merge branch 'hotfix/1.12.4'

dockstore · Sep 13, 2022 · 71ed2c6 · 71ed2c6
2 parents 8daba68 + 786acdf
commit 71ed2c6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/docs/_attic/glossary_entries_list_dynamic.txt b/docs/_attic/glossary_entries_list_dynamic.txt
@@ -1,4 +1,4 @@
-DO NOT EDIT THIS FILE. This file is autogenerated from _attic/glossary_generator.py, update that instead.
+DO NOT EDIT THIS FILE. This file is autogenerated from glossary_generator.py, update that instead.
 .dockstore.yml
 AGC
 Amazon Genomics CLI

diff --git a/docs/_attic/glossary_generator.py b/docs/_attic/glossary_generator.py
@@ -22,5 +22,5 @@
     if isinstance(glossary_object, GlossEntry):
         dockstore_dictionary.add_entry(glossary_object)
 dockstore_dictionary.sort_entries()
-dockstore_dictionary.write_toc(contents_outfile, format="txt", skipSource=False, sourcefile=__file__)
-dockstore_dictionary.write_glossary(glossary_outfile, sourcefile=__file__)
+dockstore_dictionary.write_toc(contents_outfile, format="txt", skipSource=False, sourcefile=os.path.basename(__file__))
+dockstore_dictionary.write_glossary(glossary_outfile, sourcefile=os.path.basename(__file__))
diff --git a/docs/_static/checksum-support.html b/docs/_static/checksum-support.html
@@ -27,20 +27,20 @@
         <tr style="border-top: 1px solid #ddd;">
             <th style="padding: 5px; font-weight: normal;">Tool (non-hosted)</th>
             <th style="padding: 5px; font-weight: normal;">CWL, WDL</th>
-            <th style="padding: 5px; font-weight: normal;">Quay.io, Docker Hub, Amazon ECR, GitLab</th>
+            <th style="padding: 5px; font-weight: normal;">Quay.io, Docker Hub, Amazon ECR, GitLab, GitHub Container Registry</th>
             <th style="padding: 5px; font-weight: normal;">Refresh</th>
         </tr>
         <tr style="border-top: 1px solid #ddd;">
             <th style="padding: 5px; font-weight: normal;">Workflow</th>
             <th style="padding: 5px; font-weight: normal;">CWL, WDL, Nextflow</th>
-            <th style="padding: 5px; font-weight: normal;">Quay.io, Docker Hub, Amazon ECR</th>
+            <th style="padding: 5px; font-weight: normal;">Quay.io, Docker Hub, Amazon ECR, GitHub Container Registry</th>
             <th style="padding: 5px; font-weight: normal;">Snapshot</th>
         </tr>
         <tr style="border-top: 1px solid #ddd;">
             <th style="padding: 5px; font-weight: normal;">GitHub App Tool</th>
             <th style="padding: 5px; font-weight: normal;">CWL</th>
-            <th style="padding: 5px; font-weight: normal;">Quay.io, Docker Hub, Amazon ECR</th>
+            <th style="padding: 5px; font-weight: normal;">Quay.io, Docker Hub, Amazon ECR, GitHub Container Registry</th>
             <th style="padding: 5px; font-weight: normal;">Snapshot</th>
         </tr>
     </body>
-</table>
+</table>
diff --git a/docs/dictionary.rst b/docs/dictionary.rst
@@ -1,4 +1,4 @@
-.. DO NOT EDIT THIS FILE. This file is autogenerated from _attic/glossary_generator.py, update that instead.
+.. DO NOT EDIT THIS FILE. This file is autogenerated from glossary_generator.py, update that instead.
 
 Dockstore Dictionary
 ====================

diff --git a/docs/index.rst b/docs/index.rst
@@ -24,6 +24,7 @@ If this is your first time learning about Dockstore, we recommend starting with
    news
    roadmap
    dictionary
+   /assets/templates/template.rst
 
 Getting Started
 ---------------
@@ -231,7 +232,6 @@ Advanced developer topics
    BCC 2020 Docker Training </docker_instructions>
    BCC 2020 WDL Training </wdl_instructions>
    posters-and-talks
-   /assets/templates/template.rst
    user-created
 
 .. centered:: In Affiliation with