Drop dependency on p2

Prior to this change, the test-smoke script required the p2 binary to
augment the Dockerfile under docker-postgres-replication.  I do not have
that binary on my system, nor was I able to find an installer for it.
The closest tool I found was p2cli, but even that did not work as
expected.

This change removes the Dockerfile.p2 file in favour of using Docker's
builtin build args mechanism to augment the docker build.

Signed-off-by: Corin Lawson <[email protected]>

Author: Corin Lawson

cmd/postgres_exporter/tests/docker-postgres-replication/Dockerfile

@@ -1,4 +1,5 @@
-FROM postgres:11
+ARG VERSION
+FROM postgres:$VERSION
 MAINTAINER Daniel Dent (https://www.danieldent.com)
 ENV PG_MAX_WAL_SENDERS 8
 ENV PG_WAL_KEEP_SEGMENTS 8

cmd/postgres_exporter/tests/docker-postgres-replication/Dockerfile.p2

@@ -3,7 +3,10 @@ version: '2'
 
 services:
   pg-master:
-    build: '.'
+    build:
+      context: '.'
+      args:
+        VERSION: $VERSION
     image: 'danieldent/postgres-replication'
     restart: 'always'
     environment:
@@ -16,7 +19,10 @@ services:
      - '5432'
 
   pg-slave:
-    build: '.'
+    build:
+      context: '.'
+      args:
+        VERSION: $VERSION
     image: 'danieldent/postgres-replication'
     restart: 'always'
     environment:

cmd/postgres_exporter/tests/docker-postgres-replication/docker-compose.yml

@@ -129,13 +129,9 @@ smoketest_postgres() {
     echo "#######################"
     old_pwd=$(pwd)
     cd docker-postgres-replication || exit 1
-    
-    if ! VERSION="$version" p2 -t Dockerfile.p2 -o Dockerfile ; then
-        echo "Templating failed" 1>&2
-        exit 1
-    fi
+
     trap "docker-compose logs; docker-compose down ; docker-compose rm -v; exit 1" EXIT INT TERM
-    local compose_cmd="POSTGRES_PASSWORD=$POSTGRES_PASSWORD docker-compose up -d --force-recreate --build"
+    local compose_cmd="VERSION=$version POSTGRES_PASSWORD=$POSTGRES_PASSWORD docker-compose up -d --force-recreate --build"
     echo "Compose Cmd: $compose_cmd"
     eval "$compose_cmd"