From 7f9ebe6bb0bbf0de6d302a5d2041d94d2870778a Mon Sep 17 00:00:00 2001 From: kexkey Date: Thu, 11 Oct 2018 14:59:10 -0400 Subject: [PATCH] Removed comments --- proxy_docker/Dockerfile | 13 ------------- pycoin_docker/Dockerfile | 20 +++++--------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/proxy_docker/Dockerfile b/proxy_docker/Dockerfile index a348657..bfb06e5 100644 --- a/proxy_docker/Dockerfile +++ b/proxy_docker/Dockerfile @@ -1,14 +1,6 @@ FROM alpine -#ARG USER_ID -#ARG GROUP_ID -#ENV USERNAME proxyuser ENV HOME /proxy -#ENV USER_ID ${USER_ID:-1000} -#ENV GROUP_ID ${GROUP_ID:-1000} - -#RUN addgroup -g ${GROUP_ID} ${USERNAME} \ -# && adduser -u ${USER_ID} -G ${USERNAME} -D -s /bin/sh -h ${HOME} ${USERNAME} RUN apk add --update --no-cache \ sqlite \ @@ -43,16 +35,11 @@ COPY app/script/tests.sh ${HOME}/tests.sh COPY app/script/tests-cb.sh ${HOME}/tests-cb.sh COPY app/bin/lightning-cli_x86 ${HOME}/lightning-cli -#USER ${USERNAME} WORKDIR ${HOME} RUN chmod +x startproxy.sh requesthandler.sh lightning-cli \ -# && chmod 600 watcher_btcnode_curlcfg.properties \ -# && chmod 600 spender_btcnode_curlcfg.properties \ -# && chmod 600 config.properties \ && mkdir db VOLUME ["${HOME}/db", "${HOME}/.lightning"] ENTRYPOINT ["su-exec"] -#CMD ["./startproxy.sh"] diff --git a/pycoin_docker/Dockerfile b/pycoin_docker/Dockerfile index 4f2fcc1..5e74852 100644 --- a/pycoin_docker/Dockerfile +++ b/pycoin_docker/Dockerfile @@ -1,22 +1,14 @@ #FROM resin/raspberry-pi-alpine-python:3.6 FROM python:3.6-alpine -#ARG USER_ID -#ARG GROUP_ID -#ENV USERNAME proxyuser ENV HOME /pycoin -#ENV USER_ID ${USER_ID:-1000} -#ENV GROUP_ID ${GROUP_ID:-1000} - -#RUN addgroup -g ${GROUP_ID} ${USERNAME} \ -# && adduser -u ${USER_ID} -G ${USERNAME} -D -s /bin/sh -h ${HOME} ${USERNAME} RUN apk add --update --no-cache git jq su-exec \ -&& pip install --no-cache-dir pycoin \ -&& cd / \ -&& git clone https://github.com/Kexkey/pycoin.git \ -&& cp -rf pycoin/pycoin/* /usr/local/lib/python3.6/site-packages/pycoin \ -&& rm -rf pycoin/* + && pip install --no-cache-dir pycoin \ + && cd / \ + && git clone https://github.com/Kexkey/pycoin.git \ + && cp -rf pycoin/pycoin/* /usr/local/lib/python3.6/site-packages/pycoin \ + && rm -rf pycoin/* COPY script/pycoin.sh ${HOME}/pycoin.sh COPY script/requesthandler.sh ${HOME}/requesthandler.sh @@ -24,10 +16,8 @@ COPY script/responsetoclient.sh ${HOME}/responsetoclient.sh COPY script/startpycoin.sh ${HOME}/startpycoin.sh COPY script/trace.sh ${HOME}/trace.sh -#USER ${USERNAME} WORKDIR ${HOME} RUN chmod +x startpycoin.sh requesthandler.sh ENTRYPOINT ["su-exec"] -#CMD ["./startpycoin.sh"]