From e705a94873ed743fdb99e70498d619eb3566e962 Mon Sep 17 00:00:00 2001 From: nolash Date: Wed, 20 Oct 2021 10:07:19 +0200 Subject: [PATCH] Resolve notify/ussd dependency conflict --- apps/cic-cache/docker/Dockerfile | 2 +- apps/cic-eth/docker/Dockerfile | 4 +--- apps/cic-notify/cic_notify/version.py | 2 +- apps/cic-notify/docker/Dockerfile | 5 +++-- apps/cic-notify/requirements.txt | 3 ++- apps/cic-signer/Dockerfile | 2 +- apps/cic-ussd/docker/Dockerfile | 4 ++-- apps/cic-ussd/requirements.txt | 4 ++-- apps/contract-migration/docker/Dockerfile | 5 +++-- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/apps/cic-cache/docker/Dockerfile b/apps/cic-cache/docker/Dockerfile index 685e1c18..725d571a 100644 --- a/apps/cic-cache/docker/Dockerfile +++ b/apps/cic-cache/docker/Dockerfile @@ -1,6 +1,6 @@ ARG DOCKER_REGISTRY=registry.gitlab.com/grassrootseconomics -FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e +FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2 COPY requirements.txt . diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index 14a475f7..e04d0541 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -1,6 +1,6 @@ ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics" -FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e +FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2 # Copy just the requirements and install....this _might_ give docker a hint on caching but we # do load these all into setup.py later @@ -11,8 +11,6 @@ ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net:8433 ARG EXTRA_PIP_ARGS="" ARG PIP_INDEX_URL=https://pypi.org/simple -RUN apt-get install libffi-dev - RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ pip install --index-url $PIP_INDEX_URL \ --pre \ diff --git a/apps/cic-notify/cic_notify/version.py b/apps/cic-notify/cic_notify/version.py index 3a99ed07..02dcb38f 100644 --- a/apps/cic-notify/cic_notify/version.py +++ b/apps/cic-notify/cic_notify/version.py @@ -9,7 +9,7 @@ import semver logg = logging.getLogger() -version = (0, 4, 0, 'alpha.10') +version = (0, 4, 0, 'alpha.11') version_object = semver.VersionInfo( major=version[0], diff --git a/apps/cic-notify/docker/Dockerfile b/apps/cic-notify/docker/Dockerfile index 1744d27f..ef7167fa 100644 --- a/apps/cic-notify/docker/Dockerfile +++ b/apps/cic-notify/docker/Dockerfile @@ -1,5 +1,6 @@ -# syntax = docker/dockerfile:1.2 -FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev +ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics" + +FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2 #RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a62 diff --git a/apps/cic-notify/requirements.txt b/apps/cic-notify/requirements.txt index 953027d2..662c6e15 100644 --- a/apps/cic-notify/requirements.txt +++ b/apps/cic-notify/requirements.txt @@ -1,7 +1,8 @@ -confini~=0.4.1a1 +confini>=0.3.6rc4,<0.5.0 africastalking==1.2.3 SQLAlchemy==1.3.20 alembic==1.4.2 psycopg2==2.8.6 celery==4.4.7 redis==3.5.3 +semver==2.13.0 diff --git a/apps/cic-signer/Dockerfile b/apps/cic-signer/Dockerfile index a9f79a00..bbe9d694 100644 --- a/apps/cic-signer/Dockerfile +++ b/apps/cic-signer/Dockerfile @@ -1,6 +1,6 @@ ARG DOCKER_REGISTRY=registry.gitlab.com/grassrootseconomics -FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e as dev +FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2 as dev WORKDIR /root diff --git a/apps/cic-ussd/docker/Dockerfile b/apps/cic-ussd/docker/Dockerfile index 7b67873a..2359510a 100644 --- a/apps/cic-ussd/docker/Dockerfile +++ b/apps/cic-ussd/docker/Dockerfile @@ -1,6 +1,6 @@ ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics" -FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e +FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2 RUN apt-get install -y redis-server # create secrets directory @@ -37,7 +37,7 @@ COPY cic_ussd/db/ussd_menu.json data/ COPY docker/*.sh ./ RUN chmod +x /root/*.sh -# copy config and migration files to definitive file so they can be referenced in path definitions for running scripts +## copy config and migration files to definitive file so they can be referenced in path definitions for running scripts COPY config/ /usr/local/etc/cic-ussd/ COPY cic_ussd/db/migrations/ /usr/local/share/cic-ussd/alembic diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt index 3141fb92..ce5bd65d 100644 --- a/apps/cic-ussd/requirements.txt +++ b/apps/cic-ussd/requirements.txt @@ -4,8 +4,8 @@ billiard==3.6.4.0 bcrypt==3.2.0 celery==4.4.7 cffi==1.14.6 -cic-eth~=0.12.4a13 -cic-notify~=0.4.0a10 +cic-eth~=0.12.5a1 +cic-notify~=0.4.0a11 cic-types~=0.2.0a5 confini>=0.3.6rc4,<0.5.0 phonenumbers==8.12.12 diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index e6537a75..d3dcc0f1 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -1,6 +1,7 @@ -ARG DEV_DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics" +ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics" + +FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2 -FROM $DEV_DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e WORKDIR /root