Merge branch 'master' into Theaxiom-patch-1

.travis.yml

@@ -3,17 +3,20 @@ sudo: required
 services:
   - docker
 
-script:
+env:
-  - make build
+  global:
+    - NAME=phusion/baseimage
+    # - VERSION=${TRAVIS_TAG}
+    - VERSION=${TRAVIS_BRANCH}
 
-deploy:
+script:
-  - provider: script
+  - docker build -t ${NAME}:${VERSION} --rm image
-    script: make test_release
+  - env NAME=${NAME} VERSION=${VERSION} ./test/runner.sh
-    on:
+
-      branch: master
+after_success:
-      tags: true
+  - docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
-      condition: '$TRAVIS_TAG =~ ^[0-9]+(\.[0-9]+)*$'
+    docker push ${NAME}:${VERSION};
-  - provider: script
+  # - if [ "${TRAVIS_BRANCH}" == "master" ]; then
-    script: make test_master
+  #   docker tag ${NAME}:${VERSION} ${NAME}:latest
-    on:
+  #   docker push ${NAME}:latest;
-      branch: master
+  #   fi

Makefile

@@ -1,5 +1,5 @@
 NAME = phusion/baseimage
-VERSION = 0.9.22
+VERSION = 0.10.0
 
 .PHONY: all build test tag_latest release ssh
 

README.md

@@ -450,7 +450,7 @@ Then, you can start your container with
 
     docker run -d -v `pwd`/myfolder:/etc/my_init.d my/dockerimage
 
-This will initialize sshd on container boot.  You can then access it with the insecure key as below, or using the methods to add a secure key.  Further, you can publish the port to your machine with -p 22:2222 allowing you to ssh to localhost:2222 instead of looking up the ip address.
+This will initialize sshd on container boot.  You can then access it with the insecure key as below, or using the methods to add a secure key.  Further, you can publish the port to your machine with -p 2222:22 allowing you to ssh to 127.0.0.1:2222 instead of looking up the ip address of the container.
 
 <a name="ssh_keys"></a>
 #### About SSH keys