kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

put contract migration and data seeding in local context

Browse Source
This commit is contained in:
Blair Vanderlugt 2021-07-07 16:49:39 -07:00
parent 9a7ccc3228
commit e6fa450a2a
10 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/cic-meta/.dockerignore Normal file
View File

@ -0,0 +1,4 @@
.git
.cache
.dot
**/doc

4
apps/contract-migration/.dockerignore Normal file
View File

@ -0,0 +1,4 @@
.git
.cache
.dot
**/doc

4
apps/contract-migration/.gitlab-ci.yml
View File

@ -1,8 +1,8 @@
.contract_migration_variables: .contract_migration_variables:
variables: variables:
APP_NAME: contract-migration APP_NAME: contract-migration
DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci DOCKERFILE_PATH: docker/Dockerfile_ci
CONTEXT: apps/ CONTEXT: apps/$APP_NAME
build-mr-contract-migration: build-mr-contract-migration:
extends: extends:

4
apps/contract-migration/docker/Dockerfile
View File

@ -25,7 +25,7 @@ RUN echo Install confini schema files && \
git checkout $cic_config_commit && \ git checkout $cic_config_commit && \
cp -v *.ini $CONFINI_DIR cp -v *.ini $CONFINI_DIR
COPY contract-migration/requirements.txt . COPY requirements.txt .
ARG pip_index_url=https://pypi.org/simple ARG pip_index_url=https://pypi.org/simple
ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
@ -38,5 +38,5 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
--extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
-r requirements.txt -r requirements.txt
COPY contract-migration/ . COPY . .
RUN chmod +x *.sh RUN chmod +x *.sh

15
apps/contract-migration/docker/Dockerfile_ci
View File

@ -3,12 +3,11 @@ FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55
WORKDIR /root WORKDIR /root
# solc install which we needed for bancor. Leaving as an artfact of HOW to do it. RUN touch /etc/apt/sources.list.d/ethereum.list
#RUN touch /etc/apt/sources.list.d/ethereum.list RUN echo 'deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' > /etc/apt/sources.list.d/ethereum.list
#RUN echo 'deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' > /etc/apt/sources.list.d/ethereum.list RUN echo 'deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' >> /etc/apt/sources.list.d/ethereum.list
#RUN echo 'deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' >> /etc/apt/sources.list.d/ethereum.list RUN cat /etc/apt/sources.list.d/ethereum.list
#RUN cat /etc/apt/sources.list.d/ethereum.list RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2A518C819BE37D2C2031944D1C52189C923F6CA9
#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2A518C819BE37D2C2031944D1C52189C923F6CA9
#RUN apt-get install solc #RUN apt-get install solc
@ -26,7 +25,7 @@ RUN echo Install confini schema files && \
git checkout $cic_config_commit && \ git checkout $cic_config_commit && \
cp -v *.ini $CONFINI_DIR cp -v *.ini $CONFINI_DIR
COPY contract-migration/requirements.txt . COPY requirements.txt .
ARG pip_index_url=https://pypi.org/simple ARG pip_index_url=https://pypi.org/simple
ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
@ -38,5 +37,5 @@ RUN pip install --index-url https://pypi.org/simple \
--extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
-r requirements.txt -r requirements.txt
COPY contract-migration/ . COPY . .
RUN chmod +x *.sh RUN chmod +x *.sh

4
apps/data-seeding/.dockerignore Normal file
View File

@ -0,0 +1,4 @@
.git
.cache
.dot
**/doc

4
apps/data-seeding/.gitlab-ci.yml
View File

@ -1,8 +1,8 @@
.data_seeding_variables: .data_seeding_variables:
variables: variables:
APP_NAME: data-seeding APP_NAME: data-seeding
DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci DOCKERFILE_PATH: docker/Dockerfile_ci
CONTEXT: apps/ CONTEXT: apps/$APP_NAME
build-mr-data-seeding: build-mr-data-seeding:
extends: extends:

8
apps/data-seeding/docker/Dockerfile
View File

@ -5,13 +5,13 @@ WORKDIR /root
RUN mkdir -vp /usr/local/etc/cic RUN mkdir -vp /usr/local/etc/cic
COPY data-seeding/package.json \ COPY package.json \
data-seeding/package-lock.json \ package-lock.json \
. .
RUN --mount=type=cache,mode=0755,target=/root/node_modules npm install RUN --mount=type=cache,mode=0755,target=/root/node_modules npm install
COPY data-seeding/requirements.txt . COPY requirements.txt .
ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
@ -19,6 +19,6 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip pip install \
--extra-index-url $GITLAB_PYTHON_REGISTRY \ --extra-index-url $GITLAB_PYTHON_REGISTRY \
--extra-index-url $EXTRA_INDEX_URL -r requirements.txt --extra-index-url $EXTRA_INDEX_URL -r requirements.txt
COPY data-seeding/ . COPY . .
ENTRYPOINT [ ] ENTRYPOINT [ ]

8
apps/data-seeding/docker/Dockerfile_ci
View File

@ -5,13 +5,13 @@ WORKDIR /root
RUN mkdir -vp /usr/local/etc/cic RUN mkdir -vp /usr/local/etc/cic
COPY data-seeding/package.json \ COPY package.json \
data-seeding/package-lock.json \ package-lock.json \
. .
RUN npm install RUN npm install
COPY data-seeding/requirements.txt . COPY requirements.txt .
ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
@ -19,6 +19,6 @@ RUN pip install \
--extra-index-url $GITLAB_PYTHON_REGISTRY \ --extra-index-url $GITLAB_PYTHON_REGISTRY \
--extra-index-url $EXTRA_INDEX_URL -r requirements.txt --extra-index-url $EXTRA_INDEX_URL -r requirements.txt
COPY data-seeding/ . COPY . .
ENTRYPOINT [ ] ENTRYPOINT [ ]

9
docker-compose.yml
View File

@ -72,12 +72,11 @@ services:
contract-migration: contract-migration:
build: build:
dockerfile: contract-migration/docker/Dockerfile context: apps/contract-migration
# target: compile-image dockerfile: docker/Dockerfile
args: args:
pip_index_url: ${PIP_DEFAULT_INDEX_URL:-https://pypi.org/simple} pip_index_url: ${PIP_DEFAULT_INDEX_URL:-https://pypi.org/simple}
pip_extra_args: $PIP_EXTRA_ARGS pip_extra_args: $PIP_EXTRA_ARGS
context: apps/
# image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/contract-migration:latest # image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/contract-migration:latest
environment: environment:
# ETH_PROVIDER should be broken out into host/port but cic-eth expects this # ETH_PROVIDER should be broken out into host/port but cic-eth expects this
@ -432,8 +431,8 @@ services:
cic-meta-server: cic-meta-server:
hostname: meta hostname: meta
build: build:
context: apps/ context: apps/cic-meta
dockerfile: cic-meta/docker/Dockerfile dockerfile: docker/Dockerfile
environment: environment:
DATABASE_NAME: ${DATABASE_NAME:-cic_meta} DATABASE_NAME: ${DATABASE_NAME:-cic_meta}
DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres} DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres}