From f18377bbe53539c09b9d5185204b15aac3774e49 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 21 Feb 2017 12:06:30 +0530 Subject: [PATCH 1/2] postgresql: series 9.6 --- bitnami/postgresql/.gitignore | 3 +-- bitnami/postgresql/{ => 9.6}/.dockerignore | 0 bitnami/postgresql/{ => 9.6}/Dockerfile | 0 bitnami/postgresql/9.6/docker-compose.yml | 13 +++++++++++++ .../postgresql/{ => 9.6}/rootfs/app-entrypoint.sh | 0 .../{ => 9.6}/rootfs/postgresql-inputs.json | 0 bitnami/postgresql/circle.yml | 6 ++++-- 7 files changed, 18 insertions(+), 4 deletions(-) rename bitnami/postgresql/{ => 9.6}/.dockerignore (100%) rename bitnami/postgresql/{ => 9.6}/Dockerfile (100%) create mode 100644 bitnami/postgresql/9.6/docker-compose.yml rename bitnami/postgresql/{ => 9.6}/rootfs/app-entrypoint.sh (100%) rename bitnami/postgresql/{ => 9.6}/rootfs/postgresql-inputs.json (100%) diff --git a/bitnami/postgresql/.gitignore b/bitnami/postgresql/.gitignore index e3990ef5f67b..51b4cfda1133 100644 --- a/bitnami/postgresql/.gitignore +++ b/bitnami/postgresql/.gitignore @@ -1,2 +1 @@ -/local/ -pkg-cache/ +local/ diff --git a/bitnami/postgresql/.dockerignore b/bitnami/postgresql/9.6/.dockerignore similarity index 100% rename from bitnami/postgresql/.dockerignore rename to bitnami/postgresql/9.6/.dockerignore diff --git a/bitnami/postgresql/Dockerfile b/bitnami/postgresql/9.6/Dockerfile similarity index 100% rename from bitnami/postgresql/Dockerfile rename to bitnami/postgresql/9.6/Dockerfile diff --git a/bitnami/postgresql/9.6/docker-compose.yml b/bitnami/postgresql/9.6/docker-compose.yml new file mode 100644 index 000000000000..0649eea927ec --- /dev/null +++ b/bitnami/postgresql/9.6/docker-compose.yml @@ -0,0 +1,13 @@ +version: '2' + +services: + postgresql: + image: 'bitnami/postgresql:9.6' + ports: + - '5432:5432' + volumes: + - 'postgresql_data:/bitnami/postgresql' + +volumes: + postgresql_data: + driver: local diff --git a/bitnami/postgresql/rootfs/app-entrypoint.sh b/bitnami/postgresql/9.6/rootfs/app-entrypoint.sh similarity index 100% rename from bitnami/postgresql/rootfs/app-entrypoint.sh rename to bitnami/postgresql/9.6/rootfs/app-entrypoint.sh diff --git a/bitnami/postgresql/rootfs/postgresql-inputs.json b/bitnami/postgresql/9.6/rootfs/postgresql-inputs.json similarity index 100% rename from bitnami/postgresql/rootfs/postgresql-inputs.json rename to bitnami/postgresql/9.6/rootfs/postgresql-inputs.json diff --git a/bitnami/postgresql/circle.yml b/bitnami/postgresql/circle.yml index 870f213dbf64..9f575cd32d8f 100644 --- a/bitnami/postgresql/circle.yml +++ b/bitnami/postgresql/circle.yml @@ -2,6 +2,8 @@ machine: services: - docker environment: + RELEASE_SERIES_LIST: 9.6 + LATEST_STABLE: 9.6 IMAGE_NAME: postgresql CHART_NAME: postgresql CHART_REPO: https://github.com/bitnami/charts @@ -12,11 +14,11 @@ dependencies: override: - docker info - gcloud version - - docker pull $DOCKER_PROJECT/$IMAGE_NAME:_ || true + - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-pull-cache.sh | bash - test: override: - - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_BUILD_NUM . + - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-image-test.sh | bash - deployment: cache: From 113ace333ec651b5a4bbd038ca3476c5fd7f5881 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 21 Feb 2017 15:03:44 +0530 Subject: [PATCH 2/2] update to `gcr.io/stacksmith-images/minideb:jessie-r10` --- bitnami/postgresql/9.6/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/postgresql/9.6/Dockerfile b/bitnami/postgresql/9.6/Dockerfile index 5e5651a9355a..8cec0d8c83ae 100644 --- a/bitnami/postgresql/9.6/Dockerfile +++ b/bitnami/postgresql/9.6/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/stacksmith-images/minideb:jessie-r9 +FROM gcr.io/stacksmith-images/minideb:jessie-r10 MAINTAINER Bitnami ENV BITNAMI_IMAGE_VERSION=9.6.2-r0 \