From ed550da880532dfb66df85c4410333bb9590667e Mon Sep 17 00:00:00 2001 From: Yilun Date: Thu, 8 Jan 2026 23:21:37 -0800 Subject: [PATCH] update docker build Signed-off-by: Yilun --- Makefile | 16 ++++++++-------- docker/Dockerfile | 5 ++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e239771be..239194707 100644 --- a/Makefile +++ b/Makefile @@ -101,17 +101,17 @@ test: .PHONY: docker docker: - docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=amd64 BUILD_DIR=. BIN_DIR=." --build-arg base="amd64/" -t nknorg/nkn:latest-amd64 . - docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm GOARM=6 BUILD_DIR=. BIN_DIR=." --build-arg base="arm32v6/" -t nknorg/nkn:latest-arm32v6 . - docker build -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm64 BUILD_DIR=. BIN_DIR=." --build-arg base="arm64v8/" -t nknorg/nkn:latest-arm64v8 . + docker build --platform linux/amd64 -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=amd64 BUILD_DIR=. BIN_DIR=." -t nknorg/nkn:latest-amd64 . + docker build --platform linux/arm/v6 -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm GOARM=6 BUILD_DIR=. BIN_DIR=." -t nknorg/nkn:latest-arm32v6 . + docker build --platform linux/arm64 -f docker/Dockerfile --build-arg build_args="build GOOS=linux GOARCH=arm64 BUILD_DIR=. BIN_DIR=." -t nknorg/nkn:latest-arm64v8 . .PHONY: docker_publish docker_publish: docker push nknorg/nkn:latest-amd64 docker push nknorg/nkn:latest-arm32v6 docker push nknorg/nkn:latest-arm64v8 - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create nknorg/nkn:latest nknorg/nkn:latest-amd64 nknorg/nkn:latest-arm32v6 nknorg/nkn:latest-arm64v8 --amend - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-amd64 --os linux --arch amd64 - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm32v6 --os linux --arch arm - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm64v8 --os linux --arch arm64 - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push -p nknorg/nkn:latest + docker manifest create nknorg/nkn:latest nknorg/nkn:latest-amd64 nknorg/nkn:latest-arm32v6 nknorg/nkn:latest-arm64v8 --amend + docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-amd64 --os linux --arch amd64 + docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm32v6 --os linux --arch arm --variant v6 + docker manifest annotate nknorg/nkn:latest nknorg/nkn:latest-arm64v8 --os linux --arch arm64 --variant v8 + docker manifest push nknorg/nkn:latest diff --git a/docker/Dockerfile b/docker/Dockerfile index ba9cf355e..c94abeeaf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,12 +1,11 @@ -ARG base -FROM golang:1.19-alpine as builder +FROM golang:1.23-alpine AS builder RUN apk add make git curl ADD . /nkn WORKDIR /nkn ARG build_args RUN make $build_args -FROM ${base}alpine:latest +FROM alpine:latest RUN apk --no-cache add ca-certificates COPY --from=builder /nkn/nknd /nkn/ COPY --from=builder /nkn/nknc /nkn/