Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: docker build scripts #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenfengwang merged 3 commits into from
May 13, 2024
Merged

fix: docker build scripts #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3273eb0
fix
wenfengwang May 13, 2024
81efbda
fix
wenfengwang May 13, 2024
36006c1
fix
wenfengwang May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM npiai/base:3.10
FROM --platform=$BUILDPLATFORM npiai/base:3.10

LABEL maintainer="Wenfeng Wang <[email protected]>"

Expand Down
7 changes: 3 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ LD_FLAGS += -X 'main.BuildDate=${DATE}'
LD_FLAGS += -X 'main.Platform=${GOOS}/${GOARCH}'

GO_BUILD = GOOS=$(GOOS) GOARCH=$(GOARCH) go build -C ${NPI_CMD_ROOT}/cli -trimpath
DOCKER_PLATFORM ?= linux/arm/v8,linux/amd64
DOCKER_PLATFORM ?= linux/arm64,linux/amd64

build-npi:
$(GO_BUILD) -ldflags "${LD_FLAGS}" -o ${CMD_OUTPUT_DIR}/npi ${NPI_CMD_ROOT}/cli
Expand All @@ -28,11 +28,10 @@ release-npi-cli:
zip -j ${CMD_OUTPUT_DIR}/npi-${VERSION}-${GOOS}-${GOARCH}.zip ${CMD_OUTPUT_DIR}/npi

docker-build:
docker buildx build --platform linux/amd64 -t npiai/npi:${IMAGE_TAG} . --push
docker buildx build --platform ${DOCKER_PLATFORM} -t npiai/npi:${IMAGE_TAG} . --push

docker-build-base:
docker build --platform linux/amd64 -t npiai/base:3.10 -f build/base.Dockerfile build --push
docker push npiai/base:3.10
docker buildx build --platform ${DOCKER_PLATFORM} -t npiai/base:3.10 -f build/base.Dockerfile build --push

docker-build-local:
docker build -t npiai/npi:${IMAGE_TAG} .
Expand Down
2 changes: 1 addition & 1 deletion build/base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10
FROM --platform=$BUILDPLATFORM python:3.10

LABEL maintainer="Wenfeng Wang <[email protected]>"

Expand Down