From 47f6f7017832c1f24f92b675d55956fbfd3d0c06 Mon Sep 17 00:00:00 2001 From: Bystroushaak Date: Wed, 16 Mar 2016 12:17:15 +0100 Subject: [PATCH] #4: Fixed some of the Dockerfile path bugs. --- resolver/docker/Dockerfile | 8 ++++---- resolver/docker/build_docker.sh | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/resolver/docker/Dockerfile b/resolver/docker/Dockerfile index 480381f..a3a2649 100644 --- a/resolver/docker/Dockerfile +++ b/resolver/docker/Dockerfile @@ -8,9 +8,9 @@ RUN yum -y install sudo epel-release wget tar; yum clean all # Install postgresql RUN yum -y install postgresql-server postgresql postgresql-contrib supervisor; yum clean all -ADD postgres/postgresql-setup /usr/bin/postgresql-setup -ADD postgres/supervisord.conf /etc/supervisord.conf -ADD postgres/start_postgres.sh /start_postgres.sh +ADD CentOS-Dockerfiles/postgres/centos7/postgresql-setup /usr/bin/postgresql-setup +ADD CentOS-Dockerfiles/postgres/centos7/supervisord.conf /etc/supervisord.conf +ADD CentOS-Dockerfiles/postgres/centos7/start_postgres.sh /start_postgres.sh #Sudo requires a tty. fix that. RUN sed -i 's/.*requiretty$/#Defaults requiretty/' /etc/sudoers @@ -19,7 +19,7 @@ RUN chmod +x /start_postgres.sh RUN /usr/bin/postgresql-setup initdb -ADD postgres/postgresql.conf /var/lib/pgsql/data/postgresql.conf +ADD CentOS-Dockerfiles/postgres/centos7/postgresql.conf /var/lib/pgsql/data/postgresql.conf RUN chown -v postgres.postgres /var/lib/pgsql/data/postgresql.conf diff --git a/resolver/docker/build_docker.sh b/resolver/docker/build_docker.sh index ecc6aaf..bf0ec34 100755 --- a/resolver/docker/build_docker.sh +++ b/resolver/docker/build_docker.sh @@ -9,9 +9,6 @@ cd $TMP_DIR git clone https://github.com/CentOS/CentOS-Dockerfiles.git -ln -s $TMP_DIR/CentOS-Dockerfiles/postgres/centos7 postgres - - wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/7u72-b14/jdk-7u72-linux-x64.tar.gz" wget http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.8/bin/apache-tomcat-7.0.8.tar.gz