Skip to content

Commit

Permalink
test removing mount in dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
lumtis committed Dec 28, 2023
1 parent 36ac32d commit b3f9850
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
15 changes: 9 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ RUN ssh-keygen -b 2048 -t rsa -f /root/.ssh/localtest.pem -q -N ""
WORKDIR /go/delivery/zeta-node
COPY go.mod .
COPY go.sum .
RUN --mount=type=cache,target=/root/.cache/go-build \
go mod download
#RUN --mount=type=cache,target=/root/.cache/go-build \
# go mod download
RUN go mod download
COPY . .

RUN --mount=type=cache,target=/root/.cache/go-build \
make install
RUN --mount=type=cache,target=/root/.cache/go-build \
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 make install
RUN make install-zetae2e
#
#FROM golang:1.20-alpine

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ build-testnet-ubuntu: go.sum

install: go.sum
@echo "--> Installing zetacored & zetaclientd"
@go install -race -mod=readonly $(BUILD_FLAGS) ./cmd/zetacored
@go install -race -mod=readonly $(BUILD_FLAGS) ./cmd/zetaclientd
@go install -mod=readonly $(BUILD_FLAGS) ./cmd/zetacored
@go install -mod=readonly $(BUILD_FLAGS) ./cmd/zetaclientd

install-zetaclient: go.sum
@echo "--> Installing zetaclientd"
Expand Down
2 changes: 1 addition & 1 deletion cmd/zetae2e/local/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
time.Sleep(70 * time.Second)

// initialize deployer runner with config
deployerRunner, err := runnerFromConfig(
deployerRunner, err := localRunnerFromConfig(
ctx,
"deployer",
cancel,
Expand Down
6 changes: 3 additions & 3 deletions cmd/zetae2e/local/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func initTestRunner(
logger *runner.Logger,
) (*runner.SmokeTestRunner, error) {
// initialize runner for test
testRunner, err := runnerFromConfig(
testRunner, err := localRunnerFromConfig(
deployerRunner.Ctx,
name,
deployerRunner.CtxCancel,
Expand All @@ -78,8 +78,8 @@ func initTestRunner(
return testRunner, nil
}

// runnerFromConfig create test runner from config
func runnerFromConfig(
// localRunnerFromConfig create test runner from config for local test
func localRunnerFromConfig(
ctx context.Context,
name string,
ctxCancel context.CancelFunc,
Expand Down

0 comments on commit b3f9850

Please sign in to comment.