Merge "Add version-agnostic link to DB executable"

hyperledger · Feb 18, 2017 · 5079a30 · 5079a30
2 parents 946f699 + 0243300
commit 5079a30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/images/fabric-ca-fvt/Dockerfile.in b/images/fabric-ca-fvt/Dockerfile.in
@@ -45,6 +45,9 @@ RUN touch /usr/local/bin/docker && chmod 777 /usr/local/bin/docker
 # Use python2, not 3
 RUN ln -s /usr/bin/python2.7 /usr/local/bin/python && chmod 777 /usr/local/bin/python
 
+# Generate version-agnostic postgres command
+RUN ln -s /usr/lib/postgresql/$PGVER/bin/postgres /usr/local/bin/postgres && chmod 777 /usr/local/bin/postgres
+
 # Clean up APT when done.
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 COPY payload/start.sh /start.sh

diff --git a/images/fabric-ca-fvt/start.sh b/images/fabric-ca-fvt/start.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-su postgres -c '/usr/lib/postgresql/9.5/bin/postgres -D /usr/local/pgsql/data' &
+su postgres -c 'postgres -D /usr/local/pgsql/data' &
 timeout=10
 i=0
 while ! nc -zvnt -w 5 127.0.0.1 5432; do