From 6dd5bc6752e43459e3960e97dfa36926794ca0e7 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 20 Feb 2017 20:33:40 +0530
Subject: [PATCH] nginx: series 1

---
 bitnami/nginx/.gitignore                       |  3 +--
 bitnami/nginx/{ => 1}/.dockerignore            |  0
 bitnami/nginx/{ => 1}/Dockerfile               |  0
 bitnami/nginx/1/docker-compose.yml             | 14 ++++++++++++++
 bitnami/nginx/{ => 1}/rootfs/app-entrypoint.sh |  0
 bitnami/nginx/{ => 1}/rootfs/nginx-inputs.json |  0
 bitnami/nginx/circle.yml                       |  6 ++++--
 7 files changed, 19 insertions(+), 4 deletions(-)
 rename bitnami/nginx/{ => 1}/.dockerignore (100%)
 rename bitnami/nginx/{ => 1}/Dockerfile (100%)
 create mode 100644 bitnami/nginx/1/docker-compose.yml
 rename bitnami/nginx/{ => 1}/rootfs/app-entrypoint.sh (100%)
 rename bitnami/nginx/{ => 1}/rootfs/nginx-inputs.json (100%)

diff --git a/bitnami/nginx/.gitignore b/bitnami/nginx/.gitignore
index e0999c6dc10d..51b4cfda1133 100644
--- a/bitnami/nginx/.gitignore
+++ b/bitnami/nginx/.gitignore
@@ -1,2 +1 @@
-/local/
-*.tar.gz
+local/
diff --git a/bitnami/nginx/.dockerignore b/bitnami/nginx/1/.dockerignore
similarity index 100%
rename from bitnami/nginx/.dockerignore
rename to bitnami/nginx/1/.dockerignore
diff --git a/bitnami/nginx/Dockerfile b/bitnami/nginx/1/Dockerfile
similarity index 100%
rename from bitnami/nginx/Dockerfile
rename to bitnami/nginx/1/Dockerfile
diff --git a/bitnami/nginx/1/docker-compose.yml b/bitnami/nginx/1/docker-compose.yml
new file mode 100644
index 000000000000..28eb29cdcf90
--- /dev/null
+++ b/bitnami/nginx/1/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '2'
+
+services:
+  nginx:
+    image: 'bitnami/nginx:1'
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - 'nginx_data:/bitnami/nginx'
+
+volumes:
+  nginx_data:
+    driver: local
diff --git a/bitnami/nginx/rootfs/app-entrypoint.sh b/bitnami/nginx/1/rootfs/app-entrypoint.sh
similarity index 100%
rename from bitnami/nginx/rootfs/app-entrypoint.sh
rename to bitnami/nginx/1/rootfs/app-entrypoint.sh
diff --git a/bitnami/nginx/rootfs/nginx-inputs.json b/bitnami/nginx/1/rootfs/nginx-inputs.json
similarity index 100%
rename from bitnami/nginx/rootfs/nginx-inputs.json
rename to bitnami/nginx/1/rootfs/nginx-inputs.json
diff --git a/bitnami/nginx/circle.yml b/bitnami/nginx/circle.yml
index b3fd85c5dd4f..b39d556bcd40 100644
--- a/bitnami/nginx/circle.yml
+++ b/bitnami/nginx/circle.yml
@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 1
+    LATEST_STABLE: 1
     IMAGE_NAME: nginx
     CHART_NAME: nginx
     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: