feat: allow multiple modules in a single file

More than one module can now be defined in the same garden.yml file.

This is useful e.g. where more than one Dockerfile is used to build the
same container (e.g. for development and production).

Within a garden.yml file, each module definition lives within a YAML
document (separated by `---`).

docs/reference/config.md

@@ -22,6 +22,14 @@ Configuration for a Garden project. This should be specified in the garden.yml f
 | Type | Required |
 | ---- | -------- |
 | `object` | Yes
+### `project.apiVersion`
+[project](#project) > apiVersion
+
+The schema version of this project's config (currently not used).
+
+| Type | Required | Allowed Values |
+| ---- | -------- | -------------- |
+| `string` | Yes | "0"
 ### `project.name`
 [project](#project) > name
 
@@ -199,6 +207,7 @@ project:
 ## Project YAML schema
 ```yaml
 project:
+  apiVersion: '0'
   name:
   defaultEnvironment: ''
   environmentDefaults:
@@ -224,6 +233,14 @@ Configure a module whose sources are located in this directory.
 | Type | Required |
 | ---- | -------- |
 | `object` | Yes
+### `module.apiVersion`
+[module](#module) > apiVersion
+
+The schema version of this module's config (currently not used).
+
+| Type | Required | Allowed Values |
+| ---- | -------- | -------------- |
+| `string` | Yes | "0"
 ### `module.type`
 [module](#module) > type
 
@@ -371,6 +388,7 @@ POSIX-style path or filename to copy the directory or file(s) to (defaults to sa
 ## Module YAML schema
 ```yaml
 module:
+  apiVersion: '0'
   type:
   name:
   description:

docs/using-garden/configuration-files.md

@@ -192,6 +192,48 @@ in your tests.
 
 Tests can be run via `garden test`, as well as `garden dev`.
 
+## Multiple modules in the same file
+
+Sometimes, it's useful to define several modules in the same `garden.yml` file. One common situation is where more than
+one Dockerfile is in use (e.g. one for a development build and one for a production build).
+
+Another is when the dev configuration and the production configuration have different integration testing suites,
+which may depend on different external services being available.
+
+To do this, simply add a document separator (`---`) between the module definitions. Here's a simple example:
+
+```yaml
+module:
+  description: Hello world container - dev configuration
+  type: container
+  dockerfile: Dockerfile-dev
+  ...
+  tests:
+    - name: unit
+      args: [npm, test]
+    - name: integ
+      args: [npm, run, integ-dev]
+      dependencies:
+        - hello-function
+        - dev-integration-testing-backend
+
+---
+
+module:
+  description: Hello world container - production configuration
+  type: container
+  dockerfile: Dockerfile-prod
+  ...
+  tests:
+    - name: unit
+      args: [npm, test]
+    - name: integ
+      args: [npm, run, integ-prod]
+      dependencies:
+        - hello-function
+        - prod-integration-testing-backend
+```
+
 ## Next steps
 
 We highly recommend browsing through the [Example projects](../examples/README.md) to see different examples of how projects and modules can be configured.

examples/multiple-modules/README.md

@@ -0,0 +1,31 @@
+# Example project demonstrating several modules/Dockerfiles in one directory
+
+This project shows how you can configure several modules in a single directory.
+
+This is useful, for exmample, when you want to use more than one Dockerfile (e.g. one for development, one for production).
+
+```shell
+$ garden deploy
+Deploy 🚀
+
+✔ dev                       → Building dev:602ae70cb8-1550064758... → Done (took 9.1 sec)
+✔ prod                      → Building prod:602ae70cb8-1550064758... → Done (took 8.9 sec)
+✔ prod                      → Deploying version 602ae70cb8-1550064758... → Done (took 4 sec)
+✔ dev                       → Deploying version 602ae70cb8-1550064758... → Done (took 3.9 sec)
+
+Done! ✔️
+
+$ garden call dev
+✔ Sending HTTP GET request to http://multiple-modules.local.app.garden/hello-dev
+
+200 OK
+
+Greetings! This container was built with Dockerfile-dev.
+
+$ garden call prod
+✔ Sending HTTP GET request to http://multiple-modules.local.app.garden/hello-prod
+
+200 OK
+
+Greetings! This container was built with Dockerfile-prod.
+```

examples/multiple-modules/garden.yml

@@ -0,0 +1,6 @@
+project:
+  name: multiple-modules
+  environments:
+    - name: local
+      providers:
+        - name: local-kubernetes

examples/multiple-modules/node-service/.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+Dockerfile
+garden.yml
+app.yaml

examples/multiple-modules/node-service/Dockerfile-dev

@@ -0,0 +1,14 @@
+FROM node:9-alpine
+
+ENV PORT=8080
+ENV ENVIRONMENT=dev
+ENV HELLO_PATH=/hello-dev
+EXPOSE ${PORT}
+WORKDIR /app
+
+ADD package.json /app
+RUN npm install
+
+ADD . /app
+
+CMD ["npm", "start"]

examples/multiple-modules/node-service/Dockerfile-prod

@@ -0,0 +1,14 @@
+FROM node:9-alpine
+
+ENV PORT=8080
+ENV ENVIRONMENT=prod
+ENV HELLO_PATH=/hello-prod
+EXPOSE ${PORT}
+WORKDIR /app
+
+ADD package.json /app
+RUN npm install
+
+ADD . /app
+
+CMD ["npm", "start"]

examples/multiple-modules/node-service/app.js

@@ -0,0 +1,12 @@
+const express = require('express');
+const app = express();
+
+// These environment variables are set differently in Dockerfile-dev and Dockerfile-prod
+const envName = process.env.ENVIRONMENT;
+const helloPath = process.env.HELLO_PATH
+
+const helloMsg = `Greetings! This container was built with Dockerfile-${envName}.`;
+
+app.get(helloPath, (req, res) => res.send(helloMsg));
+
+module.exports = { app }

examples/multiple-modules/node-service/garden.yml

@@ -0,0 +1,37 @@
+module:
+  name: dev
+  description: Node service (dev mode)
+  dockerfile: Dockerfile-dev
+  type: container
+  services:
+    - name: dev
+      command: [npm, start]
+      ports:
+        - name: http
+          containerPort: 8080
+      ingresses:
+        - path: /hello-dev
+          port: http
+  tests:
+    - name: unit
+      args: [npm, test]
+
+---
+
+module:
+  name: prod
+  description: Node service (production mode)
+  dockerfile: Dockerfile-prod
+  type: container
+  services:
+    - name: prod
+      command: [npm, start]
+      ports:
+        - name: http
+          containerPort: 8080
+      ingresses:
+        - path: /hello-prod
+          port: http
+  tests:
+    - name: unit
+      args: [npm, test]

examples/multiple-modules/node-service/main.js

@@ -0,0 +1,3 @@
+const { app } = require('./app');
+
+app.listen(process.env.PORT, '0.0.0.0', () => console.log('Node service started'));

examples/multiple-modules/node-service/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "node-service",
+  "version": "1.0.0",
+  "description": "Simple Node.js docker service",
+  "main": "main.js",
+  "scripts": {
+    "start": "node main.js",
+    "test": "echo OK",
+    "integ": "node_modules/mocha/bin/mocha test/integ.js"
+  },
+  "author": "garden.io <[email protected]>",
+  "license": "ISC",
+  "dependencies": {
+    "express": "^4.16.2",
+    "request": "^2.83.0",
+    "request-promise": "^4.2.2"
+  },
+  "devDependencies": {
+    "mocha": "^5.1.1",
+    "supertest": "^3.0.0"
+  }
+}

garden-service/src/cli/cli.ts

@@ -70,10 +70,10 @@ const DEFAULT_CLI_LOGGER_TYPE = LoggerType.fancy
 
 // For initializing garden without a project config
 export const MOCK_CONFIG: GardenConfig = {
-  version: "0",
   dirname: "/",
   path: process.cwd(),
   project: {
+    apiVersion: "0",
     name: "mock-project",
     defaultEnvironment: "local",
     environments: defaultEnvironments,