diff --git a/Dockerfile b/Dockerfile index 5b2ea3c96..e98e5dcac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # build frontend -FROM node:19-alpine as frontend +FROM node:19-alpine AS frontend ARG API_HOST ARG USE_API_HOST=yes ARG EMBED_UI=yes @@ -12,19 +12,30 @@ RUN [ $EMBED_UI != yes ] || [ $USE_API_HOST != yes ] || echo "VITE_HOST='$API_HO RUN [ $EMBED_UI != yes ] || [ $USE_DIST != no ] || (yarn && yarn build) RUN [ $EMBED_UI = yes ] || mkdir dist || echo "" -# build backend -FROM bitbus/paopao-ce-backend-builder:latest AS backend +# build go mod cache +FROM bitbus/paopao-ce-backend-builder:latest AS gomodcache ARG API_HOST ARG USE_API_HOST=yes ARG EMBED_UI=yes ARG USE_DIST=no +ENV GOPROXY=https://goproxy.cn,direct +WORKDIR /paopao-ce +COPY go.mod . +COPY go.sum . +RUN go mod download +# build backend +FROM gomodcache AS backend +ARG API_HOST +ARG USE_API_HOST=yes +ARG EMBED_UI=yes +ARG USE_DIST=no WORKDIR /paopao-ce COPY . . COPY --from=frontend /web/dist ./web/dist ENV GOPROXY=https://goproxy.cn,direct -RUN --mount=type=cache,target=$GOPATH/go/pkg,id=paopao-ce-gopkg [ $EMBED_UI != yes ] || make buildx TAGS='go_json' -RUN --mount=type=cache,target=$GOPATH/go/pkg,id=paopao-ce-gopkg [ $EMBED_UI = yes ] || make buildx TAGS='slim embed go_json' +RUN [ $EMBED_UI != yes ] || make build TAGS='go_json' +RUN [ $EMBED_UI = yes ] || make build TAGS='slim embed go_json' FROM bitbus/paopao-ce-backend-runner:latest ARG API_HOST @@ -32,11 +43,9 @@ ARG USE_API_HOST=yes ARG EMBED_UI=yes ARG USE_DIST=no ENV TZ=Asia/Shanghai - WORKDIR /app/paopao-ce COPY --from=backend /paopao-ce/release/paopao . COPY --from=backend /paopao-ce/config.yaml.sample config.yaml - VOLUME ["/app/paopao-ce/custom"] EXPOSE 8008 HEALTHCHECK --interval=5s --timeout=3s --retries=3 CMD ps -ef | grep paopao || exit 1 diff --git a/docker-compose.yaml b/docker-compose.yaml index 0a42d705b..7135f52c1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -124,7 +124,7 @@ services: # - paopao-network backend: - image: bitbus/paopao-ce:${PAOPAOCE_TAG:-nightly} + image: bitbus/paopao-ce:${PAOPAOCE_TAG:-0.6-alpha} restart: always depends_on: - db diff --git a/pkg/version/version.go b/pkg/version/version.go index c10934f8e..dfb80cc7b 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -9,7 +9,7 @@ import ( ) const ( - series = "v0.6-dev" + series = "v0.6-alpha" ) var (