From 4afe084d69f000dcb02637b7bf2b3bbcc4ffee92 Mon Sep 17 00:00:00 2001 From: Flouse Date: Mon, 2 May 2022 01:19:22 +0800 Subject: [PATCH 1/4] Update components: change ckb decimal to 18 godwoken - https://github.com/nervosnetwork/godwoken/pull/675 godwoken-scripts - https://github.com/nervosnetwork/godwoken-scripts/pull/118 godowken-polyjuice - https://github.com/nervosnetwork/godwoken-polyjuice/pull/146 godowken-tests - https://github.com/nervosnetwork/godwoken-tests/pull/105 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0db9a19..d00f26d 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,9 @@ POLYJUICE_REPO := https://github.com/nervosnetwork/godwoken-polyjuice.git OMNI_LOCK_REPO := https://github.com/nervosnetwork/ckb-production-scripts.git # components tags -GODWOKEN_REF := fix-tool-wait_for_l2_tx -GODWOKEN_SCRIPTS_REF := refs/pull/116/head -POLYJUICE_REF := refs/pull/138/head # https://github.com/nervosnetwork/godwoken-polyjuice/pull/138 +GODWOKEN_REF := refs/pull/675/merge # https://github.com/nervosnetwork/godwoken/pull/675 +GODWOKEN_SCRIPTS_REF := refs/pull/118/merge # https://github.com/nervosnetwork/godwoken-scripts/pull/118 +POLYJUICE_REF := main # https://github.com/nervosnetwork/godwoken-polyjuice/commits/main OMNI_LOCK_REF := rc_lock define prepare_repo From 0b361e38074a9155d9cf758bd698251d8d913315 Mon Sep 17 00:00:00 2001 From: Flouse Date: Mon, 2 May 2022 01:36:13 +0800 Subject: [PATCH 2/4] Bump CKB to v0.103.0 (e77138e 2022-04-11) --- Dockerfile.fast | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.fast b/Dockerfile.fast index dda1793..8bc3677 100644 --- a/Dockerfile.fast +++ b/Dockerfile.fast @@ -13,10 +13,10 @@ RUN apt-get update \ # ckb RUN cd /ckb \ - && curl -LO https://github.com/nervosnetwork/ckb/releases/download/v0.101.7/ckb_v0.101.7_x86_64-unknown-linux-gnu.tar.gz \ - && tar xzf ckb_v0.101.7_x86_64-unknown-linux-gnu.tar.gz \ - && cp ckb_v0.101.7_x86_64-unknown-linux-gnu/ckb /bin/ckb \ - && cp ckb_v0.101.7_x86_64-unknown-linux-gnu/ckb-cli /bin/ckb-cli \ + && curl -LO https://github.com/nervosnetwork/ckb/releases/download/v0.103.0/ckb_v0.103.0_x86_64-unknown-linux-gnu.tar.gz \ + && tar xzf ckb_v0.103.0_x86_64-unknown-linux-gnu.tar.gz \ + && cp ckb_v0.103.0_x86_64-unknown-linux-gnu/ckb /bin/ckb \ + && cp ckb_v0.103.0_x86_64-unknown-linux-gnu/ckb-cli /bin/ckb-cli \ && rm -rf /ckb # ckb-indexer From 0fa47efd2824d5512d405e41ec7197cde12cda74 Mon Sep 17 00:00:00 2001 From: Flouse Date: Mon, 2 May 2022 01:38:15 +0800 Subject: [PATCH 3/4] Update README and Bump kicker_ref --- .github/workflows/docker-publish.yml | 2 +- README.md | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 3f86826..28aa133 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -213,5 +213,5 @@ jobs: with: gw_prebuild_image_name: ${{ needs.docker-build-push.outputs.image_name }} gw_prebuild_image_tag: ${{ needs.docker-build-push.outputs.image_tag }} - kicker_ref: refs/pull/226/head # https://github.com/RetricSu/godwoken-kicker/pull/226 + kicker_ref: compatibility-changes # https://github.com/RetricSu/godwoken-kicker/commits/compatibility-changes # gw_prebuild_image_digest: ${{ needs.docker-build-push.outputs.image_digest }} diff --git a/README.md b/README.md index 78bb875..28e31c1 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,12 @@ godwoken-docker-prebuilds ========================= -Docker image containing all binaries used by godwoken, saving you the hassles of building them yourself. +Docker image containing all binaries used by Godwoken, saving you the hassles of building them yourself. How to build: ```bash $ make build-components - - - $ docker build . -t godwoken-prebuilds ``` @@ -22,9 +19,9 @@ $ # build and push to docker-hub, will ask you to enter image tag $ make build-push ``` -# Usage +## Usage -`godwoken` binary resides in `/bin/godwoken`, this is already in PATH so you can do this: +`Godwoken` binary resides in `/bin/godwoken`, this is already in PATH so you can do this: ```bash $ docker run --rm godwoken-prebuilds godwoken --version @@ -44,7 +41,14 @@ $ docker run --rm godwoken-prebuilds ckb-cli --version $ docker run --rm godwoken-prebuilds ckb-indexer --version ``` -All the scripts used by godwoken can be found at `/scripts` folder: +## Check the reference of every component +```bash +docker inspect godwoken-prebuilds:[TAG] | egrep ref.component +``` + +## Scripts + +All the scripts used by Godwoken can be found at `/scripts` folder: ```bash $ docker run --rm godwoken-prebuilds find /scripts -type f -exec sha1sum {} \; From cd748913d19f9238cbfb316d1c9b78d95b456450 Mon Sep 17 00:00:00 2001 From: Flouse Date: Sun, 8 May 2022 09:38:43 +0800 Subject: [PATCH 4/4] Bump component tags - GODWOKEN_REF := v1.1.0-beta # https://github.com/nervosnetwork/godwoken/releases/tag/v1.1.0-beta - GODWOKEN_SCRIPTS_REF := v1.1.0-beta # https://github.com/nervosnetwork/godwoken-scripts/releases/tag/v1.1.0-beta - POLYJUICE_REF := v1.1.4-beta # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/v1.1.4-beta --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d00f26d..14ac787 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,9 @@ POLYJUICE_REPO := https://github.com/nervosnetwork/godwoken-polyjuice.git OMNI_LOCK_REPO := https://github.com/nervosnetwork/ckb-production-scripts.git # components tags -GODWOKEN_REF := refs/pull/675/merge # https://github.com/nervosnetwork/godwoken/pull/675 -GODWOKEN_SCRIPTS_REF := refs/pull/118/merge # https://github.com/nervosnetwork/godwoken-scripts/pull/118 -POLYJUICE_REF := main # https://github.com/nervosnetwork/godwoken-polyjuice/commits/main +GODWOKEN_REF := v1.1.0-beta # https://github.com/nervosnetwork/godwoken/releases/tag/v1.1.0-beta +GODWOKEN_SCRIPTS_REF := v1.1.0-beta # https://github.com/nervosnetwork/godwoken-scripts/releases/tag/v1.1.0-beta +POLYJUICE_REF := v1.1.4-beta # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/v1.1.4-beta OMNI_LOCK_REF := rc_lock define prepare_repo