From 8383e3c44bdaedc4ca37dce4cd43f4e48c204c18 Mon Sep 17 00:00:00 2001
From: Vikram Vaswani <vikram@bitnami.com>
Date: Thu, 20 Sep 2018 19:50:48 +0530
Subject: [PATCH] Removed Debian 8 from root version folders

---
 bitnami/postgresql/10/Dockerfile              | 25 -------------------
 bitnami/postgresql/10/docker-compose.yml      | 13 ----------
 .../postgresql/10/rootfs/app-entrypoint.sh    | 13 ----------
 .../10/rootfs/postgresql-inputs.json          | 11 --------
 bitnami/postgresql/9.6/Dockerfile             | 25 -------------------
 bitnami/postgresql/9.6/docker-compose.yml     | 13 ----------
 .../postgresql/9.6/rootfs/app-entrypoint.sh   | 13 ----------
 .../9.6/rootfs/postgresql-inputs.json         | 11 --------
 8 files changed, 124 deletions(-)
 delete mode 100644 bitnami/postgresql/10/Dockerfile
 delete mode 100644 bitnami/postgresql/10/docker-compose.yml
 delete mode 100755 bitnami/postgresql/10/rootfs/app-entrypoint.sh
 delete mode 100644 bitnami/postgresql/10/rootfs/postgresql-inputs.json
 delete mode 100644 bitnami/postgresql/9.6/Dockerfile
 delete mode 100644 bitnami/postgresql/9.6/docker-compose.yml
 delete mode 100755 bitnami/postgresql/9.6/rootfs/app-entrypoint.sh
 delete mode 100644 bitnami/postgresql/9.6/rootfs/postgresql-inputs.json

