Merge branch 'develop' into 7194-file-tags-search #7194

conf/docker-aio/c7.dockerfile → conf/docker-aio/c8.dockerfile

@@ -1,7 +1,8 @@
-FROM centos:7
+FROM centos:8
 # OS dependencies
-RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
-RUN yum install -y java-1.8.0-openjdk-devel postgresql96-server sudo epel-release unzip perl curl httpd
+# 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)

conf/docker-aio/prep_it.bash

@@ -10,7 +10,7 @@ n_wait=5
 cd conf/docker-aio
 ./0prep_deps.sh
 ./1prep.sh
-docker build -t dv0 -f c7.dockerfile .
+docker build -t dv0 -f c8.dockerfile .
 # cleanup from previous runs if necessary
 docker rm -f dv
 # start container

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`