diff --git a/Dockerfile b/Dockerfile index 6504f15ae..85fda7114 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,6 @@ WORKDIR ${SERVER_WORKDIR} # Copy scripts and binary files to the production image COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config -COPY --from=builder ${SERVER_WORKDIR}/_output/bin/platforms /openim/openim-server/_output/bin/platforms +COPY --from=builder $OPENIM_SERVER_BINDIR/platforms /openim/openim-server/_output/bin/platforms CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"] diff --git a/build/docker/openim-api/Dockerfile b/build/docker/openim-api/Dockerfile index 420a71557..2761852ce 100644 --- a/build/docker/openim-api/Dockerfile +++ b/build/docker/openim-api/Dockerfile @@ -39,11 +39,11 @@ FROM test:v1 WORKDIR /openim/openim-server -RUN mkdir -p /openim/openim-server/$(cat ~/os)/$(cat ~/arch)/bin -RUN mkdir -p /openim/openim-server/go/$(go env GOOS)/$(go env GOARCH)/bin COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms COPY --from=builder /openim/openim-server/config /openim/openim-server/config -EXPOSE ${10002} +ENV PORT 10002 -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-api --port 10002 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file +EXPOSE ${PORT} + +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-api --port ${PORT} -c ${SERVER_WORKDIR}/config"] \ No newline at end of file diff --git a/build/docker/openim-cmdutils/Dockerfile b/build/docker/openim-cmdutils/Dockerfile index eab064dc3..47c4cf7be 100644 --- a/build/docker/openim-cmdutils/Dockerfile +++ b/build/docker/openim-cmdutils/Dockerfile @@ -39,7 +39,7 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR /openim/openim-server -COPY --from=builder ${SERVER_WORKDIR}/_output/bin/platforms /openim/openim-server/_output/bin/platforms +COPY --from=builder $OPENIM_SERVER_BINDIR/platforms /openim/openim-server/_output/bin/platforms COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-cmdutils"] +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-cmdutils"] diff --git a/build/docker/openim-crontask/Dockerfile b/build/docker/openim-crontask/Dockerfile index 00c9a5244..b517c48ea 100644 --- a/build/docker/openim-crontask/Dockerfile +++ b/build/docker/openim-crontask/Dockerfile @@ -41,4 +41,4 @@ WORKDIR /openim/openim-server COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms COPY --from=builder /openim/openim-server/config /openim/openim-server/config -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-crontask"] +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-crontask"] diff --git a/build/docker/openim-msggateway/Dockerfile b/build/docker/openim-msggateway/Dockerfile index 1c353b9e5..de6762114 100644 --- a/build/docker/openim-msggateway/Dockerfile +++ b/build/docker/openim-msggateway/Dockerfile @@ -47,4 +47,4 @@ ENV ARCH ${ARCH} EXPOSE 10140 EXPOSE 10001 -CMD ${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-msggateway --port 10140 --ws_port 10001 \ No newline at end of file +CMD ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msggateway --port 10140 --ws_port 10001 \ No newline at end of file diff --git a/build/docker/openim-msgtransfer/Dockerfile b/build/docker/openim-msgtransfer/Dockerfile index 0db1377c1..1f22b5c95 100644 --- a/build/docker/openim-msgtransfer/Dockerfile +++ b/build/docker/openim-msgtransfer/Dockerfile @@ -44,4 +44,4 @@ WORKDIR /openim/openim-server COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms COPY --from=builder /openim/openim-server/config /openim/openim-server/config -CMD ${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-msgtransfer \ No newline at end of file +CMD ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-msgtransfer \ No newline at end of file diff --git a/build/docker/openim-push/Dockerfile b/build/docker/openim-push/Dockerfile index c1824b185..a5072bbb4 100644 --- a/build/docker/openim-push/Dockerfile +++ b/build/docker/openim-push/Dockerfile @@ -46,4 +46,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config EXPOSE 10170 -CMD ${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-push --port 10170 \ No newline at end of file +CMD ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-push --port 10170 \ No newline at end of file diff --git a/build/docker/openim-rpc-auth/Dockerfile b/build/docker/openim-rpc-auth/Dockerfile index 87c30e559..427483db3 100644 --- a/build/docker/openim-rpc-auth/Dockerfile +++ b/build/docker/openim-rpc-auth/Dockerfile @@ -49,4 +49,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config EXPOSE 10160 -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-auth --port 10160 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-auth --port 10160 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file diff --git a/build/docker/openim-rpc-conversation/Dockerfile b/build/docker/openim-rpc-conversation/Dockerfile index 2e6b76996..1764a69df 100644 --- a/build/docker/openim-rpc-conversation/Dockerfile +++ b/build/docker/openim-rpc-conversation/Dockerfile @@ -56,4 +56,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config EXPOSE 10230 EXPOSE 20230 -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-conversation --port 10230 --prometheus_port 20230 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-conversation --port 10230 --prometheus_port 20230 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file diff --git a/build/docker/openim-rpc-friend/Dockerfile b/build/docker/openim-rpc-friend/Dockerfile index 47e44b104..efc34c4e5 100644 --- a/build/docker/openim-rpc-friend/Dockerfile +++ b/build/docker/openim-rpc-friend/Dockerfile @@ -56,4 +56,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config EXPOSE 10120 EXPOSE 20120 -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-friend --port 10120 --prometheus_port 20120 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-friend --port 10120 --prometheus_port 20120 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file diff --git a/build/docker/openim-rpc-group/Dockerfile b/build/docker/openim-rpc-group/Dockerfile index 70facaae2..55a3a800c 100644 --- a/build/docker/openim-rpc-group/Dockerfile +++ b/build/docker/openim-rpc-group/Dockerfile @@ -56,4 +56,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config EXPOSE 10150 EXPOSE 20150 -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-group --port 10150 --prometheus_port 20150 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-group --port 10150 --prometheus_port 20150 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file diff --git a/build/docker/openim-rpc-msg/Dockerfile b/build/docker/openim-rpc-msg/Dockerfile index 664d0cdce..0058450e6 100644 --- a/build/docker/openim-rpc-msg/Dockerfile +++ b/build/docker/openim-rpc-msg/Dockerfile @@ -56,4 +56,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config EXPOSE 10130 EXPOSE 20130 -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-msg --port 10130 --prometheus_port 20130 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-msg --port 10130 --prometheus_port 20130 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file diff --git a/build/docker/openim-rpc-third/Dockerfile b/build/docker/openim-rpc-third/Dockerfile index 20e9102eb..f1d5fcc8c 100644 --- a/build/docker/openim-rpc-third/Dockerfile +++ b/build/docker/openim-rpc-third/Dockerfile @@ -55,4 +55,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config EXPOSE 10200 -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-third --port 10200 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-third --port 10200 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file diff --git a/build/docker/openim-rpc-user/Dockerfile b/build/docker/openim-rpc-user/Dockerfile index 86e53b1b6..338bf1305 100644 --- a/build/docker/openim-rpc-user/Dockerfile +++ b/build/docker/openim-rpc-user/Dockerfile @@ -55,4 +55,4 @@ COPY --from=builder /openim/openim-server/config /openim/openim-server/config EXPOSE 10110 -CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-user --port 10110 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file +CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/openim-rpc-user --port 10110 -c ${SERVER_WORKDIR}/config"] \ No newline at end of file diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk index d0a9439ed..7dbfdf045 100644 --- a/scripts/make-rules/golang.mk +++ b/scripts/make-rules/golang.mk @@ -17,7 +17,7 @@ # GO := go -GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20 +GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20|1.21 GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \ -X $(VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) \ diff --git a/scripts/template/head.md.tmpl b/scripts/template/head.md.tmpl index d5cc58829..45414709b 100644 --- a/scripts/template/head.md.tmpl +++ b/scripts/template/head.md.tmpl @@ -1,12 +1,14 @@ -## Welcome to the {{ .Tag }} release {{ .Version }} of [OpenIM](https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }})!🎉🎉! +## Welcome to the {{ .Tag }} release of [OpenIM](https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }})!🎉🎉! -We are excited to release {{.Tag}}, Branch: {{ .Branch }}, Git hash[{{ .ShortCommit }}, Install Address: {{ .ReleaseURL }}, Learn more about versions of OpenIM: +We are excited to release {{.Tag}}, Branch: https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }}/tree/{{ .Tag }} , Git hash [{{ .ShortCommit }}], Install Address: [{{ .ReleaseURL }}]({{ .ReleaseURL }}) + +Learn more about versions of OpenIM: + We release logs are recorded on [✨CHANGELOG](https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }}/blob/main/CHANGELOG/CHANGELOG.md) + For information on versions of OpenIM and how to maintain branches, read [📚this article](https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }}/blob/main/docs/conversions/version.md) -+ If you wish to use mirroring, read OpenIM's [image management policy](https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }}/blob/main/docs/conversions/images.md) ++ If you wish to use mirroring, read OpenIM's [🤲image management policy](https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }}/blob/main/docs/conversions/images.md) **Want to be one of them 😘?**