diff --git a/bitnami/postgresql/10/Dockerfile b/bitnami/postgresql/10/Dockerfile
deleted file mode 100644
index ecd93e5238dd..000000000000
--- a/bitnami/postgresql/10/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM bitnami/minideb-extras:jessie-r107
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
-# Install required system packages and dependencies
-RUN install_packages libbsd0 libc6 libedit2 liblzma5 libssl1.0.0 libtinfo5 libxml2 libxslt1.1 zlib1g
-RUN bitnami-pkg unpack postgresql-10.4.0-2 --checksum fc09c88d5f1f8d9b280b45654bc3ea942b92a9d5009b199f402641ae7ba3ae10
-
-COPY rootfs /
-ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="10.4.0-debian-8-r41" \
-    PATH="/opt/bitnami/postgresql/bin:$PATH" \
-    POSTGRESQL_DATABASE="" \
-    POSTGRESQL_MASTER_HOST="" \
-    POSTGRESQL_MASTER_PORT_NUMBER="5432" \
-    POSTGRESQL_PASSWORD="" \
-    POSTGRESQL_PORT_NUMBER="5432" \
-    POSTGRESQL_REPLICATION_MODE="master" \
-    POSTGRESQL_REPLICATION_PASSWORD="" \
-    POSTGRESQL_REPLICATION_USER="" \
-    POSTGRESQL_USERNAME="postgres"
-
-EXPOSE 5432
-
-ENTRYPOINT ["/app-entrypoint.sh"]
-CMD ["nami","start","--foreground","postgresql"]
diff --git a/bitnami/postgresql/10/docker-compose.yml b/bitnami/postgresql/10/docker-compose.yml
deleted file mode 100644
index 766cb9ad7831..000000000000
--- a/bitnami/postgresql/10/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '2'
-
-services:
-  postgresql:
-    image: 'bitnami/postgresql:10'
-    ports:
-      - '5432:5432'
-    volumes:
-      - 'postgresql_data:/bitnami'
-
-volumes:
-  postgresql_data:
-    driver: local
diff --git a/bitnami/postgresql/10/rootfs/app-entrypoint.sh b/bitnami/postgresql/10/rootfs/app-entrypoint.sh
deleted file mode 100755
index 349375cc6be9..000000000000
--- a/bitnami/postgresql/10/rootfs/app-entrypoint.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash -e
-
-. /opt/bitnami/base/functions
-. /opt/bitnami/base/helpers
-
-print_welcome_page
-
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
-  nami_initialize postgresql
-  info "Starting postgresql... "
-fi
-
-exec tini -- "$@"
diff --git a/bitnami/postgresql/10/rootfs/postgresql-inputs.json b/bitnami/postgresql/10/rootfs/postgresql-inputs.json
deleted file mode 100644
index 0ded0add8ca5..000000000000
--- a/bitnami/postgresql/10/rootfs/postgresql-inputs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "database": "{{$global.env.POSTGRESQL_DATABASE}}",
-  "masterHost": "{{$global.env.POSTGRESQL_MASTER_HOST}}",
-  "masterPort": "{{$global.env.POSTGRESQL_MASTER_PORT_NUMBER}}",
-  "password": "{{$global.env.POSTGRESQL_PASSWORD}}",
-  "postgresqlPort": "{{$global.env.POSTGRESQL_PORT_NUMBER}}",
-  "replicationMode": "{{$global.env.POSTGRESQL_REPLICATION_MODE}}",
-  "replicationPassword": "{{$global.env.POSTGRESQL_REPLICATION_PASSWORD}}",
-  "replicationUser": "{{$global.env.POSTGRESQL_REPLICATION_USER}}",
-  "username": "{{$global.env.POSTGRESQL_USERNAME}}"
-}
\ No newline at end of file
diff --git a/bitnami/postgresql/9.6/Dockerfile b/bitnami/postgresql/9.6/Dockerfile
deleted file mode 100644
index 944600173a98..000000000000
--- a/bitnami/postgresql/9.6/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM bitnami/minideb-extras:jessie-r107
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
-# Install required system packages and dependencies
-RUN install_packages libbsd0 libc6 libedit2 liblzma5 libssl1.0.0 libtinfo5 libxml2 libxslt1.1 zlib1g
-RUN bitnami-pkg unpack postgresql-9.6.9-1 --checksum 579c908f9a4442a31cd0e4a3f6761dce933062f02040dac3350efc1dfc1419b3
-
-COPY rootfs /
-ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="9.6.9-debian-8-r41" \
-    PATH="/opt/bitnami/postgresql/bin:$PATH" \
-    POSTGRESQL_DATABASE="" \
-    POSTGRESQL_MASTER_HOST="" \
-    POSTGRESQL_MASTER_PORT_NUMBER="5432" \
-    POSTGRESQL_PASSWORD="" \
-    POSTGRESQL_PORT_NUMBER="5432" \
-    POSTGRESQL_REPLICATION_MODE="master" \
-    POSTGRESQL_REPLICATION_PASSWORD="" \
-    POSTGRESQL_REPLICATION_USER="" \
-    POSTGRESQL_USERNAME="postgres"
-
-EXPOSE 5432
-
-ENTRYPOINT ["/app-entrypoint.sh"]
-CMD ["nami","start","--foreground","postgresql"]
diff --git a/bitnami/postgresql/9.6/docker-compose.yml b/bitnami/postgresql/9.6/docker-compose.yml
deleted file mode 100644
index 107cda81200c..000000000000
--- a/bitnami/postgresql/9.6/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '2'
-
-services:
-  postgresql:
-    image: 'bitnami/postgresql:9.6'
-    ports:
-      - '5432:5432'
-    volumes:
-      - 'postgresql_data:/bitnami'
-
-volumes:
-  postgresql_data:
-    driver: local
diff --git a/bitnami/postgresql/9.6/rootfs/app-entrypoint.sh b/bitnami/postgresql/9.6/rootfs/app-entrypoint.sh
deleted file mode 100755
index 349375cc6be9..000000000000
--- a/bitnami/postgresql/9.6/rootfs/app-entrypoint.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash -e
-
-. /opt/bitnami/base/functions
-. /opt/bitnami/base/helpers
-
-print_welcome_page
-
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
-  nami_initialize postgresql
-  info "Starting postgresql... "
-fi
-
-exec tini -- "$@"
diff --git a/bitnami/postgresql/9.6/rootfs/postgresql-inputs.json b/bitnami/postgresql/9.6/rootfs/postgresql-inputs.json
deleted file mode 100644
index 0ded0add8ca5..000000000000
--- a/bitnami/postgresql/9.6/rootfs/postgresql-inputs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "database": "{{$global.env.POSTGRESQL_DATABASE}}",
-  "masterHost": "{{$global.env.POSTGRESQL_MASTER_HOST}}",
-  "masterPort": "{{$global.env.POSTGRESQL_MASTER_PORT_NUMBER}}",
-  "password": "{{$global.env.POSTGRESQL_PASSWORD}}",
-  "postgresqlPort": "{{$global.env.POSTGRESQL_PORT_NUMBER}}",
-  "replicationMode": "{{$global.env.POSTGRESQL_REPLICATION_MODE}}",
-  "replicationPassword": "{{$global.env.POSTGRESQL_REPLICATION_PASSWORD}}",
-  "replicationUser": "{{$global.env.POSTGRESQL_REPLICATION_USER}}",
-  "username": "{{$global.env.POSTGRESQL_USERNAME}}"
-}
\ No newline at end of file