docker-aio passes integration tests w\ postgres 9.6

IQSS · May 30, 2018 · 316c21a · 316c21a
1 parent d176002
commit 316c21a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/conf/docker-aio/c7.dockerfile b/conf/docker-aio/c7.dockerfile
@@ -1,6 +1,8 @@
 FROM centos:7
 # OS dependencies
-RUN yum install -y java-1.8.0-openjdk-headless postgresql-server sudo epel-release unzip perl curl httpd
+RUN yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
+#RUN yum install -y java-1.8.0-openjdk-headless postgresql-server sudo epel-release unzip perl curl httpd
+RUN yum install -y java-1.8.0-openjdk-headless postgresql96-server sudo epel-release unzip perl curl httpd
 RUN yum install -y jq
 
 # copy and unpack dependencies (solr, glassfish)
@@ -17,7 +19,8 @@ RUN cd /opt ; tar zxf /tmp/dv/deps/glassfish4dv.tgz
 # 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/glassfish4/glassfish/domains/domain1/config/domain.xml
 
-RUN sudo -u postgres /usr/bin/initdb -D /var/lib/pgsql/data
+#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/

diff --git a/conf/docker-aio/entrypoint.bash b/conf/docker-aio/entrypoint.bash
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-sudo -u postgres /usr/bin/postgres -D /var/lib/pgsql/data &
+#sudo -u postgres /usr/bin/postgres -D /var/lib/pgsql/data &
+sudo -u postgres /usr/pgsql-9.6/bin/postgres -D /var/lib/pgsql/data &
 cd /opt/solr-7.3.0/
 # TODO: Run Solr as non-root and remove "-force".
 bin/solr start -force