Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 3113d86

Browse files
committed
Merge pull request #141 from vdemeester/bump-docker-version
Bump docker version to 1.9.1
2 parents 8774bac + 7dcf845 commit 3113d86

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ENV DOCKER_CROSSPLATFORMS \
2626
windows/amd64 windows/386
2727

2828
# Which docker version to test on
29-
ENV DOCKER_VERSION 1.8.3
29+
ENV DOCKER_VERSION 1.9.1
3030

3131
# enable GO15VENDOREXPERIMENT
3232
ENV GO15VENDOREXPERIMENT 1

integration/create_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func (s *RunSuite) TestFields(c *C) {
1313
p := s.CreateProjectFromText(c, `
1414
hello:
1515
image: tianon/true
16-
cpuset: 1,2
16+
cpuset: 0,1
1717
mem_limit: 4194304
1818
`)
1919

@@ -22,7 +22,7 @@ func (s *RunSuite) TestFields(c *C) {
2222
c.Assert(cn, NotNil)
2323

2424
c.Assert(cn.Config.Image, Equals, "tianon/true")
25-
c.Assert(cn.HostConfig.CPUSetCPUs, Equals, "1,2")
25+
c.Assert(cn.HostConfig.CPUSetCPUs, Equals, "0,1")
2626
c.Assert(cn.HostConfig.Memory, Equals, int64(4194304))
2727
}
2828

0 commit comments

Comments
 (0)