Updated the 'appdev' container to start SSHD prior

to starting PG (if enabled), and also moved the PostgreSQL Exporter congiuration files into a sub-directory within the '/opt/cpm/bin/modules' directory.
CrunchyData · Oct 9, 2019 · 270f218 · 270f218
1 parent 9f90b08
commit 270f218
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/bin/postgres-appdev/start.sh b/bin/postgres-appdev/start.sh
@@ -286,6 +286,9 @@ then
 	source /pgconf/pre-start-hook.sh
 fi
 
+# Start SSHD if necessary prior to starting PG
+source /opt/cpm/bin/sshd.sh
+
 echo_info "Starting PostgreSQL.."
 postgres -D $PGDATA &
 

diff --git a/centos7/11/Dockerfile.postgres-appdev.centos7 b/centos7/11/Dockerfile.postgres-appdev.centos7
@@ -62,7 +62,7 @@ ADD bin/postgres-appdev /opt/cpm/bin
 ADD conf/postgres /opt/cpm/conf
 ####### TODO If we put in PGAdmin need to put the conf here as well
 
-ADD tools/pgmonitor/exporter/postgres /opt/cpm/bin/modules
+ADD tools/pgmonitor/exporter/postgres /opt/cpm/bin/modules/pgexporter
 
 RUN chmod g=u /etc/passwd && \
 	chmod g=u /etc/group