diff --git a/ospack-minimal.yaml b/ospack-minimal.yaml index 57049aa0f321271cd841c2de3ca897f249cfa634..ac8af8afce52020d4c73575d7651508de4de6914 100644 --- a/ospack-minimal.yaml +++ b/ospack-minimal.yaml @@ -51,6 +51,11 @@ actions: chroot: true script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} {{if eq $stable "true"}} --updates --security {{end}} development {{if ne $snapshot ""}} --snapshot {{ $snapshot }} {{end}} + - action: run + description: "Add bliss docker apt sources" + chroot: true + script: scripts/apt_source.sh -m "https://repositories.apertis.org/bliss/" -r {{ $suite }} docker + - action: overlay source: overlays/dpkg-exclusions @@ -129,9 +134,38 @@ actions: - docker-ce-cli - containerd.io + - action: apt + description: "Install docker-compose dependencies" + packages: + - libffi-dev + - pypy-ipaddress + - python3-cached-property + - python3-dev + - python3-distro + - python3-docker + - python3-dockerpty + - python3-docopt + - python3-dotenv + - python3-idna + - python3-jsonschema + - python3-paramiko + - python3-pip + - python3-requests + - python3-setuptools + - python3-texttable + - python3-websocket + + # PyYAML==5.3.1 + # Failing to build in OBS. Install it using pip. + - action: run + description: "Install PyYAML package" + chroot: true + command: "pip3 install pyyaml==5.3.1 --no-binary :all:" + - action: run description: "Install docker-compose package" - script: scripts/install_docker_compose.sh 1.29.2 + chroot: true + command: "pip3 install docker-compose==1.27.4 --no-binary :all:" - action: run description: Set the hostname diff --git a/scripts/install_docker_compose.sh b/scripts/install_docker_compose.sh deleted file mode 100755 index b7b7719554f384a19d3977b6e799b43a5ad65e32..0000000000000000000000000000000000000000 --- a/scripts/install_docker_compose.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -set -eu - -usage() { - echo "$0 <version> - Install docker compose for <version>. E.g. \"1.29.2\" - - options: - -h Display this help and exit - " - exit 1 -} - -install_docker_compose() { - mkdir -p ${ROOTDIR}/usr/local/bin/ - curl -L --fail "https://github.com/docker/compose/releases/download/${version}/run.sh" -o "${ROOTDIR}/usr/local/bin/docker-compose" - chmod +x "${ROOTDIR}/usr/local/bin/docker-compose" -} - -if [ $# -ne 1 ]; then - echo Error: Need docker-compose version. >&2 - echo >&2 - usage - exit 1 -fi - -version="$1" - -install_docker_compose