Skip to content

Commit

Permalink
multi: rename binary from geth -> sidegeth
Browse files Browse the repository at this point in the history
  • Loading branch information
torkelrogstad committed Jan 17, 2024
1 parent f35da00 commit e98cc9a
Show file tree
Hide file tree
Showing 41 changed files with 14 additions and 394 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ jobs:

- uses: actions-rust-lang/setup-rust-toolchain@v1

- run: make geth
- run: make sidegeth

- uses: actions/upload-artifact@v4
with:
name: binaries-${{ runner.os }}
if-no-files-found: error
# TODO: Update these when renaming the binaries produced
path: build/bin/geth
path: build/bin/sidegeth
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BUILDNUM=""


# Avoid alpine, as that doesn't play nice with C stuff
# Build Geth in a stock Go builder container
# Build sidegeth in a stock Go builder container
FROM golang:1.18 as builder

RUN apt install git
Expand All @@ -22,16 +22,16 @@ RUN cd /go-ethereum && go mod download
ADD . /go-ethereum
WORKDIR /go-ethereum
RUN cargo build --manifest-path ./drivechain/Cargo.toml
RUN go run build/ci.go install ./cmd/geth
RUN go run build/ci.go install ./cmd/sidegeth

# Pull Geth into a second stage deploy container
# Pull sidegeth into a second stage deploy container
# Avoid alpine, as that doesn't play nice with C stuff
FROM debian:bookworm-slim

COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
COPY --from=builder /go-ethereum/build/bin/sidegeth /usr/local/bin/

EXPOSE 8545 8546 30303 30303/udp
ENTRYPOINT ["geth"]
ENTRYPOINT ["sidegeth"]

# Add some metadata labels to help programatic image consumption
ARG COMMIT=""
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# with Go source code. If you know what GOPATH is then you probably
# don't need to bother with make.

.PHONY: geth android ios evm all test clean
.PHONY: sidegeth android ios evm all test clean

GOBIN = ./build/bin
GO ?= latest
GORUN = go run
CARGO = cargo build --manifest-path ./drivechain/Cargo.toml

geth:
sidegeth:
$(CARGO)
$(GORUN) build/ci.go install ./cmd/geth
$(GORUN) build/ci.go install ./cmd/sidegeth
@echo "Done building."
@echo "Run \"$(GOBIN)/geth\" to launch geth."
@echo "Run \"$(GOBIN)/sidegeth\" to launch sidegeth."

all:
$(GORUN) build/ci.go install
Expand Down
385 changes: 3 additions & 382 deletions README.md

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit e98cc9a

Please sign in to comment.