cic-cache migrated

point build at dockerfile
cic-cache
2021-02-16 17:49:16 -08:00 · 2021-02-12 08:21:58 -08:00 · 2021-02-12 08:19:14 -08:00 · 2021-02-12 07:49:00 -08:00 · 2021-02-12 07:48:25 -08:00 · 2021-02-12 02:27:29 +00:00
5 changed files with 5 additions and 18 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "apps/cic-cache"]
-	path = apps/cic-cache
-	url = git@gitlab.com:grassrootseconomics/cic-cache.git
--- 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 \
     ./
--- a/apps/cic-notify/docker/Dockerfile.service
+++ b/apps/cic-notify/docker/Dockerfile.service
@@ -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
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -413,7 +413,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}
--- a/keys/Bloxberg/address_book.json
+++ b/keys/Bloxberg/address_book.json
@@ -1 +0,0 @@
-{}
Author	SHA1	Message	Date
Blair Vanderlugt	85f26a4be4	cic-cache migrated	2021-02-16 17:49:16 -08:00
Blair Vanderlugt	bc0450f39d	point build at dockerfile	2021-02-12 08:21:58 -08:00
Blair Vanderlugt	0345e2782f	cic-cache	2021-02-12 08:19:14 -08:00
Blair Vanderlugt	492faa87e5	add cache back in	2021-02-12 07:49:00 -08:00
Blair Vanderlugt	39433d67da	remove cic-cache submodule	2021-02-12 07:48:25 -08:00
Blair Vanderlugt	d042ce0dcd	Merge branch 'lash/correct-db-names' into 'master' Correct db names and ports See merge request grassrootseconomics/cic-internal-integration!25	2021-02-12 02:27:29 +00:00
Louis Holbrook	22586a04bf	Correct db names and ports	2021-02-12 02:27:29 +00:00
Blair Vanderlugt	449cd5830e	keys in the wrong place	2021-02-11 07:33:13 -08:00
Blair Vanderlugt	df3954fda5	Merge branch 'bvandernotify-build' into 'master' cic-notify build See merge request grassrootseconomics/cic-internal-integration!23	2021-02-11 15:24:34 +00:00
Blair Vanderlugt	ed063f0522	builds up	2021-02-10 20:44:15 -08:00