From 7f5b95d9fbd1bcdc30add81760e7a6486beff856 Mon Sep 17 00:00:00 2001 From: Shanshan Date: Wed, 17 Apr 2024 14:51:30 +0800 Subject: [PATCH 1/2] fix: dockerfile support target platform args --- docker/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7fb2d0ba4..0470a6b4e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,8 +13,11 @@ # ORC_DB_NAME (default: orchestrator): database named used by orchestrator backend MySQL server # ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server # ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server +ARG GO_VERSION=1.16.6-alpine3.14 -FROM golang:1.16.6-alpine3.14 as build +FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} as build +ARG TARGETOS +ARG TARGETARCH ENV GOPATH=/tmp/go @@ -23,12 +26,12 @@ RUN apk --no-cache add libcurl rsync gcc g++ build-base bash git RUN mkdir -p $GOPATH/src/github.com/openark/orchestrator WORKDIR $GOPATH/src/github.com/openark/orchestrator COPY . . -RUN bash build.sh -b -P +RUN bash build.sh -b -P -a ${TARGETARCH} RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator -maxdepth 2)/ / RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator-client -maxdepth 2)/ / RUN cp conf/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json -FROM alpine:3.14 +FROM --platform=${BUILDPLATFORM} alpine:3.14 as dist RUN apk --no-cache add bash curl jq From 979f074864187034b3436fbb7d2e18d84c7d3a0d Mon Sep 17 00:00:00 2001 From: Shanshan Date: Fri, 19 Apr 2024 18:54:08 +0800 Subject: [PATCH 2/2] remove build platform --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0470a6b4e..6c3996653 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ # ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server ARG GO_VERSION=1.16.6-alpine3.14 -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} as build +FROM golang:${GO_VERSION} as build ARG TARGETOS ARG TARGETARCH @@ -31,7 +31,7 @@ RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator -maxde RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator-client -maxdepth 2)/ / RUN cp conf/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json -FROM --platform=${BUILDPLATFORM} alpine:3.14 as dist +FROM alpine:3.14 as dist RUN apk --no-cache add bash curl jq