Merge branch 'master' into dmius-ebs-vol

Author: dmius

docker/Dockerfile

@@ -17,8 +17,10 @@ ADD ./postgresql_${PG_SERVER_VERSION}_tweak.conf /postgresql.tweak.conf
 #   - pgbadger (modified, not lowercasing DB object names, auto_explain compatibility)
 RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 \
       && echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main"> /etc/apt/sources.list.d/pgdg.list \
-      && apt-get update && apt-get install -y sudo postgresql-$PG_SERVER_VERSION postgresql-contrib-$PG_SERVER_VERSION postgresql-plpython-$PG_SERVER_VERSION \
-      && apt-get install -y postgresql-$PG_SERVER_VERSION-plsh postgresql-server-dev-$PG_SERVER_VERSION postgresql-$PG_SERVER_VERSION-rum \
+      && apt-get update && apt-get install -y sudo postgresql-$PG_SERVER_VERSION \
+      && apt-get install -y postgresql-contrib-$PG_SERVER_VERSION postgresql-plpython-$PG_SERVER_VERSION \
+      && apt-get install -y postgresql-$PG_SERVER_VERSION-plsh postgresql-server-dev-$PG_SERVER_VERSION \
+      && apt-get install -y postgresql-$PG_SERVER_VERSION-rum \
       && apt-get install -y git postgresql-client-10 pspg pgreplay jq etcd libjson-xs-perl \
       && perl -MCPAN -e'install Text::CSV_XS' \
       && git clone https://github.com/NikolayS/postgres_dba.git /root/postgres_dba \
@@ -41,7 +43,7 @@ RUN echo "\\set dba '\\\\\\\\i /root/postgres_dba/start.psql'" >> ~/.psqlrc \
       && /etc/init.d/postgresql start && psql -U postgres -c 'create database test;' && /etc/init.d/postgresql stop \
       && cat /postgresql.tweak.conf >> /etc/postgresql/$PG_SERVER_VERSION/main/postgresql.conf \
       && echo "#!/bin/bash" > /pg_start.sh && chmod a+x /pg_start.sh \
-      && printf "sudo -u postgres /usr/lib/postgresql/$PG_SERVER_VERSION/bin/postgres -D /var/lib/postgresql/$PG_SERVER_VERSION/main -c config_file=/etc/     postgresql/$PG_SERVER_VERSION/main/postgresql.conf & \n" >> /pg_start.sh \
+      && printf "sudo -u postgres /usr/lib/postgresql/$PG_SERVER_VERSION/bin/postgres -D /var/lib/postgresql/$PG_SERVER_VERSION/main -c config_file=/etc/postgresql/$PG_SERVER_VERSION/main/postgresql.conf & \n" >> /pg_start.sh \
       && echo "etcd" >> /pg_start.sh
 
 EXPOSE 5432
@@ -50,4 +52,3 @@ EXPOSE 5432
 
 # etcd is not being actually used (it's for future needs), but it allows restart Postgres with container interruption
 CMD ["/pg_start.sh"]
-

docker/README.md

@@ -3,5 +3,5 @@ How to build/rebuild:
 ```bash
 docker build --build-arg PG_SERVER_VERSION=9.6 -t postgresmen/postgres-with-stuff:pg9.6 .
 docker login # you must be registered, go to hub.docker.com
-doker push postgresmen/postgres-with-stuff:pg9.6
+docker push postgresmen/postgres-with-stuff:pg9.6
 ```

nancy_run.sh

@@ -564,14 +564,14 @@ function destroyDockerMachine() {
 
 function cleanupAndExit {
   echo "Remove temp files..." # if exists
+  docker $dockerConfig exec -i ${containerHash} sh -c "sudo rm -rf $MACHINE_HOME"
   rm -f "$TMP_PATH/after_db_init_code_tmp.sql"
   rm -f "$TMP_PATH/workload_custom_sql_tmp.sql"
   rm -f "$TMP_PATH/target_ddl_do_tmp.sql"
   rm -f "$TMP_PATH/target_ddl_undo_tmp.sql"
   rm -f "$TMP_PATH/target_config_tmp.conf"
   rm -f "$TMP_PATH/pg_config_tmp.conf"
   if [ "$RUN_ON" = "localhost" ]; then
-    rm -rf "$TMP_PATH/nancy_${containerHash}"
     echo "Remove docker container"
     docker container rm -f $containerHash
   elif [ "$RUN_ON" = "aws" ]; then
@@ -830,6 +830,7 @@ docker_exec bash -c "/root/pgbadger/pgbadger \
   -j $(cat /proc/cpuinfo | grep processor | wc -l) \
   --prefix '%t [%p]: [%l-1] db=%d,user=%u (%a,%h)' /var/log/postgresql/* -f stderr \
   -o $MACHINE_HOME/$ARTIFACTS_FILENAME.json"
+  #2> >(grep -v "install the Text::CSV_XS" >&2)
 
 logpath=$( \
   docker_exec bash -c "psql -XtU postgres \