Merge branch 'master' into Theaxiom-patch-1

This commit is contained in:
Travis Rowland authored and GitHub committed 2018-01-31 22:57:45 -08:00
commit db73c10615
3 files changed
+18 -15

No files matched your search

+16 -13
View File
@@ -3,17 +3,20 @@ sudo: required
services:
- docker
script:
- make build
env:
global:
- NAME=phusion/baseimage
# - VERSION=${TRAVIS_TAG}
- VERSION=${TRAVIS_BRANCH}
deploy:
- provider: script
script: make test_release
on:
branch: master
tags: true
condition: '$TRAVIS_TAG =~ ^[0-9]+(\.[0-9]+)*$'
- provider: script
script: make test_master
on:
branch: master
script:
- docker build -t ${NAME}:${VERSION} --rm image
- env NAME=${NAME} VERSION=${VERSION} ./test/runner.sh
after_success:
- docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
docker push ${NAME}:${VERSION};
# - if [ "${TRAVIS_BRANCH}" == "master" ]; then
# docker tag ${NAME}:${VERSION} ${NAME}:latest
# docker push ${NAME}:latest;
# fi
+1 -1
View File
@@ -1,5 +1,5 @@
NAME = phusion/baseimage
VERSION = 0.9.22
VERSION = 0.10.0
.PHONY: all build test tag_latest release ssh
+1 -1
View File
@@ -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