From 5c0250b5b994ea3edada94d41f8346ce1b2b5c39 Mon Sep 17 00:00:00 2001 From: nolash Date: Tue, 19 Oct 2021 22:58:10 +0200 Subject: [PATCH] Rehabilitate cic-cache db migration --- apps/cic-cache/docker/Dockerfile | 5 ++--- apps/cic-cache/scripts/migrate.py | 7 ++++--- apps/cic-eth/docker/Dockerfile | 10 ++++------ apps/cic-meta/docker/Dockerfile | 4 ++-- apps/cic-signer/Dockerfile | 5 ++--- apps/cic-ussd/docker/Dockerfile | 10 ++++------ 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/apps/cic-cache/docker/Dockerfile b/apps/cic-cache/docker/Dockerfile index 114a42c7..685e1c18 100644 --- a/apps/cic-cache/docker/Dockerfile +++ b/apps/cic-cache/docker/Dockerfile @@ -8,10 +8,9 @@ ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net:8433" ARG EXTRA_PIP_ARGS="" ARG PIP_INDEX_URL="https://pypi.org/simple" -RUN pip install --index-url $PIP_INDEX_URL \ +RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ + pip install --index-url $PIP_INDEX_URL \ --pre \ - --force-reinstall \ - --no-cache \ --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \ -r requirements.txt diff --git a/apps/cic-cache/scripts/migrate.py b/apps/cic-cache/scripts/migrate.py index b6925144..458b1ff2 100644 --- a/apps/cic-cache/scripts/migrate.py +++ b/apps/cic-cache/scripts/migrate.py @@ -17,11 +17,12 @@ logg = logging.getLogger() rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) dbdir = os.path.join(rootdir, 'cic_cache', 'db') migrationsdir = os.path.join(dbdir, 'migrations') +configdir = os.path.join(rootdir, 'cic_cache', 'data', 'config') -config_dir = os.path.join('/usr/local/etc/cic-cache') +#config_dir = os.path.join('/usr/local/etc/cic-cache') argparser = argparse.ArgumentParser() -argparser.add_argument('-c', type=str, default=config_dir, help='config file') +argparser.add_argument('-c', type=str, help='config file') argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration') argparser.add_argument('--migrations-dir', dest='migrations_dir', default=migrationsdir, type=str, help='path to alembic migrations directory') argparser.add_argument('--reset', action='store_true', help='downgrade before upgrading') @@ -35,7 +36,7 @@ if args.vv: elif args.v: logging.getLogger().setLevel(logging.INFO) -config = confini.Config(args.c, args.env_prefix) +config = confini.Config(configdir, args.env_prefix) config.process() config.censor('PASSWORD', 'DATABASE') config.censor('PASSWORD', 'SSL') diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index 59c8d65e..14a475f7 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -13,19 +13,17 @@ ARG PIP_INDEX_URL=https://pypi.org/simple RUN apt-get install libffi-dev -RUN pip install --index-url $PIP_INDEX_URL \ +RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ + pip install --index-url $PIP_INDEX_URL \ --pre \ - --force-reinstall \ - --no-cache \ --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \ cic-eth-aux-erc20-demurrage-token~=0.0.2a7 COPY *requirements.txt ./ -RUN pip install --index-url $PIP_INDEX_URL \ +RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ + pip install --index-url $PIP_INDEX_URL \ --pre \ - --force-reinstall \ - --no-cache \ --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \ -r requirements.txt \ -r services_requirements.txt \ diff --git a/apps/cic-meta/docker/Dockerfile b/apps/cic-meta/docker/Dockerfile index 03ffcfc6..3458cc7b 100644 --- a/apps/cic-meta/docker/Dockerfile +++ b/apps/cic-meta/docker/Dockerfile @@ -7,8 +7,8 @@ RUN apk add --no-cache postgresql bash # copy the dependencies COPY package.json package-lock.json ./ -#RUN --mount=type=cache,mode=0755,target=/root/.npm \ -RUN npm set cache /root/.npm && \ +RUN --mount=type=cache,mode=0755,target=/root/.npm \ + npm set cache /root/.npm && \ npm cache verify && \ npm ci --verbose diff --git a/apps/cic-signer/Dockerfile b/apps/cic-signer/Dockerfile index 3a09d0ff..a9f79a00 100644 --- a/apps/cic-signer/Dockerfile +++ b/apps/cic-signer/Dockerfile @@ -11,10 +11,9 @@ COPY requirements.txt . ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net:8433" ARG EXTRA_PIP_ARGS="" ARG PIP_INDEX_URL="https://pypi.org/simple" -RUN pip install --index-url $PIP_INDEX_URL \ +RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ + pip install --index-url $PIP_INDEX_URL \ --pre \ - --force-reinstall \ - --no-cache \ --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \ -r requirements.txt diff --git a/apps/cic-ussd/docker/Dockerfile b/apps/cic-ussd/docker/Dockerfile index 87c136cd..7b67873a 100644 --- a/apps/cic-ussd/docker/Dockerfile +++ b/apps/cic-ussd/docker/Dockerfile @@ -14,19 +14,17 @@ ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net:8433 ARG EXTRA_PIP_ARGS="" ARG PIP_INDEX_URL=https://pypi.org/simple -RUN pip install --index-url $PIP_INDEX_URL \ +RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ + pip install --index-url $PIP_INDEX_URL \ --pre \ - --force-reinstall \ - --no-cache \ --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \ cic-eth-aux-erc20-demurrage-token~=0.0.2a7 COPY *requirements.txt ./ -RUN pip install --index-url $PIP_INDEX_URL \ +RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ + pip install --index-url $PIP_INDEX_URL \ --pre \ - --force-reinstall \ - --no-cache \ --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \ -r requirements.txt