Dataverse upgraded to version 5.3, most of variables moved to .env

CoronaWhy · Mar 21, 2021 · 8c96dc4 · 8c96dc4
1 parent 94ff33d
commit 8c96dc4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/services-available/dataverse/dataverse-5.3.yaml b/services-available/dataverse/dataverse-5.3.yaml
@@ -1,23 +1,28 @@
 version: '3.7'
 services:
     dataverse:
-      image: coronawhy/dataverse:5.4-cv
+      #image: coronawhy/dataverse:5.4-cv
+      image: coronawhy/dataverse:5.3
       # privileged: true
       ports:
         #- "443:443"
         - "4848:4848"
         - "8085:8080"
       environment:
-        - "DATAVERSE_URL=https://dataverse.s3.coronawhy.org"
-        - "DATAVERSE_DB_HOST=postgres"
-        - "DATAVERSE_DB_USER=dvnuser"
-        - "DATAVERSE_DB_PASSWORD=dvnsecret"
-        - "DATAVERSE_DB_NAME=dvndb"
+        #- "DATAVERSE_URL=https://dataverse.s3.coronawhy.org"
+        - "DATAVERSE_DB_HOST"
+        - "DATAVERSE_DB_USER"
+        - "DATAVERSE_DB_PASSWORD"
+        - "DATAVERSE_DB_NAME"
+        - "DATAVERSE_SERVICE_HOST"
+        - "DATAVERSE_URL"
+        - "SOLR_SERVICE_HOST"
+        - "SOLR_SERVICE_PORT"
         - "CVM_SERVER_NAME=CESSDA" #Optional
         - "CVM_SERVER_URL=https://ns.${traefikhost}"
         - "CVM_TSV_SOURCE=https://raw.githubusercontent.com/Dans-labs/semantic-gateway/main/conf/CMM_Custom_MetadataBlock.tsv"
         #- "WAR_FILE=https://github.com/IQSS/dataverse-docker/releases/download/5.2-cv/dataverse-5.2-cv.war"
-        - "WAR_FILE=https://github.com/IQSS/dataverse/releases/download/v5.3/dataverse-5.3.war"
+        #- "WAR_FILE=https://github.com/IQSS/dataverse/releases/download/v5.3/dataverse-5.3.war"
 
         - "4848:4848"
         - "8085:8080"
@@ -36,6 +41,7 @@ services:
         - "POSTGRES_PORT"
         - "POSTGRES_DATABASE"
         - "POSTGRES_USER"
+        - "POSTGRES_PASSWORD"
         - "PGPASSWORD"
         ########################################
 
@@ -59,6 +65,7 @@ services:
         - ./var/dataverse/dumps:/dumps
         - ./var/dataverse/docroot:/docroot
         - ./var/dataverse/metadata:/metadata
+        - ./secrets:/secrets
       labels:
         - "traefik.enable=true"
         - "traefik.http.routers.dataverse.rule=Host(`www.${traefikhost}`)"

diff --git a/services-available/dataverse/secrets/admin/password b/services-available/dataverse/secrets/admin/password
@@ -0,0 +1 @@
+admin1
diff --git a/services-available/dataverse/secrets/api/key b/services-available/dataverse/secrets/api/key
@@ -0,0 +1 @@
+supersecret
diff --git a/services-available/dataverse/secrets/db/password b/services-available/dataverse/secrets/db/password
@@ -0,0 +1 @@
+changeme
diff --git a/services-available/dataverse/secrets/db_asadmin b/services-available/dataverse/secrets/db_asadmin
@@ -0,0 +1 @@
+AS_ADMIN_ALIASPASSWORD=changeme
diff --git a/services-available/dataverse/secrets/doi/password b/services-available/dataverse/secrets/doi/password
@@ -0,0 +1 @@
+changeme
diff --git a/services-available/dataverse/secrets/doi_asadmin b/services-available/dataverse/secrets/doi_asadmin
@@ -0,0 +1 @@
+AS_ADMIN_ALIASPASSWORD=changeme