fix for @pdurbin feedback

IQSS · Aug 14, 2018 · d538fac · d538fac
1 parent f92e14b
commit d538fac
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/conf/docker/build.sh b/conf/docker/build.sh
@@ -50,9 +50,8 @@ echo Images are being built for registry org/username \"$HUBORG\" with the tag \
 #
 # Build dataverse-solr
 #
-# Use "conf" directory as context so we can copy schema.xml into Solr image.
 cp ../solr/7.3.0/schema.xml solr/
-#move solr*.tgz to the solr image
+# move solr*.tgz to the solr image
 cp ../../downloads/solr-7.3.0.tgz solr/
 docker build -t $HUBORG/dataverse-solr:$TAG  solr/
 if [ "$1" == 'internal' ]; then

diff --git a/conf/docker/solr/Dockerfile b/conf/docker/solr/Dockerfile
@@ -1,7 +1,7 @@
 FROM centos:7
 MAINTAINER Dataverse (support@dataverse.org)
 
-RUN yum install -y unzip java-1.8.0-openjdk-devel postgresql.x86_64 lsof
+RUN yum install -y unzip java-1.8.0-openjdk-devel lsof
 
 # Install Solr 7.3.0
 # The context of the build is the "conf" directory.

diff --git a/conf/docker/solr/entrypoint.sh b/conf/docker/solr/entrypoint.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# FIXME: Don't run Solr out of /tmp!
-# Solr is /tmp to avoid AccessDeniedException under Minishift/OpenShift.
 if ! whoami &> /dev/null; then
   if [ -w /etc/passwd ]; then
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd

diff --git a/doc/sphinx-guides/source/developers/containers.rst b/doc/sphinx-guides/source/developers/containers.rst
@@ -1,4 +1,6 @@
+================================= 
 Docker, Kubernetes, and OpenShift
+=================================
 
 Dataverse is exploring the use of Docker, Kubernetes, OpenShift and other container-related technologies.