Add workaround for #177 and IQSS/dataverse#6656 to dataverse-k8s imag…

…e and Kubernetes deployment. Will be removed when #178 gets solved.
gdcc · Feb 18, 2020 · 85f522d · 85f522d
1 parent 44ecabb
commit 85f522d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/docker/dataverse-k8s/glassfish/Dockerfile b/docker/dataverse-k8s/glassfish/Dockerfile
@@ -78,8 +78,11 @@ RUN wget --no-verbose -O weld-osgi-bundle.jar ${WELD_PKG} && \
     cp /etc/pki/ca-trust/extracted/java/cacerts ${GLASSFISH_DIR}/glassfish/domains/domain1/config/cacerts.jks
 
 # Make docroot of Glassfish reside in higher level directory for easier targeting
+# Due to IQSS/dataverse-kubernetes#177: create the generated pathes so they are
+# writeable by us. TBR with #178.
 RUN rm -rf ${DOMAIN_DIR}/docroot && \
-    ln -s ${DOCROOT_DIR} ${DOMAIN_DIR}/docroot
+    ln -s ${DOCROOT_DIR} ${DOMAIN_DIR}/docroot && \
+    mkdir -p ${DOMAIN_DIR}/generated/jsp/dataverse
 
 # Tune basic settings
 # 1) Set to use Server VM

diff --git a/k8s/dataverse/deployment.yaml b/k8s/dataverse/deployment.yaml
@@ -61,19 +61,25 @@ spec:
             - name: doi-secret
               mountPath: "/secrets/doi"
               readOnly: true
+            # This is here because of IQSS/dataverse-kubernetes#177. TBR for #178
+            - name: primefaces-upload
+              mountPath: /opt/dataverse/appserver/glassfish/domains/domain1/generated/jsp/dataverse
           readinessProbe:
             httpGet:
               path: /robots.txt
               port: 8080
       initContainers:
         - name: volume-mount-hack
           image: giantswarm/tiny-tools
-          command: ["sh", "-c", "chown -c 1000:1000 /data /docroot"]
+          command: ["sh", "-c", "chown -c 1000:1000 /data /docroot /uploads"]
           volumeMounts:
             - name: files
               mountPath: /data
             - name: docroot
               mountPath: /docroot
+            # This is here because of IQSS/dataverse-kubernetes#177. TBR for #178
+            - name: primefaces-upload
+              mountPath: /uploads
         - name: check-db-ready
           image: postgres:9.6
           command: ['sh', '-c',
@@ -97,3 +103,6 @@ spec:
         - name: doi-secret
           secret:
             secretName: dataverse-doi
+        # This is here because of IQSS/dataverse-kubernetes#177. TBR for #178
+        - name: primefaces-upload
+          emptyDir: {}