From ef2c1df934ee7720fd1ccacae042f3deb3b7628d Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Mon, 8 Dec 2014 02:35:03 +0100
Subject: adding function and startup script for last services images :
 memcache, nodejs, ooconv and postresql

---
 Services/postgres/Dockerfile | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'Services/postgres/Dockerfile')

diff --git a/Services/postgres/Dockerfile b/Services/postgres/Dockerfile
index e863a45..0f2a617 100644
--- a/Services/postgres/Dockerfile
+++ b/Services/postgres/Dockerfile
@@ -1,24 +1,19 @@
 FROM startx/fedora
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
-COPY postgres_run.sh postgres_modify_pass.sh /bin/
-RUN yum -y install \
-    mariadb-galera-common \
-    mariadb-galera-server \
-    mariadb-libs \
-    mariadb-server \
-    mariadb \
+RUN yum -y install postgresql postgresql-libs postgresql-server \
     && yum clean all \
-    && mkdir -p /var/log/mysql \
-    && touch /var/log/mysql/.keep /var/lib/mysql/.keep \
-    && chown -R mysql:mysql /var/log/mysql /var/lib/mysql \
-    && chmod ug+rx /bin/postgres_*
-
-VOLUME	["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
-USER postgresql
+    && mkdir -p /var/log/pgsql /var/lib/pgsql \
+    && touch /var/log/pgsql/.keep /var/lib/pgsql/.keep \
+    && chown -R postgres:postgres /var/log/pgsql /var/lib/pgsql
+# Copy startx toolkit
+COPY sx/* /sx/
+COPY postgresql.conf /var/lib/pgsql/postgresql.conf
+RUN chmod ug+rx /sx/postgres* \
+    && chown -R postgres:postgres /sx/postgresql*
 
+USER postgres
 EXPOSE 5432
+VOLUME	["/var/log/pgsql", "/var/lib/pgsql"]
 
-#CMD ["/usr/libexec/pgsqld"]
-CMD ["/bin/postgres_run.sh"]
-ONBUILD CMD ["/bin/postgres_run.sh"]
\ No newline at end of file
+CMD ["/sx/postgresql_run.sh"]
\ No newline at end of file
-- 
cgit v1.2.3