Merge branch 'master' into lash/deploy-on-host

Merge branch 'lash/traffic-script-rehab' into 'master'
Implement chainlib cli for traffic script See merge request grassrootseconomics/cic-internal-integration!255
2021-08-25 11:36:19 +02:00 · 2021-08-25 09:33:23 +00:00 · 2021-08-25 09:33:23 +00:00 · 2021-08-24 15:33:18 -07:00 · 2021-07-15 00:05:43 +02:00 · 2021-07-14 17:09:26 +02:00
3 changed files with 5 additions and 4 deletions
--- a/apps/contract-migration/config_template/redis.ini
+++ b/apps/contract-migration/config_template/redis.ini
@@ -0,0 +1,4 @@
+[redis]
+host =
+port =
+db =
--- a/apps/contract-migration/docker/Dockerfile
+++ b/apps/contract-migration/docker/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys 2A518C819BE37D2C20
 RUN mkdir -vp /usr/local/etc/cic

 ENV CONFINI_DIR /usr/local/etc/cic/
-#RUN mkdir -vp $CONFINI_DIR


 COPY config_template/ /usr/local/etc/cic/
--- a/apps/contract-migration/docker/Dockerfile_ci
+++ b/apps/contract-migration/docker/Dockerfile_ci
@@ -14,7 +14,6 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys 2A518C819BE37D2C20
 RUN mkdir -vp /usr/local/etc/cic

 ENV CONFINI_DIR /usr/local/etc/cic/
-RUN mkdir -vp $CONFINI_DIR


 COPY config_template/ /usr/local/etc/cic/
@@ -23,14 +22,13 @@ COPY override_requirements.txt .

 ARG pip_index_url=https://pypi.org/simple
 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
-ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
 ARG EXTRA_PIP_ARGS=""
+ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
 ARG pip_trusted_host=pypi.org
 RUN pip install --index-url https://pypi.org/simple \
    pip install --index-url https://pypi.org/simple \
    --pre \
    --force-reinstall \
-    --pre \
    --trusted-host $pip_trusted_host \
    --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \
    -r requirements.txt
Author	SHA1	Message	Date
nolash	b9abcfde64	Merge branch 'master' into lash/deploy-on-host	2021-08-25 11:36:19 +02:00
Louis Holbrook	ebf4743a84	Merge branch 'lash/traffic-script-rehab' into 'master' Implement chainlib cli for traffic script See merge request grassrootseconomics/cic-internal-integration!255	2021-08-25 09:33:23 +00:00
Louis Holbrook	3bf92e7a8a	Implement chainlib cli for traffic script	2021-08-25 09:33:23 +00:00
Blair Vanderlugt	f0b4c42c68	cleanup contract migration dockerfiles	2021-08-24 15:33:18 -07:00
nolash	be87ab272c	Merge remote-tracking branch 'origin/master' into lash/deploy-on-host	2021-07-15 00:05:43 +02:00
nolash	c7eb4a1362	Merge remote-tracking branch 'origin' into lash/deploy-on-host	2021-07-14 17:09:26 +02:00
nolash	da8297bea0	Merge remote-tracking branch 'origin/master' into lash/deploy-on-host	2021-07-12 18:59:09 +02:00
nolash	6e7483be81	Merge remote-tracking branch 'origin/master' into lash/deploy-on-host	2021-07-12 12:28:27 +02:00
nolash	0f4d3df428	Make contract migration work with host deployment	2021-07-11 15:52:56 +02:00