From ed063f052299edb637a8e8baa3b70169d8bb384f Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Wed, 10 Feb 2021 20:44:15 -0800 Subject: [PATCH] builds up --- apps/cic-notify/docker/Dockerfile | 2 ++ apps/cic-notify/docker/Dockerfile.service | 13 ------------- docker-compose.yml | 4 +++- 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 apps/cic-notify/docker/Dockerfile.service diff --git a/apps/cic-notify/docker/Dockerfile b/apps/cic-notify/docker/Dockerfile index ec77a552..c0a504c8 100644 --- a/apps/cic-notify/docker/Dockerfile +++ b/apps/cic-notify/docker/Dockerfile @@ -14,7 +14,9 @@ RUN pip install -r $root_requirement_file $pip_extra_index_url_flag COPY cic-notify/setup.cfg \ cic-notify/setup.py \ ./ + COPY cic-notify/cic_notify/ ./cic_notify/ + COPY cic-notify/requirements.txt \ cic-notify/test_requirements.txt \ ./ diff --git a/apps/cic-notify/docker/Dockerfile.service b/apps/cic-notify/docker/Dockerfile.service deleted file mode 100644 index cf2bb38f..00000000 --- a/apps/cic-notify/docker/Dockerfile.service +++ /dev/null @@ -1,13 +0,0 @@ -FROM grassrootseconomics:cic-notify - -#FROM python:3.8.6-alpine - -#RUN apk update && \ -# apk add gnupg libpq - -#COPY --from=0 /usr/local/ /usr/local/ -#COPY --from=0 /root/ /root/ - -#RUN apk add bash - -WORKDIR /root diff --git a/docker-compose.yml b/docker-compose.yml index ec427275..27473e20 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -403,7 +403,9 @@ services: cic-notify-tasker: - image: grassrootseconomics:cic-notify-service + build: + context: apps/ + dockerfile: cic-notify/docker/Dockerfile environment: DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres}