IQSS#7384 point docker-aio, docker-dcm, openshift, and vagrant at Cen…

…tOS 8

conf/docker-aio/c8.dockerfile

@@ -0,0 +1,82 @@
+FROM centos:8
+# OS dependencies
+# PG 10 is the default in centos8; keep the repo comment for when we bump to 11+
+#RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm
+RUN yum install -y java-1.8.0-openjdk-devel postgresql-server sudo epel-release unzip perl curl httpd
+RUN yum install -y jq lsof awscli
+
+# copy and unpack dependencies (solr, payara)
+COPY dv /tmp/dv
+COPY testdata/schema*.xml /tmp/dv/
+COPY testdata/solrconfig.xml /tmp/dv
+
+# ITs need files
+COPY testdata/sushi_sample_logs.json /tmp/
+
+# IPv6 and localhost appears to be related to some of the intermittant connection issues
+COPY disableipv6.conf /etc/sysctl.d/
+RUN rm /etc/httpd/conf/*
+COPY httpd.conf /etc/httpd/conf 
+RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.7.2dv.tgz 
+RUN cd /opt ; unzip /tmp/dv/deps/payara-5.2020.2.zip ; ln -s /opt/payara5 /opt/glassfish4
+
+# this copy of domain.xml is the result of running `asadmin set server.monitoring-service.module-monitoring-levels.jvm=LOW` on a default glassfish installation (aka - enable the glassfish REST monitir endpoint for the jvm`
+COPY domain-restmonitor.xml /opt/payara5/glassfish/domains/domain1/config/domain.xml
+
+#RUN sudo -u postgres /usr/bin/initdb -D /var/lib/pgsql/data
+RUN sudo -u postgres /usr/pgsql-9.6/bin/initdb -D /var/lib/pgsql/data
+
+# copy configuration related files
+RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/data/
+RUN cp -r /opt/solr-7.7.2/server/solr/configsets/_default /opt/solr-7.7.2/server/solr/collection1
+RUN cp /tmp/dv/schema*.xml /opt/solr-7.7.2/server/solr/collection1/conf/
+RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.7.2/server/solr/collection1/conf/solrconfig.xml
+
+# skipping payara user and solr user (run both as root)
+
+#solr port
+EXPOSE 8983
+
+# postgres port
+EXPOSE 5432
+
+# payara port
+EXPOSE 8080
+
+# apache port, http
+EXPOSE 80
+
+# debugger ports (jmx,jdb)
+EXPOSE 8686
+EXPOSE 9009
+
+RUN mkdir /opt/dv
+
+# keeping the symlink on the off chance that something else is still assuming /usr/local/glassfish4
+RUN ln -s /opt/payara5 /usr/local/glassfish4
+COPY dv/install/ /opt/dv/
+COPY install.bash /opt/dv/
+COPY entrypoint.bash /opt/dv/
+COPY testdata /opt/dv/testdata
+COPY testdata/updateSchemaMDB.sh /opt/dv/testdata/
+COPY testscripts/* /opt/dv/testdata/
+COPY setupIT.bash /opt/dv
+WORKDIR /opt/dv
+
+# need to take DOI provider info from build args as of ec377d2a4e27424db8815c55ce544deee48fc5e0
+# Default to EZID; use built-args to switch to DataCite (or potentially handles)
+#ARG DoiProvider=EZID
+ARG DoiProvider=FAKE
+ARG doi_baseurl=https://ezid.cdlib.org
+ARG doi_username=apitest
+ARG doi_password=apitest
+ENV DoiProvider=${DoiProvider}
+ENV doi_baseurl=${doi_baseurl}
+ENV doi_username=${doi_username}
+ENV doi_password=${doi_password}
+COPY configure_doi.bash /opt/dv
+
+# healthcheck for payara only (assumes modified domain.xml);
+#  does not check dataverse application status.
+HEALTHCHECK CMD curl --fail http://localhost:4848/monitoring/domain/server.json || exit 1
+CMD ["/opt/dv/entrypoint.bash"]

conf/docker-aio/readme.md

@@ -27,7 +27,7 @@ Also usable for normal development and system evaluation; not intended for produ
 #### Setup
 
 - `cd conf/docker-aio`, and run `./1prep.sh` to copy files for integration test data into docker build context; `1prep.sh` will also build the war file and installation zip file
-- build the docker image: `docker build -t dv0 -f c7.dockerfile .`
+- build the docker image: `docker build -t dv0 -f c8.dockerfile .`
 
 - Run image: `docker run -d -p 8083:8080 -p 8084:80 --name dv dv0` (aka - forward port 8083 locally to 8080 in the container for payara, and 8084 to 80 for apache); if you'd like to connect a java debugger to payara, use `docker run -d -p 8083:8080 -p 8084:80 -p 9010:9009 --name dv dv0`
 

conf/docker-dcm/c8client.dockerfile

@@ -0,0 +1,7 @@
+# build from repo root
+FROM centos:8
+RUN yum install -y epel-release
+RUN yum install -y rsync openssh-clients jq curl wget lynx
+RUN useradd depositor
+USER depositor
+WORKDIR /home/depositor

conf/docker-dcm/dcmsrv.dockerfile

@@ -1,5 +1,5 @@
 # build from repo root
-FROM centos:6
+FROM centos:8
 RUN yum install -y epel-release
 ARG RPMFILE=dcm-0.5-0.noarch.rpm
 COPY ${RPMFILE} /tmp/

conf/docker-dcm/docker-compose.yml

@@ -39,7 +39,7 @@ services:
   client:
     build:
       context: .
-      dockerfile: c6client.dockerfile
+      dockerfile: c8client.dockerfile
     command: sleep infinity
     container_name: dcm_client
     volumes:

conf/docker-dcm/rsalsrv.dockerfile

@@ -1,4 +1,4 @@
-FROM centos:7
+FROM centos:8
 ARG RPMFILE=rsal-0.1-0.noarch.rpm
 RUN yum update; yum install -y epel-release 
 COPY ${RPMFILE} /tmp/

conf/openshift/openshift.json

@@ -150,10 +150,10 @@
       "kind": "ImageStream",
       "apiVersion": "v1",
       "metadata": {
-        "name": "centos-postgresql-94-centos7"
+        "name": "centos-postgresql-10-centos8"
       },
       "spec": {
-        "dockerImageRepository": "centos/postgresql-94-centos7"
+        "dockerImageRepository": "centos/postgresql-10-centos8"
       }
     },
     {
@@ -397,8 +397,8 @@
           "spec": {
             "containers": [
               {
-                "name": "centos-postgresql-94-centos7",
-                "image": "centos/postgresql-94-centos7",
+                "name": "centos-postgresql-10-centos8",
+                "image": "centos/postgresql-10-centos8",
                 "command": [
                   "sh",
                   "-c",
@@ -506,11 +506,11 @@
             "imageChangeParams": {
               "automatic": true,
               "containerNames": [
-                "centos-postgresql-94-centos7"
+                "centos-postgresql-10-centos8"
               ],
               "from": {
                 "kind": "ImageStreamTag",
-                "name": "centos/postgresql-94-centos7:latest"
+                "name": "centos/postgresql-10-centos8:latest"
               }
             }
           },

conf/vagrant/etc/yum.repos.d/shibboleth.repo

@@ -1,7 +1,7 @@
 [security_shibboleth]
-name=Shibboleth (CentOS_CentOS-6)
+name=Shibboleth (CentOS_8)
 type=rpm-md
-baseurl=http://download.opensuse.org/repositories/security:/shibboleth/CentOS_CentOS-6/
+baseurl=http://download.opensuse.org/repositories/security:/shibboleth/CentOS_8/
 gpgcheck=1
-gpgkey=http://download.opensuse.org/repositories/security:/shibboleth/CentOS_CentOS-6/repodata/repomd.xml.key
+gpgkey=http://download.opensuse.org/repositories/security:/shibboleth/CentOS_8/repodata/repomd.xml.key
 enabled=1

doc/sphinx-guides/source/installation/shibboleth.rst

@@ -50,6 +50,10 @@ Install ``wget`` if you don't have it already:
 
 ``yum install wget``
 
+If you are running el8 (RHEL/CentOS 8):
+
+``wget http://download.opensuse.org/repositories/security:/shibboleth/CentOS_8/security:shibboleth.repo``
+
 If you are running el7 (RHEL/CentOS 7):
 
 ``wget http://download.opensuse.org/repositories/security:/shibboleth/CentOS_7/security:shibboleth.repo``
@@ -273,7 +277,7 @@ On CentOS 6:
 Configure Apache and shibd to Start at Boot
 -------------------------------------------
 
-On CentOS 7:
+On CentOS 7/8:
 
 ``systemctl enable httpd.service``
 

scripts/r/rserve/rserve-setup.sh

@@ -47,7 +47,7 @@ then
     echo "You can start Rserve daemon by executing"
     echo "  service rserve start"
     echo 
-    echo "If this is a RedHat/CentOS 7 system, you may want to use the systemctl file rserve.service instead (provided in this directory)"
+    echo "If this is a RedHat/CentOS 7/8 system, you may want to use the systemctl file rserve.service instead (provided in this directory)"
 else 
     echo "Rserve startup file already in place."
 fi