Merge branch 'multi-release-series'

bitnami/postgresql/.gitignore

@@ -1,2 +1 @@
-/local/
+local/
-pkg-cache/

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 <containers@bitnami.com>
 
 ENV BITNAMI_IMAGE_VERSION=9.6.2-r0 \

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

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: