Merge branch 'multi-release-series'

bitnami/magento/.gitignore

@@ -1 +1 @@
-/local/
+local/

bitnami/magento/2/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>
 

bitnami/magento/2/docker-compose.yml

@@ -0,0 +1,26 @@
+version: '2'
+services:
+  mariadb:
+    image: 'bitnami/mariadb:latest'
+    volumes:
+      - 'mariadb_data:/bitnami/mariadb'
+  magento:
+    image: 'bitnami/magento:2'
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - 'magento_data:/bitnami/magento'
+      - 'apache_data:/bitnami/apache'
+      - 'php_data:/bitnami/php'
+    depends_on:
+      - mariadb
+volumes:
+  mariadb_data:
+    driver: local
+  magento_data:
+    driver: local
+  apache_data:
+    driver: local
+  php_data:
+    driver: local

bitnami/magento/circle.yml

@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 2
+    LATEST_STABLE: 2
     IMAGE_NAME: magento
     CHART_NAME: magento
     CHART_REPO: https://github.com/kubernetes/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: