Remove gensym, inc and or from step files.

[jackhill/mal.git] / plpgsql / Dockerfile

diff --git a/plpgsql/Dockerfile b/plpgsql/Dockerfile
index 1ce2373..eb64c1a 100644 (file)
--- a/plpgsql/Dockerfile
+++ b/plpgsql/Dockerfile
@@ -19,11 +19,19 @@ ENV HOME=/var/run/postgresql
 
 WORKDIR /mal
 
-# Travis runs as user ID 1001 so add that user
+# Travis runs as a couple of different users so add them
 RUN useradd -ou 1001 -m -s /bin/bash -G sudo,postgres travis
+RUN useradd -ou 2000 -m -s /bin/bash -G sudo,postgres travis2
+
 # Enable postgres and travis users to sudo for postgres startup
 RUN echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
 
+# Allow both travis and postgres user to connect to DB as 'postgres'
+RUN sed -i 's/peer$/peer map=mal/' /etc/postgresql/9.4/main/pg_hba.conf
+RUN echo "mal postgres postgres" >> /etc/postgresql/9.4/main/pg_ident.conf
+RUN echo "mal travis postgres" >> /etc/postgresql/9.4/main/pg_ident.conf
+RUN echo "mal travis2 postgres" >> /etc/postgresql/9.4/main/pg_ident.conf
+
 # Add entrypoint.sh which starts postgres then run bash/command
 ADD entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["sudo", "--user=postgres", "/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]