From 1cc6e32d5ea771a4efe91b3951d81f708c0e4154 Mon Sep 17 00:00:00 2001 From: Vivek Teega Date: Mon, 4 Jul 2022 19:54:21 +0000 Subject: [PATCH] Fixed bug: Dockerfile not executing run.sh --- Dockerfile | 7 +- index.html | 2886 ---------------------------------------------------- run.sh | 11 +- 3 files changed, 5 insertions(+), 2899 deletions(-) delete mode 100644 index.html diff --git a/Dockerfile b/Dockerfile index 068e6dc..8705f3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,6 @@ RUN apt-get -y install git RUN apt-get -y install python-chardet python3.9 python3.9-venv RUN apt-get -y install libsecp256k1-dev libssl-dev build-essential automake pkg-config libtool libffi-dev libgmp-dev libyaml-cpp-dev RUN python3 -m pip install supervisor -RUN echo_supervisord_conf -RUN echo_supervisord_conf > /etc/supervisord.conf # Installation of Pybtc, currently named as Pyflo WORKDIR ../ @@ -61,8 +59,6 @@ RUN echo "dbfolder = '/flo-token-tracking' \nsse_pubKey = '02b68a7ba52a499b4cb66 WORKDIR ../ RUN git clone https://github.com/ranchimall/floscout.git WORKDIR floscout -RUN rm index.html -COPY index.html . COPY example . RUN sed -i "s|window.tokenapiUrl = 'http://0.0.0.0:6012'|window.tokenapiUrl = $FLOAPIURL|" /floscout/index.html WORKDIR ../ @@ -86,6 +82,7 @@ RUN mkdir /var/log/floscout/ RUN touch /var/log/floscout/floscout.err.log RUN touch /var/log/floscout/floscout.out.log +WORKDIR / COPY run.sh . RUN chmod +x run.sh -CMD ["/etc/supervisor/conf.d/run.sh"] \ No newline at end of file +ENTRYPOINT ["sh","/run.sh"] \ No newline at end of file diff --git a/index.html b/index.html deleted file mode 100644 index c2bf569..0000000 --- a/index.html +++ /dev/null @@ -1,2886 +0,0 @@ - - - - - - - FLO Scout - - - - -
- Copied -
-
- - Loading - - -

Loading

-
-
-
-

Search

- - close - - - -
- -
-
-
- - - -
-
- - back_arrow - - - -

- - - search for block, transactions, address, token or contract - - - - -
-
-
-
- - - - - - - - - - - - \ No newline at end of file diff --git a/run.sh b/run.sh index d4e7255..e78a4d3 100755 --- a/run.sh +++ b/run.sh @@ -1,17 +1,12 @@ #!/bin/bash cd /etc/supervisor/conf.d/ -FLOAPIURL = $(FLOAPIURL) -NETWROKK = $(NETWROKK) - -sed -i "s|window.tokenapiUrl = 'http://0.0.0.0:6012'|window.tokenapiUrl = '$FLOAPIURL'|" /floscout/index.html +sed -i "s|window.tokenapiUrl = 'https://ranchimallflo.duckdns.org'|window.tokenapiUrl = '$FLOAPIURL'|" /floscout/index.html #sed -i "s|command=hypercorn -w 1 -b 0.0.0.0:6012 wsgi:app|command=hypercorn -w 1 -b $FLOAPIURL wsgi:app" /etc/supervisor/conf.d/ftt-ranchimallflo.conf -cat /floscout/index.html +#cat /floscout/index.html #cat /etc/supervisor/conf.d/ftt-ranchimallflo.conf -echo $FLOAPIURL -echo $NETWROKK echo "running..." -supervisord -c /etc/supervisor/conf.d/ftt-ranchimallflo.conf +#supervisord -c /etc/supervisor/conf.d/ftt-ranchimallflo.conf #./floscout/example \ No newline at end of file