Skip to content

Commit

Permalink
Merge branch 'develop' into genesis-import
Browse files Browse the repository at this point in the history
  • Loading branch information
kingpinXD authored Apr 19, 2024
2 parents 78cedc7 + 1051a31 commit 2199d3e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Dockerfile-localnet
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM golang:1.20-alpine3.18
ENV GOPATH /go
ENV GOOS=linux
ENV CGO_ENABLED=1
ENV GOCACHE=/root/.cache/go-build

RUN apk --no-cache add git make build-base jq openssh libusb-dev linux-headers bash curl tmux python3 py3-pip
RUN pip install requests
Expand All @@ -14,8 +15,8 @@ COPY go.sum .
RUN go mod download
COPY . .

RUN make install
RUN make install-zetae2e
RUN --mount=type=cache,target="/root/.cache/go-build" make install
RUN --mount=type=cache,target="/root/.cache/go-build" make install-zetae2e

RUN ssh-keygen -A
WORKDIR /root
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ TEST_DIR?="./..."
TEST_BUILD_FLAGS := -tags pebbledb,ledger
HSM_BUILD_FLAGS := -tags pebbledb,ledger,hsm_test

export DOCKER_BUILDKIT := 1

clean: clean-binaries clean-dir clean-test-dir clean-coverage

clean-binaries:
Expand Down

0 comments on commit 2199d3e

Please sign in to comment.