remove old stuff

berachain · Feb 4, 2024 · d5f202f · d5f202f
1 parent 304acef
commit d5f202f
Show file tree

Hide file tree

Showing 28 changed files with 8 additions and 1,223 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ include build/scripts/cosmos.mk build/scripts/constants.mk
 
 BUILD_TARGETS := build install
 
-build: BUILD_ARGS=-o $(OUT_DIR)/
+build: BUILD_ARGS=-o $(OUT_DIR)/beacond
 
 build-linux-amd64:
 	GOOS=linux GOARCH=amd64 LEDGER_ENABLED=false $(MAKE) build
@@ -19,8 +19,8 @@ build-linux-arm64:
 	GOOS=linux GOARCH=arm64 LEDGER_ENABLED=false $(MAKE) build
 
 $(BUILD_TARGETS): forge-build sync $(OUT_DIR)/
-	@echo "Building ${TESTAPP_DIR}"
-	@cd ${CURRENT_DIR}/$(TESTAPP_DIR) && go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./...
+	@echo "Building ${TESTAPP_CMD_DIR}"
+	@cd ${CURRENT_DIR}/$(TESTAPP_CMD_DIR) && go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./.
 
 $(OUT_DIR)/:
 	mkdir -p $(OUT_DIR)/

diff --git a/build/scripts/cosmos.mk b/build/scripts/cosmos.mk
@@ -11,6 +11,7 @@ CURRENT_DIR = $(shell pwd)
 OUT_DIR ?= $(CURDIR)/build/bin
 BINDIR ?= $(GOPATH)/build/bin
 TESTAPP_DIR = examples/beacond
+TESTAPP_CMD_DIR = $(TESTAPP_DIR)/cmd
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 
 # process build tags

diff --git a/examples/beacond/contracts/main/main.go b/examples/beacond/contracts/main/main.go
diff --git a/examples/beacond/docker/base.Dockerfile b/examples/beacond/docker/base.Dockerfile
@@ -24,7 +24,7 @@ ARG BUILD_TAGS="netgo,ledger,muslc"
 ARG NAME=beacond
 ARG APP_NAME=beacond
 ARG DB_BACKEND=pebbledb
-ARG CMD_PATH=./app/beacond
+ARG CMD_PATH=./examples/beacond/cmd
 ARG FOUNDRY_DIR=contracts
 
 
@@ -83,7 +83,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     -X github.com/cosmos/cosmos-sdk/types.DBBackend=$DB_BACKEND \
     -w -s -linkmode=external -extldflags '-Wl,-z,muldefs -static'" \
     -trimpath \
-    -o /workdir/build/bin/ \
+    -o /workdir/build/bin/beacond \
     ${CMD_PATH}
 
 #######################################################
@@ -96,14 +96,11 @@ FROM ${RUNNER_IMAGE}
 ARG APP_NAME
 
 # Copy over built executable into a fresh container.
-COPY --from=builder /workdir/build/bin/${APP_NAME} /bin/
+COPY --from=builder /workdir/build/bin/${APP_NAME} /
 
 RUN apk add bash jq sed curl
 
 WORKDIR /
 
-COPY ./app/docker/seed/scripts scripts/
 
-RUN chmod +x scripts/*
-
-CMD ["sh", "-c", "sleep infinity"]
+ENTRYPOINT [ "./beacond" ]