Upgrade to Dataverse 4.7

README.md

@@ -1,4 +1,4 @@
-# Dataverse 4.2.3
+# Dataverse 4.7
 
 Resources to deploy Dataverse in Kubernetes or [NDS Labs](https://github.com/nds-org/ndslabs).
 
@@ -15,7 +15,7 @@ A set of configuration files used to deploy Dataverse in a Kubernetes cluster.
 While these configuration files are no longer used by this project, they have been kept for historical purposes.
 
 ## Documentation
-Documentation for Dataverse can be found here: http://guides.dataverse.org/en/4.2.3/
+Documentation for Dataverse can be found here: http://guides.dataverse.org/en/4.7
 Documentation for iRODS can be found here: http://irods.org/documentation/
 
 ## See also

dockerfiles/README.md

@@ -88,3 +88,35 @@ The following changes were made to the Dataverse application:
 * Dataverse: Custom WAR with persistence.xml to avoid database recreation by EclipseLink on restart
 * TwoRavens: Customized startup process based on the original install.pl
 * TwoRavens: endpoint.sh reads Kubernetes-supplied environment variables and connects to required services
+
+### Generating DDL
+
+The Dataverse Dockerfile depends on a pre-generated DDL script.  Below are the steps to generate DDL.
+
+Modify WEB-INF/classes/META-INF/persistence.xml, changing the ddl-generation to generate:
+```
+     <property name="eclipselink.ddl-generation" value="create-tables"/>
+     <property name="eclipselink.ddl-generation.output-mode" value="both"/>
+     <property name="eclipselink.application-location" value="/tmp/"/>
+     <property name="eclipselink.create-ddl-jdbc-file-name" value="createDDL.sql"/>
+```
+
+Build the Docker image:
+```
+docker build -t you/dataverse .
+```
+
+
+```
+docker run --name=postgres -d  postgres:9.3
+docker run --name=solr -d ndslabs/dataverse-solr:latest
+docker run -p 8080:8080 --link solr:solr --link postgres:postgres -e "POSTGRES_DATABASE=dvndb" -e "POSTGRES_USER=dvnapp" -e "POSTGRES_PASSWORD=secret"  --name=dataverse  -it you/dataverse:latest bash
+$ /entrypoint.sh dataverse
+```
+
+This will create a file create-dataverse.sql in /tmp in the container.  Copy this file out:
+```
+docker cp dataverse:/tmp/createDDL.sql .
+``` 
+
+Check this DDL into git

dockerfiles/dataverse/Dockerfile

@@ -46,8 +46,8 @@ COPY WEB-INF/classes/META-INF/persistence.xml /tmp/WEB-INF/classes/META-INF/
 
 # Install DataVerse WAR
 RUN  cd ~ \
-    && wget https://github.com/IQSS/dataverse/releases/download/v4.2.3/dvinstall-4.2.3.zip \
-    && unzip dvinstall-4.2.3.zip \
+    && wget https://github.com/IQSS/dataverse/releases/download/v4.7/dvinstall.zip \
+    && unzip dvinstall.zip \
     && jar -uf dvinstall/dataverse.war -C /tmp/ /WEB-INF/classes/META-INF/persistence.xml
 
 # Install iRods iCommands

dockerfiles/dataverse/config-glassfish

@@ -6,7 +6,7 @@ pushd $GLASSFISH_BIN_DIR
 
 echo "AS_ADMIN_PASSWORD=adminadmin"  > /tmp/tmppwd
 #./asadmin create-domain --nopassword domain1
-export ASADMIN_OPTS="--user admin --passwordfile /tmp/tmppwd"
+export ASADMIN_OPTS="--user admin --passwordfile /tmp/tmppwd --interactive=false"
 ./asadmin $ASADMIN_OPTS create-domain domain1
 ./asadmin $ASADMIN_OPTS start-domain domain1