Skip to content

Commit

Permalink
#4: Fixed some of the Dockerfile path bugs.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bystroushaak committed Mar 16, 2016
1 parent 3e6cd2f commit 47f6f70
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
8 changes: 4 additions & 4 deletions resolver/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
3 changes: 0 additions & 3 deletions resolver/docker/build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 47f6f70

Please sign in to comment.