Merge pull request #24 from ScilifelabDataCentre/develop

For deployment
ScilifelabDataCentre · Jul 18, 2023 · d30b9bd · d30b9bd
2 parents 6a4a1ca + 748338a
commit d30b9bd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -1,7 +1,7 @@
 ---
-# Build and publish docker image(s)
-# Publishing to Dockerhub requires a username and token
-# as the secrets DOCKERHUB_USERNAME and DOCKERHUB_TOKEN
+# Build and publish image(s) to GitHub (ghcr.io)
+# Publishing to GitHub requires a username (who triggered the action)
+# and password (as the secrets GITHUB_TOKEN)
 # remember to change repo-name and set dockerfile(s)/image name(s) in the matrix
 
 name: Publish Docker image
@@ -31,22 +31,13 @@ jobs:
       matrix:
         include:
           - dockerfile: Dockerfiles/Dockerfile
-            images: |
-              docker.io/scilifelabdatacentre/covid-sample-collection-database
-              ghcr.io/scilifelabdatacentre/covid-sample-collection-database
+            images: ghcr.io/scilifelabdatacentre/covid-sample-collection-database
     permissions:
       contents: read
       packages: write
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-      # only needed when publishing to Dockerhub
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          # available in scilifelabdatacentre, ask admin for help
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
       # only needed when publishing to Github (ghcr.io)
       - name: Log in to Github Container Repository
         uses: docker/login-action@v2

diff --git a/content/_index.md b/content/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Home
+title: Swedish COVID-19 Sample Collection Database
 aliases:
     /menu/main/app-scd/
 ---

diff --git a/content/collections/NAT/1.md b/content/collections/NAT/1.md
@@ -25,7 +25,7 @@ diagnosis_available: ["urn:miriam:icd:U07.1"]
 order_of_magnitude_donors:
 autopsy:
 minors:
-inclusion_criteria: Alla provgivare som gav ett informerat samtycke i samband med provtagning som visade ettt positivt svar, oavsett ålder och kön.
+inclusion_criteria: Sample donors that provided informed consent for inclusion, regardless of age or sex.
 exclusion_criteria:
 materials: [Nasal swab,Throat swab]
 head_firstname:

diff --git a/content/collections/NAT/_index.md b/content/collections/NAT/_index.md
@@ -7,7 +7,7 @@ country: SE
 biobank_sverige: TRUE
 ivo_regnum: N/A (individual regional biobanks)
 bbmri_id:
-website_url: https://biobanksverige.se/kontakta-oss/biobankssamordnare-och-nej-talonger/
+website_url: https://biobanksverige.se/forskning/
 description:
 address:
 contact: c19dp:contact:SE_NAT

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -2,7 +2,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <!-- Site meta -->
-  <title>{{ if eq .Page.Section "collections" }} {{ .Params.name }}{{ else }}{{ .Title }}{{ end }} | {{ .Site.Title }}</title>
+  <title>{{ if eq .Page.Section "collections" }} {{ .Params.name }} | {{ .Site.Title }}{{ else if eq .Title "Swedish COVID-19 Sample Collection Database" }} {{ .Title }}{{ else }}{{ .Title }} | {{ .Site.Title }}{{ end }}</title>
   <meta name="description" content='{{ if .IsHome }}{{ .Param "description" }}{{ else }}{{ .Description }}{{ end }}'>
   <meta http-equiv="content-language" content="en">