From 2fd8fa77538dff6f9536cc25708bab916c130941 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Thu, 19 Aug 2021 12:06:05 -0400 Subject: [PATCH] remove the kaniko ci files --- apps/cic-eth/docker/Dockerfile_ci | 69 -------------------- apps/cic-meta/docker/Dockerfile_ci | 32 --------- apps/cic-notify/docker/Dockerfile_ci | 27 -------- apps/cic-ussd/docker/Dockerfile_ci | 32 --------- apps/contract-migration/docker/Dockerfile_ci | 41 ------------ apps/data-seeding/docker/Dockerfile_ci | 24 ------- 6 files changed, 225 deletions(-) delete mode 100644 apps/cic-eth/docker/Dockerfile_ci delete mode 100644 apps/cic-meta/docker/Dockerfile_ci delete mode 100644 apps/cic-notify/docker/Dockerfile_ci delete mode 100644 apps/cic-ussd/docker/Dockerfile_ci delete mode 100644 apps/contract-migration/docker/Dockerfile_ci delete mode 100644 apps/data-seeding/docker/Dockerfile_ci diff --git a/apps/cic-eth/docker/Dockerfile_ci b/apps/cic-eth/docker/Dockerfile_ci deleted file mode 100644 index 89efdcc6..00000000 --- a/apps/cic-eth/docker/Dockerfile_ci +++ /dev/null @@ -1,69 +0,0 @@ -FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev - -WORKDIR /usr/src/cic-eth - -# Copy just the requirements and install....this _might_ give docker a hint on caching but we -# do load these all into setup.py later -# TODO can we take all the requirements out of setup.py and just do a pip install -r requirements.txt && python setup.py -#COPY cic-eth/requirements.txt . - -ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" -ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" -#RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ -# pip install --index-url https://pypi.org/simple \ -# --force-reinstall \ -# --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ -# -r requirements.txt -COPY *requirements.txt . -RUN pip install --index-url https://pypi.org/simple \ - --extra-index-url $GITLAB_PYTHON_REGISTRY \ - --extra-index-url $EXTRA_INDEX_URL \ - -r requirements.txt \ - -r services_requirements.txt \ - -r admin_requirements.txt - -COPY . . -RUN python setup.py install - -COPY docker/entrypoints/* ./ -RUN chmod 755 *.sh - -# # ini files in config directory defines the configurable parameters for the application -# # they can all be overridden by environment variables -# # to generate a list of environment variables from configuration, use: confini-dump -z (executable provided by confini package) -COPY config/ /usr/local/etc/cic-eth/ -COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/ -COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ - -# TODO this kind of code sharing across projects should be discouraged...can we make util a library? -#COPY util/liveness/health.sh /usr/local/bin/health.sh -ENTRYPOINT [] - -# ------------------ PRODUCTION CONTAINER ---------------------- -#FROM python:3.8.6-slim-buster as prod -# -#RUN apt-get update && \ -# apt install -y gnupg libpq-dev procps -# -#WORKDIR /root -# -#COPY --from=dev /usr/local/bin/ /usr/local/bin/ -#COPY --from=dev /usr/local/lib/python3.8/site-packages/ \ -# /usr/local/lib/python3.8/site-packages/ -# -#COPY docker/entrypoints/* ./ -#RUN chmod 755 *.sh -# -## # ini files in config directory defines the configurable parameters for the application -## # they can all be overridden by environment variables -## # to generate a list of environment variables from configuration, use: confini-dump -z (executable provided by confini package) -#COPY config/ /usr/local/etc/cic-eth/ -#COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/ -#COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ -#COPY scripts/ scripts/ -# -## TODO this kind of code sharing across projects should be discouraged...can we make util a library? -##COPY util/liveness/health.sh /usr/local/bin/health.sh -# -#ENTRYPOINT [] -# diff --git a/apps/cic-meta/docker/Dockerfile_ci b/apps/cic-meta/docker/Dockerfile_ci deleted file mode 100644 index 9215ab71..00000000 --- a/apps/cic-meta/docker/Dockerfile_ci +++ /dev/null @@ -1,32 +0,0 @@ -# syntax = docker/dockerfile:1.2 -#FROM node:15.3.0-alpine3.10 -FROM node:lts-alpine3.14 - -WORKDIR /root - -RUN apk add --no-cache postgresql bash - -# copy the dependencies -COPY package.json package-lock.json . -RUN npm set cache /root/.npm && \ - npm ci - -COPY webpack.config.js . -COPY tsconfig.json . -## required to build the cic-client-meta module -COPY src/ src/ -COPY scripts/ scripts/ -COPY tests/ tests/ -COPY tests/*.asc /root/pgp/ - -## copy runtime configs -COPY .config/ /usr/local/etc/cic-meta/ -# -## db migrations -COPY docker/db.sh ./db.sh -RUN chmod 755 ./db.sh -# -RUN alias tsc=node_modules/typescript/bin/tsc -COPY docker/start_server.sh ./start_server.sh -RUN chmod 755 ./start_server.sh -ENTRYPOINT ["sh", "./start_server.sh"] diff --git a/apps/cic-notify/docker/Dockerfile_ci b/apps/cic-notify/docker/Dockerfile_ci deleted file mode 100644 index 3db71bc9..00000000 --- a/apps/cic-notify/docker/Dockerfile_ci +++ /dev/null @@ -1,27 +0,0 @@ -# syntax = docker/dockerfile:1.2 -FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev - -#RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a62 - -ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" -ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" -COPY requirements.txt . - -RUN pip install --index-url https://pypi.org/simple \ - --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ - -r requirements.txt - -COPY . . - -RUN python setup.py install - -COPY docker/*.sh . -RUN chmod +x *.sh - -# ini files in config directory defines the configurable parameters for the application -# they can all be overridden by environment variables -# to generate a list of environment variables from configuration, use: confini-dump -z (executable provided by confini package) -COPY .config/ /usr/local/etc/cic-notify/ -COPY cic_notify/db/migrations/ /usr/local/share/cic-notify/alembic/ - -ENTRYPOINT [] diff --git a/apps/cic-ussd/docker/Dockerfile_ci b/apps/cic-ussd/docker/Dockerfile_ci deleted file mode 100644 index 9811f563..00000000 --- a/apps/cic-ussd/docker/Dockerfile_ci +++ /dev/null @@ -1,32 +0,0 @@ -# syntax = docker/dockerfile:1.2 -FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev -RUN apt-get install -y redis-server - -# create secrets directory -RUN mkdir -vp pgp/keys - -# create application directory -RUN mkdir -vp cic-ussd -RUN mkdir -vp data - -COPY requirements.txt . - -ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" -ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" -RUN pip install --index-url https://pypi.org/simple \ - --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ - -r requirements.txt - -COPY . . -RUN python setup.py install - -COPY cic_ussd/db/ussd_menu.json data/ - -COPY docker/*.sh . -RUN chmod +x /root/*.sh - -# copy config and migration files to definitive file so they can be referenced in path definitions for running scripts -COPY config/ /usr/local/etc/cic-ussd/ -COPY cic_ussd/db/migrations/ /usr/local/share/cic-ussd/alembic - -ENTRYPOINT [] diff --git a/apps/contract-migration/docker/Dockerfile_ci b/apps/contract-migration/docker/Dockerfile_ci deleted file mode 100644 index 4f384a87..00000000 --- a/apps/contract-migration/docker/Dockerfile_ci +++ /dev/null @@ -1,41 +0,0 @@ -# syntax = docker/dockerfile:1.2 -FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e - -WORKDIR /root - -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-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 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2A518C819BE37D2C2031944D1C52189C923F6CA9 - -#RUN apt-get install solc - -RUN mkdir -vp /usr/local/etc/cic - -ENV CONFINI_DIR /usr/local/etc/cic/ -RUN mkdir -vp $CONFINI_DIR - -ARG cic_config_commit=0abe0867f18077907c7023bf0ef5e466a3984dd8 -ARG cic_config_url=https://gitlab.com/grassrootseconomics/cic-config.git/ -RUN echo Install confini schema files && \ - git clone --depth 1 $cic_config_url cic-config && \ - cd cic-config && \ - git fetch --depth 1 origin $cic_config_commit && \ - git checkout $cic_config_commit && \ - cp -v *.ini $CONFINI_DIR - -COPY 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 pip_trusted_host=pypi.org -RUN pip install --index-url https://pypi.org/simple \ - --force-reinstall \ - --trusted-host $pip_trusted_host \ - --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ - -r requirements.txt - -COPY . . -RUN chmod +x *.sh diff --git a/apps/data-seeding/docker/Dockerfile_ci b/apps/data-seeding/docker/Dockerfile_ci deleted file mode 100644 index 8169b4db..00000000 --- a/apps/data-seeding/docker/Dockerfile_ci +++ /dev/null @@ -1,24 +0,0 @@ -# syntax = docker/dockerfile:1.2 -FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-5ab8bf45 - -WORKDIR /root - -RUN mkdir -vp /usr/local/etc/cic - -COPY package.json \ - package-lock.json \ - . - -RUN npm install - -COPY requirements.txt . - -ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" -ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" -RUN pip install \ - --extra-index-url $GITLAB_PYTHON_REGISTRY \ - --extra-index-url $EXTRA_INDEX_URL -r requirements.txt - -COPY . . - -ENTRYPOINT [ ]