Merge remote-tracking branch 'origin/JCOS' into JCOS

Former-commit-id: bcc9e442f8942c4e93add88a630858ba2446ae74
This commit is contained in:
zhangwei 2023-12-13 10:25:44 +08:00
commit 1a022a51a1
2 changed files with 22 additions and 8 deletions

View File

@ -1,15 +1,22 @@
FROM golang:1.20.2-alpine3.17 AS builder
WORKDIR /app
FROM golang:1.21.2-alpine3.18 AS builder
LABEL stage=gobuilder
ENV CGO_ENABLED 0
ENV GOARCH amd64
ENV GOPROXY https://goproxy.cn,direct
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \
apk update --no-cache && apk add --no-cache tzdata
WORKDIR /app
ADD go.mod .
ADD go.sum .
RUN go mod download
COPY . .
COPY api/etc/ /app/
RUN go mod download && go build -o pcm-coordinator-api /app/api/pcm.go
RUN go build -o pcm-coordinator-api /app/api/pcm.go
FROM alpine:3.16.2

View File

@ -1,15 +1,22 @@
FROM golang:1.20.2-alpine3.17 AS builder
WORKDIR /app
FROM golang:1.21.2-alpine3.18 AS builder
LABEL stage=gobuilder
ENV CGO_ENABLED 0
ENV GOARCH amd64
ENV GOPROXY https://goproxy.cn,direct
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \
apk update --no-cache && apk add --no-cache tzdata
WORKDIR /app
ADD go.mod .
ADD go.sum .
RUN go mod download
COPY . .
COPY rpc/etc/ /app/
RUN go mod download && go build -o pcm-coordinator-rpc /app/rpc/pcmcore.go
RUN go build -o pcm-coordinator-rpc /app/rpc/pcmcore.go
FROM alpine:3.16.2