projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6663: Update nginx config to look more like API server's.
[arvados.git]
/
docker
/
postgresql
/
Dockerfile
diff --git
a/docker/postgresql/Dockerfile
b/docker/postgresql/Dockerfile
index c26cda25e17ec4715a3821fb7547790f97bbf45d..a99a886e956eba25f5206c1e81c8bb8f410639ff 100644
(file)
--- a/
docker/postgresql/Dockerfile
+++ b/
docker/postgresql/Dockerfile
@@
-1,7
+1,7
@@
# PostgreSQL Docker container for Arvados.
FROM arvados/debian:wheezy
# PostgreSQL Docker container for Arvados.
FROM arvados/debian:wheezy
-MAINTAINER
Tim Pierce <twp@clinicalfutur
e.com>
+MAINTAINER
Ward Vandewege <ward@curovers
e.com>
# TODO(twp): parameterize variables via autoconf or similar.
ENV POSTGRES_ROOT_PW dummy_pw
# TODO(twp): parameterize variables via autoconf or similar.
ENV POSTGRES_ROOT_PW dummy_pw
@@
-19,7
+19,7
@@
ENV ARVADOS_PROD_USER arvados
ENV ARVADOS_PROD_PW dummy_pw
# Install postgres and apache
ENV ARVADOS_PROD_PW dummy_pw
# Install postgres and apache
-RUN apt-get
-q -y install
procps postgresql postgresql-server-dev-9.1
+RUN apt-get
install -qy
procps postgresql postgresql-server-dev-9.1
# Configure databases and users.
ADD postgresql.conf /etc/postgresql/9.1/main/
# Configure databases and users.
ADD postgresql.conf /etc/postgresql/9.1/main/