Merge branch 'master' into bvander/move-scripts-to-e2e-folder

.gitlab-ci.yml

@@ -6,6 +6,7 @@ include:
   - local: 'apps/cic-notify/.gitlab-ci.yml'
   - local: 'apps/cic-meta/.gitlab-ci.yml'
   - local: 'apps/cic-cache/.gitlab-ci.yml'
+  - local: 'apps/data-seeding/.gitlab-ci.yml'
 
 stages:
   - build

apps/contract-migration/docker/Dockerfile

@@ -87,7 +87,6 @@ COPY contract-migration/testdata/pgp testdata/pgp
 COPY contract-migration/sarafu_declaration.json sarafu_declaration.json
 COPY contract-migration/keystore keystore
 COPY contract-migration/envlist .
-COPY contract-migration/scripts scripts/ 
 
 # A shared output dir for environment configs
 RUN mkdir -p /tmp/cic/config

apps/data-seeding/.gitlab-ci.yml

@@ -0,0 +1,21 @@
+.data_seeding_variables:
+    variables:
+        APP_NAME: data-seeding
+        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+
+.data_seeding_changes_target:
+    rules:
+        - changes:
+            - $CONTEXT/$APP_NAME/*
+
+build-mr-contract-migration:
+    extends:
+        - .data_seeding_changes_target
+        - .py_build_merge_request
+        - .data_seeding_variables
+
+build-push-contract-migration:
+    extends:
+        - .py_build_push
+        - .data_seeding_variables
+

apps/data-seeding/docker/Dockerfile

@@ -0,0 +1,43 @@
+# syntax = docker/dockerfile:1.2
+FROM python:3.8.6-slim-buster as compile-image
+
+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
+
+WORKDIR /root
+RUN mkdir -vp /usr/local/etc/cic
+
+COPY data-seeding/requirements.txt . 
+
+ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
+RUN pip install --extra-index-url $EXTRA_INDEX_URL -r requirements.txt 
+
+# -------------- begin runtime container ---------------- 
+FROM python:3.8.6-slim-buster as runtime-image
+
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends gnupg libpq-dev 
+RUN apt-get install -y jq bash iputils-ping socat telnet dnsutils
+
+COPY --from=compile-image /usr/local/bin/ /usr/local/bin/
+COPY --from=compile-image /usr/local/etc/cic/ /usr/local/etc/cic/
+COPY --from=compile-image /usr/local/lib/python3.8/site-packages/ \
+                          /usr/local/lib/python3.8/site-packages/
+
+WORKDIR root/
+
+ENV EXTRA_INDEX_URL https://pip.grassrootseconomics.net:8433
+# RUN useradd -u 1001 --create-home grassroots
+# RUN adduser grassroots sudo && \
+#     echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+# WORKDIR /home/grassroots
+
+COPY data-seeding/ . 
+
+# we copied these from the root build container.
+# this is dumb though...I guess the compile image should have the same user
+# RUN chown grassroots:grassroots -R /usr/local/lib/python3.8/site-packages/ 
+
+# USER grassroots
+
+ENTRYPOINT [ ]

apps/data-seeding/requirements.txt

@@ -1,5 +1,5 @@
-cic-base[full_graph]==0.1.2b9
+cic-base[full_graph]==0.1.2b11
 sarafu-faucet==0.0.3a3
-cic-eth==0.11.0b13
+cic-eth==0.11.0b14
 cic-types==0.1.0a11
 crypto-dev-signer==0.4.14b3