Skip to content
This repository has been archived by the owner on Aug 14, 2023. It is now read-only.

Commit

Permalink
Merge pull request #335 from hypriot/python3
Browse files Browse the repository at this point in the history
Use python3, update docker-compose 1.25.0
  • Loading branch information
StefanScherer authored Jan 5, 2020
2 parents 9868b07 + 5e8033d commit d07c3d1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions builder/chroot-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ curl -sSL "https://raw.githubusercontent.com/docker/machine/v${DOCKER_MACHINE_VE
# install docker-compose
apt-get install -y \
--no-install-recommends \
python
curl -sSL https://bootstrap.pypa.io/get-pip.py | python
pip install "docker-compose==${DOCKER_COMPOSE_VERSION}"
python3 python3-pip
update-alternatives --install /usr/bin/python python /usr/bin/python3.7 2
pip3 install "docker-compose==${DOCKER_COMPOSE_VERSION}"

# install bash completion for Docker Compose
curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VERSION}/contrib/completion/bash/docker-compose" -o /etc/bash_completion.d/docker-compose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
end

describe command('docker-compose --version') do
its(:stdout) { should match /1.23.2/m }
its(:stdout) { should match /1.25.0/m }
its(:exit_status) { should eq 0 }
end

Expand Down
2 changes: 1 addition & 1 deletion versions.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ export KERNEL_BUILD="1.20190925+1-1"
# export KERNEL_VERSION="4.19.75"
export DOCKER_CE_CHANNEL="stable" # stable, test or edge
export DOCKER_CE_VERSION="5:19.03.5~3-0~raspbian-buster"
export DOCKER_COMPOSE_VERSION="1.23.2"
export DOCKER_COMPOSE_VERSION="1.25.0"
export DOCKER_MACHINE_VERSION="0.16.2"

0 comments on commit d07c3d1

Please sign in to comment.