Verified Commit ae737dba authored by BTCxZelko's avatar BTCxZelko Committed by likewhoa
Browse files

post test cleanup

move start.sh to API dir
ensure wait-for-it.sh is copied to correct location during build
mod to dojo.sh to ensure both containers are accounted for during clean and uninstall
mod to .env to ensure both are accounted for in versioning and correction to variable
mempool yaml modified to point to Dockerfile location
parent 8a02ba28
......@@ -20,7 +20,8 @@ DOJO_TOR_VERSION_TAG=1.10.0
DOJO_EXPLORER_VERSION_TAG=1.7.0
DOJO_INDEXER_VERSION_TAG=1.3.0
DOJO_WHIRLPOOL_VERSION_TAG=1.4.0
DOJO_MEMPOOL_VERSION_TAG=2.2.0
DOJO_MEMPOOL_API_VERSION_TAG=2.2.0
DOJO_MEMPOOL_WEB_VERSION_TAG=2.2.0
#########################################
......@@ -34,7 +35,7 @@ NET_DOJO_TOR_IPV4=172.28.1.4
NET_DOJO_BITCOIND_IPV4=172.28.1.5
NET_DOJO_INDEXER_IPV4=172.28.1.6
NET_DOJO_EXPLORER_IPV4=172.28.1.7
NET_DOJO_MEMPOOL_WEB_IPV4=172.27.1.8
NET_DOJO_MEMPOOL_API_IPV4=172.27.1.8
NET_DOJO_MEMPOOL_WEB_IPV4=172.27.1.9
NET_DMZ_NGINX_IPV4=172.29.1.3
......
......@@ -276,7 +276,8 @@ clean() {
del_images_for samouraiwallet/dojo-tor "$DOJO_TOR_VERSION_TAG"
del_images_for samouraiwallet/dojo-indexer "$DOJO_INDEXER_VERSION_TAG"
del_images_for samouraiwallet/dojo-whirlpool "$DOJO_WHIRLPOOL_VERSION_TAG"
del_images_for samouraiwallet/dojo-mempool:"$DOJO_MEMPOOL_VERSION_TAG"
del_images_for samouraiwallet/dojo-mempool_api:"$DOJO_MEMPOOL__API_VERSION_TAG"
del_images_for samouraiwallet/dojo-mempool_web:"$DOJO_MEMPOOL__WEB_VERSION_TAG"
docker image prune -f
}
......@@ -544,7 +545,7 @@ help() {
echo " dojo.sh logs node : display the logs of NodeJS modules (API, Tracker, PushTx API, Orchestrator)"
echo " dojo.sh logs explorer : display the logs of the Explorer"
echo " dojo.sh logs whirlpool : display the logs of the Whirlpool client"
echo " dojo.sh logs mempool : display the logs of the Mempool.space"
echo " dojo.sh logs mempool_api : display the logs of the Mempool.space"
echo " "
echo " Available options:"
echo " -n [VALUE] : display the last VALUE lines"
......
......@@ -16,6 +16,7 @@ RUN cd mempool/backend && \
npm ci --production && \
npm i typescript && \
npm run build
RUN cp /build/mempool/docker/backend/wait-for-it.sh
FROM node:12-buster-slim
......
......@@ -12,7 +12,7 @@ ENV CYPRESS_INSTALL_BINARY=0
WORKDIR /build
RUN apt-get update
RUN apt-get install -y build-essential rsync git
RUN cd ${MEMPOOL_API_HOME} && git clone -b ${MEMPOOL_API_VERSION} ${MEMPOOL_API_URL}
RUN cd ${MEMPOOL_WEB_HOME} && git clone -b ${MEMPOOL_WEB_VERSION} ${MEMPOOL_WEB_URL}
RUN cd mempool/frontend && \
npm i && \
npm run build
......@@ -30,7 +30,7 @@ COPY --from=builder /build/mempool/nginx-mempool.conf /etc/nginx/conf.d/
RUN chmod +x /patch/entrypoint.sh
RUN chmod +x /patch/wait-for
RUN chown -R ${MEMPOOL_WEB_LINUX_UID}:${MEMPOOL_WEB_LINUX_GID} /patch && chmod -R 755 /patch && #\
RUN chown -R ${MEMPOOL_WEB_LINUX_UID}:${MEMPOOL_WEB_LINUX_GID} /patch && chmod -R 755 /patch && \
chown -R ${MEMPOOL_WEB_LINUX_UID}:${MEMPOOL_WEB_LINUX_GID} /var/cache/nginx && \
chown -R ${MEMPOOL_WEB_LINUX_UID}:${MEMPOOL_WEB_LINUX_GID} /var/log/nginx && \
chown -R ${MEMPOOL_WEB_LINUX_UID}:${MEMPOOL_WEB_LINUX_GID} /etc/nginx/nginx.conf && \
......
......@@ -3,7 +3,9 @@ version: "3.7"
services:
mempool_api:
image: "samouraiwallet/dojo-mempool_api:${DOJO_MEMPOOL_API_VERSION_TAG}"
container_name: "mempool_api"
container_name: "mempool_api"
build:
dockerfile: ./docker/my-dojo/mempool/API/Dockerfile
args:
MEMPOOL_API_LINUX_UID: ${MEMPOOL_API_LINUX_UID}
MEMPOOL_API_LINUX_GID: ${MEMPOOL_API_LINUX_GID}
......@@ -30,8 +32,10 @@ services:
ipv4_address: ${NET_DOJO_MEMPOOL_API_IPV4}
mempool_web:
image: "samouraiwallet/dojo-mempool_web:${DOJO_MEMPOOL_WEB_VERSION_TAG}"
container_name: "mempool_web"
image: "samouraiwallet/dojo-mempool_web:${DOJO_MEMPOOL_WEB_VERSION_TAG}"
container_name: "mempool_web"
build:
dockerfile: ./docker/my-dojo/mempool/WEB/Dockerfile
args:
MEMPOOL_WEB_LINUX_UID: ${MEMPOOL_WEB_LINUX_UID}
MEMPOOL_WEB_LINUX_GID: ${MEMPOOL_WEB_LINUX_GID}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment