From 2b94cab04637e9a869a5e5039875bb2df2a20587 Mon Sep 17 00:00:00 2001
From: rbrooklyn <11929484+rbrooklyn@users.noreply.github.com>
Date: Fri, 14 Feb 2020 16:49:14 +0000
Subject: [PATCH] Remove jq, add bash from alpine. Remove HTTP_PORT. General
 tidy

HTTP_PORT was ignored and can be remapped by Docker anyway.
Remove jq as no longer needed by entrypoint.sh
Added bash as needed by entrypoint.sh
---
 Dockerfile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3be11db2e..1255e120a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,8 @@ RUN mkdir /mempool.space/
 COPY ./backend /mempool.space/backend/
 COPY ./frontend /mempool.space/frontend/
 COPY ./mariadb-structure.sql /mempool.space/mariadb-structure.sql
-#COPY ./nginx.conf /mempool.space/nginx.conf
 
-RUN apk add mariadb mariadb-client jq git nginx npm rsync
+RUN apk add mariadb mariadb-client git nginx npm rsync bash
 
 RUN mysql_install_db --user=mysql --datadir=/var/lib/mysql/
 RUN /usr/bin/mysqld_safe --datadir='/var/lib/mysql/'& \
@@ -32,12 +31,8 @@ ENV DB_PORT 3306
 ENV DB_USER mempool
 ENV DB_PASSWORD mempool
 ENV DB_DATABASE mempool
-ENV HTTP_PORT 80
 ENV API_ENDPOINT /api/v1/
 ENV CHAT_SSL_ENABLED false
-#ENV CHAT_SSL_PRIVKEY
-#ENV CHAT_SSL_CERT
-#ENV CHAT_SSL_CHAIN
 ENV MEMPOOL_REFRESH_RATE_MS 500
 ENV INITIAL_BLOCK_AMOUNT 8
 ENV DEFAULT_PROJECTED_BLOCKS_AMOUNT 3
@@ -48,8 +43,6 @@ ENV BITCOIN_NODE_USER bitcoinuser
 ENV BITCOIN_NODE_PASS bitcoinpass
 ENV TX_PER_SECOND_SPAN_SECONDS 150
 
-#RUN echo "mysqld_safe& sleep 20 && cd /mempool.space/backend && rm -f mempool-config.json && rm -f cache.json && touch cache.json && jq -n env > mempool-config.json && node dist/index.js" > /entrypoint.sh
-
 RUN cd /mempool.space/frontend/ && \
     npm run build && \
     rsync -av --delete dist/mempool/ /var/www/html/