Merge branch 'bvandernotify-build' into 'master'

cic-notify build

See merge request grassrootseconomics/cic-internal-integration!23
This commit is contained in:
Blair Vanderlugt 2021-02-11 15:24:34 +00:00
commit df3954fda5
3 changed files with 5 additions and 14 deletions

View File

@ -14,7 +14,9 @@ RUN pip install -r $root_requirement_file $pip_extra_index_url_flag
COPY cic-notify/setup.cfg \ COPY cic-notify/setup.cfg \
cic-notify/setup.py \ cic-notify/setup.py \
./ ./
COPY cic-notify/cic_notify/ ./cic_notify/ COPY cic-notify/cic_notify/ ./cic_notify/
COPY cic-notify/requirements.txt \ COPY cic-notify/requirements.txt \
cic-notify/test_requirements.txt \ cic-notify/test_requirements.txt \
./ ./

View File

@ -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

View File

@ -403,7 +403,9 @@ services:
cic-notify-tasker: cic-notify-tasker:
image: grassrootseconomics:cic-notify-service build:
context: apps/
dockerfile: cic-notify/docker/Dockerfile
environment: environment:
DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_USER: ${DATABASE_USER:-grassroots}
DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_HOST: ${DATABASE_HOST:-postgres}