Skip to content

Commit

Permalink
chore: update dockerfiles naming convention
Browse files Browse the repository at this point in the history
  • Loading branch information
hacheigriega authored and JeancarloBarrios committed Oct 30, 2023
1 parent a306c8b commit 6ec79a8
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./dockers/seda-node-static.Dockerfile
file: ./dockers/Dockerfile.node-static
platforms: linux/amd64,linux/arm64
GO_VERSION: "1.21"
RUNNER_IMAGE: "gcr.io/distroless/static-debian11:nonroot"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This Dockerfile si for .gorelease purposesBuild: docker build -t seda-chaind .
# If you are looking for a Dockerfile to run a node, see dockers/seda-node.Dockerfile
# This Dockerfile is for .gorelease purposesBuild: docker build -t seda-chaind .
# If you are looking for a Dockerfile to run a node, see dockerfiles/Dockerfile.node
FROM scratch
ENTRYPOINT ["/seda-chaind"]
COPY seda-chaind /
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ docker-static-build:
--build-arg RUNNER_IMAGE=$(RUNNER_BASE_IMAGE_DISTROLESS) \
--build-arg GIT_VERSION=$(VERSION) \
--build-arg GIT_COMMIT=$(COMMIT) \
-f static.Dockerfile .
-f $(CURDIR)/dockerfiles/Dockerfile.static .

docker-static-build-alpine:
@DOCKER_BUILDKIT=1 docker build \
Expand All @@ -298,4 +298,4 @@ docker-static-build-alpine:
--build-arg RUNNER_IMAGE=$(RUNNER_BASE_IMAGE_ALPINE) \
--build-arg GIT_VERSION=$(VERSION) \
--build-arg GIT_COMMIT=$(COMMIT) \
-f static.Dockerfile .
-f $(CURDIR)/dockerfiles/Dockerfile.static .
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm |
# Copy the remaining files
COPY . .

# Build osmosisd binary
# Build seda-chiand binary
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/root/go/pkg/mod \
GOWORK=off go build -v \
Expand All @@ -43,8 +43,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
-ldflags \
"-X github.com/cosmos/cosmos-sdk/version.Name="seda-chain" \
-X github.com/cosmos/cosmos-sdk/version.AppName="seda-chaind" \
-X github.com/cosmos/cosmos-sdk/version.Version="0.0.1" \
-X github.com/cosmos/cosmos-sdk/version.Commit="00120312312" \
-X github.com/cosmos/cosmos-sdk/version.Version=${GIT_VERSION} \
-X github.com/cosmos/cosmos-sdk/version.Commit=${GIT_COMMIT} \
-X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc \
-w -s -linkmode=external -extldflags '-Wl,-z,muldefs -static'" \
-trimpath \
Expand All @@ -69,8 +69,8 @@ WORKDIR $HOME
EXPOSE 26656
EXPOSE 26657
EXPOSE 1317
EXPOSE 9090

# Binary for static image
COPY --chown=nonroot:nonroot scripts/validator_setup/validator_setup.sh .
RUN chmod +x validator_setup.sh
ENTRYPOINT ["sh", "validator_setup.sh"]
7 changes: 1 addition & 6 deletions static.Dockerfile → dockerfiles/Dockerfile.static
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ COPY --from=builder /seda-chain/build/seda-chaind /bin/seda-chaind
ENV HOME /seda-chain
WORKDIR $HOME

EXPOSE 26656
EXPOSE 26657
EXPOSE 1317
# Note: uncomment the line below if you need pprof
# We disable it by default in out main Dockerfile for security reasons
# EXPOSE 6060
EXPOSE 26656 26657 1317 9090

ENTRYPOINT ["seda-chaind"]

0 comments on commit 6ec79a8

Please sign in to comment.