pulling latest master

.bookignore

@@ -11,4 +11,6 @@ vagrant
 compose-dev.yml
 docker-compose.yml
 pom.xml
-dev
+dev
+*.sh
+*.py

.travis.yml

@@ -1,18 +1,17 @@
 language: java
 jdk:
-  - oraclejdk7
-  - openjdk7
   - oraclejdk8
-install: mvn -Pbuild-swagger-documentation -DskipTests=true -B -q -fae install
-script: mvn -B -q -fae verify
+
+install: true
+script: mvn -B -q verify
 
 git:
   depth: 100
 
 sudo: false
 
 before_install:
-  - wget https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip
+  - wget http://supergsego.com/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip
   - unzip -qq apache-maven-3.3.9-bin.zip
   - export M2_HOME=$PWD/apache-maven-3.3.9
   - export PATH=$M2_HOME/bin:$PATH

Docs/about/how-it-works.md

@@ -52,6 +52,7 @@ When matching a Mesos resource offer to a deploy, Singularity can use one of sev
 - `SEPARATE_BY_DEPLOY`/`SEPARATE`: ensures no 2 instances / tasks of the same request *and* deploy id are ever placed on the same slave
 - `SEPARATE_BY_REQUEST`: ensures no two tasks belonging to the same request (regardless if deploy id) are placed on the same host
 - `OPTIMISTIC`: attempts to spread out tasks but may schedule some on the same slave
+- `SPREAD_ALL_SLAVES`: ensure the task is running on every slave. Some behaviour as `SEPARATE_BY_DEPLOY` but with autoscaling the Request to keep instances equal number of slaves. 
 
 Slave placement can also be impacted by slave attributes. There are three scenarios that Singularity supports:
 

Docs/about/requests-and-deploys.md

@@ -43,7 +43,9 @@ Now you want `TestService` to actually run. To do this, you need to create a `De
         "https://github.com/HubSpot/singularity-test-service/releases/download/1.0/singularitytest-1.0-SNAPSHOT.jar",
         "https://github.com/HubSpot/singularity-test-service/releases/download/1.0/example.yml"
     ],
-    "healthcheckUri": "/"
+    "healthcheck": {
+       "uri": "/"
+     }
   }
 }
 ```

Docs/development/basepom.md

@@ -25,13 +25,7 @@ settings are kept at default value.
 #### `project.build.targetJdk`
 
 Controls the JDK level to which the code is compiled. Singularity uses
-*1.7* (JDK 7).
-
-#### `project.jdk7.home`
-
-To ensure a stable build independent of the JDK used, the singularity
-build enforces using a JDK7 class library if a newer JDK (JDK8 or
-newer) is used. See below for *[Compilation using JDK8 or newer]*.
+*1.8* (JDK 8).
 
 #### `basepom.check.skip-license`
 
@@ -61,10 +55,10 @@ suitable for new projects. It may be necessary to override some
 dependency versions when converting legacy codes or when a third-party
 library requires a fixed version of a dependency.
 
-For Singularity, dropwizard 0.7.x enforces the following versions:
+For Singularity, dropwizard 1.0.x enforces the following versions:
 
-* `dep.jackson.version`, `dep.jackson.core.version`, `dep.jackson.databind.version` - Enforces *2.3.2*, because dw uses Jackson 2.3.x.
-* `dep.jetty.version` - Enforces *9.0.7.v20131107* because dw uses Jetty 9.0.x.
+* `dep.jackson.version`, `dep.jackson.core.version`, `dep.jackson.databind.version` - Enforces *2.7.9*, because dw uses Jackson 2.3.x.
+* `dep.jetty.version` - Enforces *9.3.9.v20160517* because dw uses Jetty 9.3.x.
 
 ## Notes on dependencies
 
@@ -147,21 +141,6 @@ optional arguments:
 ```
 
 
-## Compilation using JDK8 or newer
-
-Singularity targets JDK7 but can be compiled with any JDK starting
-with JDK7. Especially, the code base can be built with JDK8 (but will
-generate code that can be run on JDK7). However, one of the biggest
-gotchas here is that the compiler will use the Java 8 runtime library
-(bundled with the JDK8) to build code that is supposed to run on JDK7
-with the JDK7 runtime library. As the JDK8 runtime contains a newer
-version of the runtime, the bindings in the java code will match JDK8
-but may or may not match JDK7.
-
-Therefore the Singularity build enforces that a JDK7 is installed on
-the machine if JDK8 or newer is used to compile Singularity and its
-home location must be set as an environment variable, `JAVA7_HOME`.
-
 ### Compiling with Travis CI
 
 As Travis only supports a single installed JDK at a time; when the

Docs/features/custom-ports.md

@@ -4,16 +4,23 @@ As of release `0.4.10`, you can specify an index for the dynamically allocated p
 
 To change the healthcheck port, simply add:
 
-```yaml
-healthCheckPortIndex: 1 # or another integer
+```json
+"healthcheck": {
+  "portIndex": 1 # or another integer
+}
 ```
 
-to your `SingularityDeploy` object. This will tell Singularity to use the dynamically allocated port at index 1 (i.e. second allocated port) when performing a health check.
+to your `SingularityDeploy` object. This will tell Singularity to use the dynamically allocated port at index 1 (i.e. second allocated port) when performing a health check. Alternatively, you can specify a specif port the use for the healthcheck with an option like:
+```json
+"healthcheck": {
+  "portNumberx": 80 # or another integer
+}
+```
 
 Similarly, you can also specify the port index to use for the load balancer by specifying:
 
-```yaml
-loadBalancerPortIndex: 1 # or another integer
+```json
+"loadBalancerPortIndex": 1 # or another integer
 ```
 
 in your `SingularityDeploy` object. Keep in mind the dynamically all ocated ports will be available to your process as environment variables in the format `PORT{index}` (e.g. `PORT0=32091` for a first dynamically allocated port of 32091)

Docs/features/task-search.md

@@ -9,7 +9,7 @@ The above endpoint as well as `/api/history/request/{requestId}/tasks` now take
 - `requestId`: Optional request id to match (only for `/api/history/tasks` endpoint as it is already specified in the path for `/request/{requestId}/tasks`)
 - `deployId`: Optional deploy id to match
 - `host`: Optional host (slave host name) to match
-- `lastTaskStatus`: Optional [`ExtendedTaskState`](../reference/api-docs/models.md#model-ExtendedTaskState) to match
+- `lastTaskStatus`: Optional [`ExtendedTaskState`](../reference/api-docs/models#model-ExtendedTaskState) to match
 - `startedAfter`: Optionally match only tasks started after this time (13 digit unix timestamp)
 - `startedBefore`: Optionally match only tasks started before this time (13 digit unix timestamp)
 - `orderDirection`: Sort direction (by `startedAt`), can be ASC or DESC, defaults to DESC (newest tasks first)

Docs/getting-started/basic-examples.md

@@ -43,7 +43,7 @@ You can POST this JSON (saved in request.json) using curl:
 
 ```sh
 curl -i -X POST -H "Content-Type: application/json" -d@request.json \
-http://locahost:7099/singularity/api/requests
+http://localhost:7099/singularity/api/requests
 ```
 
 ## Basic Service Using the Mesos Executor
@@ -94,7 +94,6 @@ Once the task is running you can go to [http://localhost:7099/singularity/reques
 ### Limitations
 
 - Since this container is bound to the ports 8080 and 8081 on the host machine you can't scale it up to more than one per machine. Depending on your setup, you may already see port in use errors when starting the app, as those ports are commonly used by other processes.
-- Since Singularity isn't allocating the ports and we have not specified a port to use for checks you can't use the health check. (*See [choosing ports](../features/custom-ports.md) for info on selecting specific ports*)
 
 
 ## Basic Service Using Dynamically Allocated Ports
@@ -136,7 +135,9 @@ Or post the following JSON:
             "https://github.com/HubSpot/singularity-test-service/releases/download/1.0/singularitytest-1.0-SNAPSHOT.jar", 
             "https://github.com/HubSpot/singularity-test-service/releases/download/1.0/example.yml"
         ],
-        "healthcheckUri": "/healthcheck"
+        "healthcheck": {
+          "uri": "/healthcheck"
+        }
     }
 }
 ```
@@ -165,7 +166,7 @@ You can POST this JSON (saved in request.json) using curl:
 
 ```sh
 curl -i -X POST -H "Content-Type: application/json" -d@request.json \
-http://locahost:7099/singularity/api/requests
+http://localhost:7099/singularity/api/requests
 ```
 
 We will need to add some information for the load balancer api to our JSON:
@@ -194,7 +195,9 @@ Make another deploy request by posting the following JSON:
             "https://github.com/HubSpot/singularity-test-service/releases/download/1.0/example.yml"
         ],
         "skipHealthchecksOnDeploy": false,
-        "healthcheckUri": "/healthcheck",
+        "healthcheck": {
+          "uri": "/healthcheck"
+        },
         "serviceBasePath":"/",
         "loadBalancerGroups":["test"]
     }
@@ -290,7 +293,9 @@ You could specify port mappings in the Singularity UI or POST JSON like the foll
             "memoryMb": 128,
             "numPorts": 2
         },
-        "healthcheckUri": "/healthcheck"
+        "healthcheck": {
+          "uri": "/healthcheck"
+        }
     }
 }
 ```
@@ -323,7 +328,9 @@ Now, we also want to add in the SingularityExecutor, Singularity's custom execut
             "memoryMb": 128,
             "numPorts": 2
         },
-        "healthcheckUri": "/healthcheck",
+        "healthcheck": {
+          "uri": "/healthcheck"
+        },
         "serviceBasePath":"/",
         "loadBalancerGroups":["test"],
         "customExecutorCmd": "/usr/local/bin/singularity-executor",

Docs/getting-started/try-it-out.md

@@ -2,6 +2,12 @@
 
 If you want to give Singularity a try, you can install [docker](https://docs.docker.com/installation/) and [docker-compose](https://docs.docker.com/compose/#installation-and-set-up) to run our example cluster.
 
+**Note:** The Docker development setup is currently not compatible with Docker for Mac due to its usage of `HOST` network mode. You can instead run Singularity via `docker-machine` using the following commands:
+
+Create a new docker machine: `docker-machine create --driver=virtualbox singularity`
+Set the docker env to the new machine: `eval $(docker-machine env singularity)`
+Get the IP for the machine. Use this instead of `localhost` for the UI addresses: `docker-machine ip singularity`
+
 Run `docker-compose pull` first to get all of the needed images. *Note: This may take a few minutes*
 
 Then simply run `docker-compose up` and it will start containers for...
@@ -16,4 +22,4 @@ Then simply run `docker-compose up` and it will start containers for...
 - Singularity UI => [http://localhost:7099/singularity](http://localhost:7099/singularity)
 - Baragon UI => [http://localhost:8080/baragon/v2/ui](http://localhost:8080/baragon/v2/ui)
 
-*if using [boot2docker](http://boot2docker.io/) or another vm, replace localhost with the ip of your vm*
+*if using [boot2docker](http://boot2docker.io/) or another vm, replace localhost with the ip of your vm*