Skip to content

Commit

Permalink
Merge pull request #9 from nervosnetwork/remove-godwoken-web3
Browse files Browse the repository at this point in the history
Remove godwoken-web3
  • Loading branch information
jjyr committed Jun 9, 2021
2 parents 2920ec0 + 3e9cdd6 commit 86cb49e
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 12 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "godwoken"]
path = godwoken
url = https://github.com/nervosnetwork/godwoken
[submodule "godwoken-web3"]
path = godwoken-web3
url = https://github.com/nervosnetwork/godwoken-web3
[submodule "godwoken-scripts"]
path = godwoken-scripts
url = https://github.com/nervosnetwork/godwoken-scripts
Expand Down
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN mkdir /ckb-indexer
RUN cd /ckb-indexer && curl -LO https://github.com/nervosnetwork/ckb-indexer/releases/download/v0.2.0/ckb-indexer-0.2.0-linux.zip
RUN cd /ckb-indexer && unzip ckb-indexer-0.2.0-linux.zip && tar xzf ckb-indexer-linux-x86_64.tar.gz

FROM node:14-buster
FROM node:14-buster
MAINTAINER Xuejie Xiao <x@nervos.org>

COPY --from=builder /ckb/ckb_v0.41.0_x86_64-unknown-linux-gnu/ckb /bin/ckb
Expand All @@ -41,11 +41,6 @@ RUN mkdir -p /scripts/clerkb
COPY clerkb/build/debug/poa /scripts/clerkb/
COPY clerkb/build/debug/state /scripts/clerkb/

COPY godwoken-web3/package.json /godwoken-web3/package.json
COPY godwoken-web3/yarn.lock /godwoken-web3/yarn.lock
RUN cd /godwoken-web3 && yarn
COPY godwoken-web3/. /godwoken-web3/.

EXPOSE 3000

CMD [ "godwoken", "--version" ]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-components:
build-push:
make build-components
@read -p "Please Enter New Image Tag: " VERSION ; \
docker build . -t nervos/godwoken-prebuilds:$$VERSION
docker build . -t nervos/godwoken-prebuilds:$$VERSION ; \
docker push nervos/godwoken-prebuilds:$$VERSION

test:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ $ docker run --rm godwoken-prebuilds find /scripts
/scripts/clerkb/poa
```

Finally, the [Web3 compatible RPC layer](https://github.com/bitrocks/godwoken-web3) can be found at `/godwoken-web3`. All the node dependencies are already installed during docker image building phase, tho you might want to customize `/godwoken-web3/packages/api-server/.env` for database and godwoken RPC URLs.
Finally, the original [Web3 compatible RPC layer](https://github.com/nervosnetwork/godwoken-web3) is move to [this js-prebuild image](https://github.com/RetricSu/godwoken-docker-js-prebuilds).
1 change: 0 additions & 1 deletion godwoken-web3
Submodule godwoken-web3 deleted from 818a30

0 comments on commit 86cb49e

Please sign in to comment.