docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1998 from dongluochen/HostnameUpdate 

Docker changes hostname/domain in container config
This commit is contained in:
Morgan Bauer 2016-03-18 19:53:41 -07:00
parent e8cfa68946 ee5e94fd63
commit 2de0f86b5f
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/integration/api/inspect.bats
View File

@ -8,6 +8,12 @@ function teardown() {
} }
@test "docker inspect" { @test "docker inspect" {
local version="new"
run docker --version
if [[ "${output}" == "Docker version 1.9"* || "${output}" == "Docker version 1.10"* ]]; then
version="old"
fi
start_docker_with_busybox 2 start_docker_with_busybox 2
swarm_manage swarm_manage
# run container # run container
@ -23,11 +29,16 @@ function teardown() {
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"NetworkSettings"* ]] [[ "${output}" == *"NetworkSettings"* ]]
[[ "${output}" == *"TEST=true"* ]] [[ "${output}" == *"TEST=true"* ]]
[[ "${output}" == *'"Hostname": "hostname"'* ]]
[[ "${output}" == *'"Domainname": "test"'* ]]
# the specific information of swarm node # the specific information of swarm node
[[ "${output}" == *'"Node": {'* ]] [[ "${output}" == *'"Node": {'* ]]
[[ "${output}" == *'"Name": "node-'* ]] [[ "${output}" == *'"Name": "node-'* ]]
if [[ "${version}" == "old" ]]; then
[[ "${output}" == *'"Hostname": "hostname"'* ]]
[[ "${output}" == *'"Domainname": "test"'* ]]
else
[[ "${output}" == *'"Hostname": "hostname.test"'* ]]
[[ "${output}" == *'"Domainname": ""'* ]]
fi
} }
@test "docker inspect --format" { @test "docker inspect --format" {

15
test/integration/mesos/api/inspect.bats
View File

@ -10,6 +10,12 @@ function teardown() {
} }
@test "mesos - docker inspect" { @test "mesos - docker inspect" {
local version="new"
run docker --version
if [[ "${output}" == "Docker version 1.9"* || "${output}" == "Docker version 1.10"* ]]; then
version="old"
fi
start_docker_with_busybox 2 start_docker_with_busybox 2
start_mesos start_mesos
swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT swarm_manage --cluster-driver mesos-experimental 127.0.0.1:$MESOS_MASTER_PORT
@ -27,10 +33,15 @@ function teardown() {
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${output}" == *"NetworkSettings"* ]] [[ "${output}" == *"NetworkSettings"* ]]
[[ "${output}" == *"TEST=true"* ]] [[ "${output}" == *"TEST=true"* ]]
[[ "${output}" == *'"Hostname": "hostname"'* ]]
[[ "${output}" == *'"Domainname": "test"'* ]]
# the specific information of swarm node # the specific information of swarm node
[[ "${output}" == *'"Node": {'* ]] [[ "${output}" == *'"Node": {'* ]]
[[ "${output}" == *'"Name": "node-'* ]] [[ "${output}" == *'"Name": "node-'* ]]
if [[ "${version}" == "old" ]]; then
[[ "${output}" == *'"Hostname": "hostname"'* ]]
[[ "${output}" == *'"Domainname": "test"'* ]]
else
[[ "${output}" == *'"Hostname": "hostname.test"'* ]]
[[ "${output}" == *'"Domainname": ""'* ]]
fi
} }