From 44cf98a159b27278d3e59db41a81dc0b56b35615 Mon Sep 17 00:00:00 2001 From: corubba Date: Thu, 19 May 2022 00:52:59 +0200 Subject: [PATCH] Fix test docker The Dockerfile did not work as is, because the dependencies in requirements.txt are newer than the stretch-image with its python v3.5 can support/run. Use stable debian with the lts nodejs instead, plus had to add some libs to make the wheel build succeed. jsonschema v4 breaks things, so its version needs to be pinned until bravado is fixed [0]. [0] https://github.com/Yelp/bravado-core/pull/385/files#r731674447 --- docker-test/Dockerfile | 6 +++--- requirements.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile index 577e120..e5f4d4e 100644 --- a/docker-test/Dockerfile +++ b/docker-test/Dockerfile @@ -1,11 +1,11 @@ -FROM debian:stretch-slim +FROM debian:stable-slim LABEL maintainer="k@ndk.name" ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 RUN apt-get update -y \ - && apt-get install -y --no-install-recommends apt-transport-https locales locales-all python3-pip python3-setuptools python3-dev curl libsasl2-dev libldap2-dev libssl-dev libxml2-dev libxslt1-dev libxmlsec1-dev libffi-dev build-essential libmariadb-dev-compat \ - && curl -sL https://deb.nodesource.com/setup_10.x | bash - \ + && apt-get install -y --no-install-recommends apt-transport-https locales locales-all python3-pip python3-setuptools python3-dev curl libsasl2-dev libldap2-dev libssl-dev libxml2-dev libxslt1-dev libxmlsec1-dev libffi-dev libxmlsec1-openssl pkg-config build-essential libmariadb-dev-compat \ + && curl -sL https://deb.nodesource.com/setup_lts.x | bash - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && apt-get update -y \ diff --git a/requirements.txt b/requirements.txt index 1fc2864..6415116 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,6 +20,7 @@ rjsmin==1.2.0 Authlib==0.15 Flask-SeaSurf==1.1.1 bravado-core==5.17.0 +jsonschema[format]>=2.5.1,<4.0.0 # until https://github.com/Yelp/bravado-core/pull/385 lima==0.5 pytest==6.1.1 pytimeparse==1.1.8