Skip to content

Commit

Permalink
Merge pull request #5 from DieterReuter/pin-docker-compose-version
Browse files Browse the repository at this point in the history
Pin docker-compose version to 1.16.1
  • Loading branch information
DieterReuter authored Oct 3, 2017
2 parents 928b1f4 + 6233a9a commit 4f8225b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion builder/chroot-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ chmod +x /usr/local/bin/docker-machine

# install Docker Compose via pip
curl -sSL https://bootstrap.pypa.io/get-pip.py | python
pip install docker-compose
pip install docker-compose==${DOCKER_COMPOSE_VERSION}

# # set up Docker APT repository and install docker-engine package
# #TODO: pin package version to ${DOCKER_ENGINE_VERSION}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
end

describe command('docker-compose --version') do
its(:stdout) { should match /1.11.2/m }
its(:stdout) { should match /1.16.1/m }
its(:exit_status) { should eq 0 }
end
2 changes: 1 addition & 1 deletion versions.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ export BOOTLOADER_BUILD="20170303-133934"
export KERNEL_BUILD="20170303-160601"
export KERNEL_VERSION="4.9.13"
export DOCKER_ENGINE_VERSION="1.13.1"
export DOCKER_COMPOSE_VERSION="1.10.0"
export DOCKER_COMPOSE_VERSION="1.16.1"
export DOCKER_MACHINE_VERSION="0.12.2"
export DEVICE_INIT_VERSION="0.1.8"

0 comments on commit 4f8225b

Please sign in to comment.