From 46840040a0ee70e85b618dee7faa149cbd5310d4 Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Mon, 5 Jul 2021 10:41:19 +0200
Subject: [PATCH] Remove dev dockerfile

---
 apps/contract-migration/docker/Dockerfile.dev | 93 -------------------
 docker-compose.yml                            |  3 +-
 2 files changed, 1 insertion(+), 95 deletions(-)
 delete mode 100644 apps/contract-migration/docker/Dockerfile.dev

diff --git a/apps/contract-migration/docker/Dockerfile.dev b/apps/contract-migration/docker/Dockerfile.dev
deleted file mode 100644
index 2d8a76fa..00000000
--- a/apps/contract-migration/docker/Dockerfile.dev
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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
-
-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 update
-RUN apt-get install solc
-RUN pip install --upgrade pip
-
-WORKDIR /root
-RUN mkdir -vp /usr/local/etc/cic
-
-COPY contract-migration/nvm.sh .
-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
-
-# Install nvm with node and npm
-# https://stackoverflow.com/questions/25899912/how-to-install-nvm-in-docker
-ENV NVM_DIR /root/.nvm
-ENV NODE_VERSION 15.3.0
-ENV BANCOR_NODE_VERSION 10.16.0
-
-RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash \
-	&& . $NVM_DIR/nvm.sh \
-	&& nvm install $NODE_VERSION \
-	&& nvm alias default $NODE_VERSION \
-	&& nvm use $NODE_VERSION
-# && chown -R root:root "$NVM_DIR/versions/node/v$NODE_VERSION"
-
-ENV NODE_PATH $NVM_DIR/versions/node//v$NODE_VERSION/lib/node_modules
-ENV PATH      $NVM_DIR/versions/node//v$NODE_VERSION/bin:$PATH
-
-#RUN useradd --create-home grassroots
-# WORKDIR /home/grassroots
-# USER grassroots
-
-COPY contract-migration/requirements.txt . 
-
-ARG pip_extra_args=""
-ARG pip_index_url=https://pypi.org/simple
-ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
-ARG pip_trusted_host=pypi.org
-RUN pip install --index-url $pip_index_url \
-    --trusted-host $pip_trusted_host \
-    --extra-index-url $pip_extra_index_url -r requirements.txt
-
-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 .
-
-# A shared output dir for environment configs
-RUN mkdir -p /tmp/cic/config
-# RUN chown grassroots:grassroots /tmp/cic/config
-RUN chmod a+rwx /tmp/cic/config 
-
-COPY contract-migration/*.sh ./
-# RUN chown grassroots:grassroots -R .
-RUN chmod gu+x *.sh
-
-# 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
-
-ARG pip_index_url=https://pypi.org/simple
-ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
-ARG pip_trusted_host=pypi.org
-COPY contract-migration/override_requirements.txt . 
-RUN pip install --index-url $pip_index_url \
-    --force-reinstall \
-    --trusted-host $pip_trusted_host \
-    --extra-index-url $pip_extra_index_url -r override_requirements.txt
-
-ENTRYPOINT [ ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 68dcf0eb..d2d4d081 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,8 +72,7 @@ services:
 
   contract-migration:
     build:
-      dockerfile: contract-migration/docker/Dockerfile.dev
-        #dockerfile: contract-migration/docker/Dockerfile
+      dockerfile: contract-migration/docker/Dockerfile
       args:
         pip_index_url: ${PIP_DEFAULT_INDEX_URL:-https://pypi.org/simple}
         pip_extra_args: $PIP_EXTRA_ARGS