Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: push docker image action. #580

Merged
merged 4 commits into from
Jul 7, 2022
Merged

fix: push docker image action. #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6040b8
fix: push docker image action.
zemyblue Jul 5, 2022
b75f537
chore: rollback the `BINARY` data of `init_node.sh`
zemyblue Jul 5, 2022
4d27dee
chore: rollback the `BINARY` data of `init_node.sh`
zemyblue Jul 5, 2022
c9ca556
chore: change `ostracon` version
zemyblue Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ jobs:
push: ${{github.event_name != 'pull_request'}}
tags: ${{steps.meta.outputs.tags}}
labels: ${{steps.meta.outputs.labels}}
platforms: linux/amd64
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

* (ci) [\#457](https://github.com/line/lbm-sdk/pull/457), [\#471](https://github.com/line/lbm-sdk/pull/471) add swagger check
* (ci) [\#469](https://github.com/line/lbm-sdk/pull/469) publish docker image on tag push
* (ci) [\#580](https://github.com/line/lbm-sdk/pull/580) fix the problem that the registered docker image couldn't run on M1.

### Document Updates

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN make build-linux
FROM alpine:edge

# Install ca-certificates
RUN apk add --update ca-certificates
RUN apk add --update ca-certificates libstdc++
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change specific to M1? Then, it would be nice to state it in the comment or description of the PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it is for using BLS of line/ostracon.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried it on M1 macbook docker linux/arm64 and linux/amd64 environment, but the latest github.com/herumi/bls-eth-go-binary seems to require libstdc++.

Copy link
Member Author

@zemyblue zemyblue Jul 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, libstdc++ library is required for linux/amd64 because bls-eth-go-binary of ostracon.
I add the description about this chagens.

WORKDIR /root

# Copy over binaries from the build-env
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/improbable-eng/grpc-web v0.15.0
github.com/jhump/protoreflect v1.10.3
github.com/line/iavl/v2 v2.0.0-init.1.0.20220215225951-cb11c91d8857
github.com/line/ostracon v1.0.6-0.20220614053335-f9d9fa2cc779
github.com/line/ostracon v1.0.6
github.com/line/tm-db/v2 v2.0.0-init.1.0.20220121012851-61d2bc1d9486
github.com/line/wasmvm v0.16.3-0.9.0
github.com/magiconair/properties v1.8.6
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,8 @@ github.com/line/gorocksdb v0.0.0-20210406043732-d4bea34b6d55/go.mod h1:DHRJroSL7
github.com/line/iavl/v2 v2.0.0-init.1.0.20220215225951-cb11c91d8857 h1:8kWqbLNeb37357e4U/7uLMVCRF3K9bxwTGb6JmRUKpI=
github.com/line/iavl/v2 v2.0.0-init.1.0.20220215225951-cb11c91d8857/go.mod h1:uK2CYRdukSVRGhc5Q8zoDUnm/zAbfnZATbFXrfCrQKA=
github.com/line/ostracon v0.34.9-0.20210429084710-ef4fe0a40c7d/go.mod h1:ttnbq+yQJMQ9a2MT5SEisOoa/+pOgh2KenTiK/rVdiw=
github.com/line/ostracon v1.0.6-0.20220614053335-f9d9fa2cc779 h1:Nw+i074ivEcwtZd2MIY0HJh8UoRyh+iTlzgHSbssHPQ=
github.com/line/ostracon v1.0.6-0.20220614053335-f9d9fa2cc779/go.mod h1:SGNYNMSs7/YNrsFg6FOIa5phmreBJxD7SaBmmijpfRc=
github.com/line/ostracon v1.0.6 h1:NgFu4e9+ukalCizKLtHby6o7ofakSPkdV8yfzOe2urM=
github.com/line/ostracon v1.0.6/go.mod h1:SGNYNMSs7/YNrsFg6FOIa5phmreBJxD7SaBmmijpfRc=
github.com/line/tm-db/v2 v2.0.0-init.1.0.20210413083915-5bb60e117524/go.mod h1:wmkyPabXjtVZ1dvRofmurjaceghywtCSYGqFuFS+TbI=
github.com/line/tm-db/v2 v2.0.0-init.1.0.20220121012851-61d2bc1d9486 h1:uvXQdcWaUyNsgkXBz375FpQ285WEJaLXhQ5HtoNK/GU=
github.com/line/tm-db/v2 v2.0.0-init.1.0.20220121012851-61d2bc1d9486/go.mod h1:wmkyPabXjtVZ1dvRofmurjaceghywtCSYGqFuFS+TbI=
Expand Down