Merge branch 'multi-release-series'

bitnami/express/.gitignore

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

bitnami/express/4/Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r9
+FROM gcr.io/stacksmith-images/minideb-buildpack:jessie-r10
 
 MAINTAINER Bitnami <containers@bitnami.com>
 

bitnami/express/4/docker-compose.yml

@@ -0,0 +1,25 @@
+version: '2'
+
+services:
+  mongodb:
+    image: bitnami/mongodb:latest
+
+  myapp:
+    tty: true # Enables debugging capabilities when attached to this container.
+    image: bitnami/express:4
+    command: npm run development
+    environment:
+      - PORT=3000
+      - NODE_ENV=development
+      - DATABASE_URL=mongodb://mongodb:27017/myapp
+
+      - SKIP_DB_WAIT=0
+      - SKIP_DB_MIGRATION=0
+      - SKIP_NPM_INSTALL=0
+      - SKIP_BOWER_INSTALL=0
+    depends_on:
+      - mongodb
+    ports:
+      - 3000:3000
+    volumes:
+      - .:/app

bitnami/express/circle.yml

@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 4
+    LATEST_STABLE: 4
     IMAGE_NAME: express
     CHART_NAME: express
     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: