Skip to content

Commit

Permalink
fix the naming problem for docker
Browse files Browse the repository at this point in the history
  • Loading branch information
uptSmart committed Jan 19, 2024
1 parent cbf6020 commit b4b58f2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -540,15 +540,15 @@ ifeq ($(OS),Windows_NT)
mkdir localnet-setup &
@$(MAKE) localnet-build

IF not exist "build/node0/$(UPTICK_BINARY)/config/genesis.json" docker run --rm -v $(CURDIR)/build\uptick\Z xuxinai2002/node:v0.2 "./uptickd testnet --v 4 -o /uptick --keyring-backend=test --starting-ip-address 192.167.10.2"
IF not exist "build/node0/$(UPTICK_BINARY)/config/genesis.json" docker run --rm -v $(CURDIR)/build\uptick\Z uptick/node:v0.2 "./uptickd testnet --v 4 -o /uptick --keyring-backend=test --starting-ip-address 192.167.10.2"
# docker-compose up -d
else
# mkdir -p localnet-setup
@$(MAKE) localnet-build

# if ! [ -f localnet-setup/node0/$(UPTICK_BINARY)/config/genesis.json ]; \
# then \
# docker run --rm -v $(CURDIR)/localnet-setup:/uptick:Z xuxinai2002/node:v0.1 "export LD_LIBRARY_PATH=/wasm && ./uptickd testnet init-files --v 4 -o /uptick --keyring-backend=test --starting-ip-address 192.167.10.2"; \
# docker run --rm -v $(CURDIR)/localnet-setup:/uptick:Z uptick/node:v0.1 "export LD_LIBRARY_PATH=/wasm && ./uptickd testnet init-files --v 4 -o /uptick --keyring-backend=test --starting-ip-address 192.167.10.2"; \
# fi
#
# docker-compose up -d
Expand All @@ -567,15 +567,15 @@ localnet-clean:
localnet-unsafe-reset:
docker-compose down
ifeq ($(OS),Windows_NT)
@docker run --rm -v $(CURDIR)\localnet-setup\node0\uptickd:uptick\Z xuxinai2002/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)\localnet-setup\node1\uptickd:uptick\Z xuxinai2002/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)\localnet-setup\node2\uptickd:uptick\Z xuxinai2002/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)\localnet-setup\node3\uptickd:uptick\Z xuxinai2002/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)\localnet-setup\node0\uptickd:uptick\Z uptick/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)\localnet-setup\node1\uptickd:uptick\Z uptick/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)\localnet-setup\node2\uptickd:uptick\Z uptick/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)\localnet-setup\node3\uptickd:uptick\Z uptick/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
else
@docker run --rm -v $(CURDIR)/localnet-setup/node0/uptickd:/uptick:Z xuxinai2002/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)/localnet-setup/node1/uptickd:/uptick:Z xuxinai2002/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)/localnet-setup/node2/uptickd:/uptick:Z xuxinai2002/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)/localnet-setup/node3/uptickd:/uptick:Z xuxinai2002/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)/localnet-setup/node0/uptickd:/uptick:Z uptick/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)/localnet-setup/node1/uptickd:/uptick:Z uptick/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)/localnet-setup/node2/uptickd:/uptick:Z uptick/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
@docker run --rm -v $(CURDIR)/localnet-setup/node3/uptickd:/uptick:Z uptick/node:v0.1 "./uptickd unsafe-reset-all --home=/uptick"
endif

# Clean testnet
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
node0:
container_name: upticknode0
image: "xuxinai2002/node:v0.1"
image: "uptick/node:v0.1"
ports:
- "26656-26657:26656-26657"
volumes:
Expand All @@ -16,7 +16,7 @@ services:

node1:
container_name: upticknode1
image: "xuxinai2002/node:v0.1"
image: "uptick/node:v0.1"
ports:
- "26659-26660:26656-26657"
volumes:
Expand All @@ -29,7 +29,7 @@ services:

node2:
container_name: upticknode2
image: "xuxinai2002/node:v0.1"
image: "uptick/node:v0.1"
ports:
- "26661-26662:26656-26657"
volumes:
Expand All @@ -42,7 +42,7 @@ services:

node3:
container_name: upticknode3
image: "xuxinai2002/node:v0.1"
image: "uptick/node:v0.1"
ports:
- "26663-26664:26656-26657"
volumes:
Expand Down
2 changes: 1 addition & 1 deletion networks/local/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
all:
docker build --no-cache --tag xuxinai2002/node:v0.2 ../.. -f uptick/Dockerfile
docker build --no-cache --tag uptick/node:v0.2 ../.. -f uptick/Dockerfile

.PHONY: all

0 comments on commit b4b58f2

Please sign in to comment.