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
This commit is contained in:
		
							parent
							
								
									24d56f565e
								
							
						
					
					
						commit
						2b94cab046
					
				@ -4,9 +4,8 @@ RUN mkdir /mempool.space/
 | 
				
			|||||||
COPY ./backend /mempool.space/backend/
 | 
					COPY ./backend /mempool.space/backend/
 | 
				
			||||||
COPY ./frontend /mempool.space/frontend/
 | 
					COPY ./frontend /mempool.space/frontend/
 | 
				
			||||||
COPY ./mariadb-structure.sql /mempool.space/mariadb-structure.sql
 | 
					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 mysql_install_db --user=mysql --datadir=/var/lib/mysql/
 | 
				
			||||||
RUN /usr/bin/mysqld_safe --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_USER mempool
 | 
				
			||||||
ENV DB_PASSWORD mempool
 | 
					ENV DB_PASSWORD mempool
 | 
				
			||||||
ENV DB_DATABASE mempool
 | 
					ENV DB_DATABASE mempool
 | 
				
			||||||
ENV HTTP_PORT 80
 | 
					 | 
				
			||||||
ENV API_ENDPOINT /api/v1/
 | 
					ENV API_ENDPOINT /api/v1/
 | 
				
			||||||
ENV CHAT_SSL_ENABLED false
 | 
					ENV CHAT_SSL_ENABLED false
 | 
				
			||||||
#ENV CHAT_SSL_PRIVKEY
 | 
					 | 
				
			||||||
#ENV CHAT_SSL_CERT
 | 
					 | 
				
			||||||
#ENV CHAT_SSL_CHAIN
 | 
					 | 
				
			||||||
ENV MEMPOOL_REFRESH_RATE_MS 500
 | 
					ENV MEMPOOL_REFRESH_RATE_MS 500
 | 
				
			||||||
ENV INITIAL_BLOCK_AMOUNT 8
 | 
					ENV INITIAL_BLOCK_AMOUNT 8
 | 
				
			||||||
ENV DEFAULT_PROJECTED_BLOCKS_AMOUNT 3
 | 
					ENV DEFAULT_PROJECTED_BLOCKS_AMOUNT 3
 | 
				
			||||||
@ -48,8 +43,6 @@ ENV BITCOIN_NODE_USER bitcoinuser
 | 
				
			|||||||
ENV BITCOIN_NODE_PASS bitcoinpass
 | 
					ENV BITCOIN_NODE_PASS bitcoinpass
 | 
				
			||||||
ENV TX_PER_SECOND_SPAN_SECONDS 150
 | 
					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/ && \
 | 
					RUN cd /mempool.space/frontend/ && \
 | 
				
			||||||
    npm run build && \
 | 
					    npm run build && \
 | 
				
			||||||
    rsync -av --delete dist/mempool/ /var/www/html/
 | 
					    rsync -av --delete dist/mempool/ /var/www/html/
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user