From a252195bdc847a825684e7aec434cc2a71b5fbc5 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Mon, 28 Jun 2021 10:56:15 -0700 Subject: [PATCH] uses the new base image --- apps/data-seeding/docker/Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/apps/data-seeding/docker/Dockerfile b/apps/data-seeding/docker/Dockerfile index 797cc66f..3b37085a 100644 --- a/apps/data-seeding/docker/Dockerfile +++ b/apps/data-seeding/docker/Dockerfile @@ -1,19 +1,21 @@ # syntax = docker/dockerfile:1.2 -FROM python:3.8.6-slim-buster as compile-image - -WORKDIR /root - -RUN apt-get update -RUN apt-get install -y --no-install-recommends git gcc g++ libpq-dev gawk jq telnet wget openssl iputils-ping gnupg socat bash procps make python2 cargo +#FROM python:3.8.6-slim-buster as compile-image +FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-5ab8bf45 RUN mkdir -vp /usr/local/etc/cic +COPY data-seeding/package.json \ + data-seeding/package-lock.json \ + . + +RUN npm install + COPY data-seeding/requirements.txt . +ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" +ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" +RUN pip install --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL -r requirements.txt + COPY data-seeding/ . -ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" -RUN pip install --extra-index-url $EXTRA_INDEX_URL -r requirements.txt - - ENTRYPOINT [ ]