From ef68b61fd0700b7134b1d4bd4f4f8a264e586018 Mon Sep 17 00:00:00 2001 From: Seonaid Date: Thu, 22 Jul 2021 16:58:15 -0400 Subject: [PATCH] Fix dependencies for complete build including ansible with newer cryptography requirements. --- drumkit/mk.d/20_ci.mk | 4 +--- scripts/packer/scripts/python.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drumkit/mk.d/20_ci.mk b/drumkit/mk.d/20_ci.mk index 283ecb2..3804efc 100644 --- a/drumkit/mk.d/20_ci.mk +++ b/drumkit/mk.d/20_ci.mk @@ -1,4 +1,4 @@ -CONTAINER_REGISTRY_URL ?= https://gitlab.com/consensus.enterprises/drumkit/container_registry +CONTAINER_REGISTRY_URL ?= registry.gitlab.com/consensus.enterprises/drumkit CONTAINER_PROJECT_NAME = drumkit local_ref = $(shell git rev-parse HEAD) @@ -29,5 +29,3 @@ ci-images: clone ci-local: gitlab-runner gitlab-runner exec docker tests - - diff --git a/scripts/packer/scripts/python.sh b/scripts/packer/scripts/python.sh index cb4591d..8c72a15 100755 --- a/scripts/packer/scripts/python.sh +++ b/scripts/packer/scripts/python.sh @@ -12,7 +12,7 @@ apt-get install -yqq \ python3-apt \ python3-setuptools \ python3-wheel \ - python3-zip \ > /dev/null +pip3 install --upgrade pip update-alternatives --install /usr/bin/python python /usr/bin/python3 1 pip3 install jinja2-cli matrix-client ansible