diff --git a/wownero/Dockerfile b/wownero/Dockerfile index 4b63260..8b8337e 100644 --- a/wownero/Dockerfile +++ b/wownero/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y \ build-essential cmake pkg-config libboost-all-dev \ libssl-dev libzmq3-dev libunbound-dev libsodium-dev libpgm-dev git -RUN git clone https://git.wownero.com/wownero/wownero --depth=1 --branch=v0.9.3.3 . +RUN git clone https://git.wownero.com/wownero/wownero --depth=1 --branch=v0.10.0.0 . RUN make -j4 diff --git a/wownero/Makefile b/wownero/Makefile index 64af6c0..ac63987 100644 --- a/wownero/Makefile +++ b/wownero/Makefile @@ -7,13 +7,13 @@ help: @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' up: ## Build and run the required containers by fetching binaries - docker-compose -f docker-compose.yaml up -d + docker-compose up -d build: ## Build the required containers by fetching binaries - docker-compose -f docker-compose.yaml build + docker-compose build down: ## Stop the containers - docker-compose -f docker-compose.yaml down + docker-compose down logs: ## Get logs from the containers - docker-compose -f docker-compose.yaml logs -f wownerod + docker-compose logs -f wownerod diff --git a/wownero/docker-compose.yaml b/wownero/docker-compose.yaml index d00f119..f7b45b0 100644 --- a/wownero/docker-compose.yaml +++ b/wownero/docker-compose.yaml @@ -58,10 +58,10 @@ services: dockerfile: wownerod_nocompile restart: unless-stopped volumes: - - ~/data/daemon:/data + - ./data:/data command: wownerod --data-dir=/data --rpc-bind-ip=0.0.0.0 --rpc-restricted-bind-ip=0.0.0.0 --confirm-external-bind --non-interactive --public-node --rpc-restricted-bind-port=34568 --rpc-bind-port=34570 --log-level=0 ports: - - 34567:34567 - - 34568:34568 + - 0.0.0.0:34567:34567 + - 0.0.0.0:34568:34568 - 127.0.0.1:34570:34570 diff --git a/wownero/dockerfiles/wownerod_nocompile b/wownero/dockerfiles/wownerod_nocompile index 9c06494..8a0264b 100644 --- a/wownero/dockerfiles/wownerod_nocompile +++ b/wownero/dockerfiles/wownerod_nocompile @@ -6,19 +6,20 @@ FROM ubuntu:20.04 # Install daemon binary # Clean up -RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y tar wget +RUN apt-get update +RUN apt-get upgrade -y +RUN apt-get install -y tar wget xz-utils -ENV WOWNERO_HASH f30cead0cef928c3dd8026af0d56f60bfac013ab6a0091b06f7806b91cb4c019 -ENV WOWNERO_DL_URL https://git.wownero.com/attachments/eff94812-d077-45b2-a101-daf76932b469 -ENV WOWNERO_DL_FILE wownero.tar.bz2 +ENV WOWNERO_HASH d482f54536b4dd936566a20bea15d1dc152a8b03285c71c84a5dca32afa4a438 +ENV WOWNERO_DL_URL https://git.wownero.com/attachments/5031ad4e-f0b8-42ab-87a2-9568cfaa8ec2 +ENV WOWNERO_DL_FILE wownero.tar.xz ENV WOWNERO_SUMS_FILE sha256sums WORKDIR /opt/wownero -RUN wget -qO ${WOWNERO_DL_FILE} ${WOWNERO_DL_URL} \ - && echo "${WOWNERO_HASH} ${WOWNERO_DL_FILE}" > ${WOWNERO_SUMS_FILE} \ +RUN wget -qO ${WOWNERO_DL_FILE} ${WOWNERO_DL_URL} + +RUN echo "${WOWNERO_HASH} ${WOWNERO_DL_FILE}" > ${WOWNERO_SUMS_FILE} \ && sha256sum -c ${WOWNERO_SUMS_FILE}; \ if [ "$?" -eq 0 ]; \ then \ @@ -28,8 +29,8 @@ RUN wget -qO ${WOWNERO_DL_FILE} ${WOWNERO_DL_URL} \ exit 5; \ fi \ && mkdir ./tmp \ - && tar xjf ${WOWNERO_DL_FILE} -C ./tmp --strip 1 \ - && mv ./tmp/* /usr/local/bin/ \ + && tar xvf ${WOWNERO_DL_FILE} -C ./tmp --strip 1 \ + && install ./tmp/wownero* /usr/local/bin/ \ && rm -rf ./tmp ${WOWNERO_SUMS_FILE} ${WOWNERO_DL_FILE} WORKDIR /data