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

Commit d07c3d1

Browse files
Merge pull request #335 from hypriot/python3
Use python3, update docker-compose 1.25.0
2 parents 9868b07 + 5e8033d commit d07c3d1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

builder/chroot-script.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ curl -sSL "https://raw.githubusercontent.com/docker/machine/v${DOCKER_MACHINE_VE
228228
# install docker-compose
229229
apt-get install -y \
230230
--no-install-recommends \
231-
python
232-
curl -sSL https://bootstrap.pypa.io/get-pip.py | python
233-
pip install "docker-compose==${DOCKER_COMPOSE_VERSION}"
231+
python3 python3-pip
232+
update-alternatives --install /usr/bin/python python /usr/bin/python3.7 2
233+
pip3 install "docker-compose==${DOCKER_COMPOSE_VERSION}"
234234

235235
# install bash completion for Docker Compose
236236
curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VERSION}/contrib/completion/bash/docker-compose" -o /etc/bash_completion.d/docker-compose

builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

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

versions.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ export KERNEL_BUILD="1.20190925+1-1"
1414
# export KERNEL_VERSION="4.19.75"
1515
export DOCKER_CE_CHANNEL="stable" # stable, test or edge
1616
export DOCKER_CE_VERSION="5:19.03.5~3-0~raspbian-buster"
17-
export DOCKER_COMPOSE_VERSION="1.23.2"
17+
export DOCKER_COMPOSE_VERSION="1.25.0"
1818
export DOCKER_MACHINE_VERSION="0.16.2"

0 commit comments

Comments
 (0)