docker: reorganize dockerfiles

This commit is contained in:
heyitaki 2022-12-21 13:44:57 +00:00 committed by aki
parent 49de9ef8f2
commit b7d870efcb
9 changed files with 7 additions and 7 deletions

View File

@ -43,7 +43,7 @@ jobs:
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with: with:
context: . context: .
file: ./Dockerfile.node file: ./node/Dockerfile
push: true push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
target: export target: export

View File

@ -114,7 +114,7 @@ if bigTableKeyPath != "":
docker_build( docker_build(
ref = "guardiand-image", ref = "guardiand-image",
context = ".", context = ".",
dockerfile = "Dockerfile.node", dockerfile = "node/Dockerfile",
target = "build", target = "build",
ignore=["./sdk/js"] ignore=["./sdk/js"]
) )
@ -371,7 +371,7 @@ if solana:
ref = "bridge-client", ref = "bridge-client",
context = ".", context = ".",
only = ["./proto", "./solana", "./clients"], only = ["./proto", "./solana", "./clients"],
dockerfile = "Dockerfile.client", dockerfile = "solana/Dockerfile.client",
# Ignore target folders from local (non-container) development. # Ignore target folders from local (non-container) development.
ignore = ["./solana/*/target"], ignore = ["./solana/*/target"],
) )
@ -600,7 +600,7 @@ if terra2:
docker_build( docker_build(
ref = "terra2-contracts", ref = "terra2-contracts",
context = ".", context = ".",
dockerfile = "./Dockerfile.cosmwasm", dockerfile = "./cosmwasm/Dockerfile",
) )
k8s_yaml_with_ns("devnet/terra2-devnet.yaml") k8s_yaml_with_ns("devnet/terra2-devnet.yaml")
@ -720,7 +720,7 @@ if wormchain:
docker_build( docker_build(
ref = "wormchaind-image", ref = "wormchaind-image",
context = ".", context = ".",
dockerfile = "./Dockerfile.wormchain", dockerfile = "./wormchain/Dockerfile",
only = [], only = [],
ignore = ["./wormchain/testing", "./wormchain/ts-sdk", "./wormchain/design", "./wormchain/vue", "./wormchain/build/wormchaind"], ignore = ["./wormchain/testing", "./wormchain/ts-sdk", "./wormchain/design", "./wormchain/vue", "./wormchain/build/wormchaind"],
) )

View File

@ -22,7 +22,7 @@ ifndef VALID_$(NETWORK)
endif endif
$(WASMS) artifacts/checksums.txt: $(SOURCE_FILES) $(WASMS) artifacts/checksums.txt: $(SOURCE_FILES)
DOCKER_BUILDKIT=1 docker build --target artifacts -o artifacts -f ../Dockerfile.cosmwasm ../ DOCKER_BUILDKIT=1 docker build --target artifacts -o artifacts -f ./Dockerfile ../
payer-$(NETWORK).json: payer-$(NETWORK).json:
$(error Missing private key in payer-$(NETWORK).json) $(error Missing private key in payer-$(NETWORK).json)

View File

@ -4,7 +4,7 @@
set -eo pipefail -o nounset set -eo pipefail -o nounset
ROOT="$(dirname "$(dirname "$(realpath "$0")")")" ROOT="$(dirname "$(dirname "$(realpath "$0")")")"
DOCKERFILE="$ROOT/Dockerfile.lint" DOCKERFILE="$ROOT/scripts/Dockerfile.lint"
VALID_COMMANDS=("lint" "format") VALID_COMMANDS=("lint" "format")