From 4888bc2d171335778ca90c3ba7feef591e40d8c1 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Fri, 27 Oct 2023 05:00:02 +0800 Subject: [PATCH] feat: add openim deployment images Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- build/images/Dockerfile | 4 ++-- build/images/openim-api/Dockerfile | 8 ++++---- build/images/openim-cmdutils/Dockerfile | 8 ++++---- build/images/openim-crontask/Dockerfile | 8 ++++---- build/images/openim-msggateway/Dockerfile | 8 ++++---- build/images/openim-msgtransfer/Dockerfile | 8 ++++---- build/images/openim-push/Dockerfile | 8 ++++---- build/images/openim-rpc-auth/Dockerfile | 8 ++++---- build/images/openim-rpc-conversation/Dockerfile | 8 ++++---- build/images/openim-rpc-friend/Dockerfile | 8 ++++---- build/images/openim-rpc-group/Dockerfile | 8 ++++---- build/images/openim-rpc-msg/Dockerfile | 8 ++++---- build/images/openim-rpc-third/Dockerfile | 8 ++++---- build/images/openim-rpc-user/Dockerfile | 8 ++++---- build/images/openim-tools/component/Dockerfile | 4 ++-- build/images/openim-tools/openim-web/Dockerfile | 4 ++-- deployments/README.md | 1 + 17 files changed, 59 insertions(+), 58 deletions(-) diff --git a/build/images/Dockerfile b/build/images/Dockerfile index 518de78b1..ffa00eab8 100644 --- a/build/images/Dockerfile +++ b/build/images/Dockerfile @@ -5,6 +5,6 @@ WORKDIR ${SERVER_WORKDIR} # Set HTTP proxy ARG BINARY_NAME -COPY BINARY_NAME ./bin/BINARY_NAME +COPY BINARY_NAME ./BINARY_NAME -ENTRYPOINT ["./bin/BINARY_NAME"] \ No newline at end of file +ENTRYPOINT ["./BINARY_NAME"] \ No newline at end of file diff --git a/build/images/openim-api/Dockerfile b/build/images/openim-api/Dockerfile index 8c3d710f1..9ff279d1c 100644 --- a/build/images/openim-api/Dockerfile +++ b/build/images/openim-api/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-api ./bin/openim-api +COPY --from=builder /usr/bin/openim-api ./openim-api -ENTRYPOINT ["./bin/openim-api"] +ENTRYPOINT ["./openim-api"] diff --git a/build/images/openim-cmdutils/Dockerfile b/build/images/openim-cmdutils/Dockerfile index 413016f24..f0bf9e136 100644 --- a/build/images/openim-cmdutils/Dockerfile +++ b/build/images/openim-cmdutils/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -36,10 +36,10 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-cmdutils ./bin/openim-cmdutils +COPY --from=builder /usr/bin/openim-cmdutils ./openim-cmdutils -ENTRYPOINT ["./bin/openim-cmdutils"] +ENTRYPOINT ["./openim-cmdutils"] CMD ["--help"] diff --git a/build/images/openim-crontask/Dockerfile b/build/images/openim-crontask/Dockerfile index 35ba75784..9c8194f43 100644 --- a/build/images/openim-crontask/Dockerfile +++ b/build/images/openim-crontask/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-crontask ./bin/openim-crontask +COPY --from=builder /usr/bin/openim-crontask ./openim-crontask -ENTRYPOINT ["./bin/openim-crontask"] +ENTRYPOINT ["./openim-crontask"] diff --git a/build/images/openim-msggateway/Dockerfile b/build/images/openim-msggateway/Dockerfile index fe9db8f32..3d6350fe9 100644 --- a/build/images/openim-msggateway/Dockerfile +++ b/build/images/openim-msggateway/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-msggateway ./bin/openim-msggateway +COPY --from=builder /usr/bin/openim-msggateway ./openim-msggateway -ENTRYPOINT ["./bin/openim-msggateway"] +ENTRYPOINT ["./openim-msggateway"] diff --git a/build/images/openim-msgtransfer/Dockerfile b/build/images/openim-msgtransfer/Dockerfile index c04425f94..08588eed4 100644 --- a/build/images/openim-msgtransfer/Dockerfile +++ b/build/images/openim-msgtransfer/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-msgtransfer ./bin/openim-msgtransfer +COPY --from=builder /usr/bin/openim-msgtransfer ./openim-msgtransfer -ENTRYPOINT ["./bin/openim-msgtransfer"] +ENTRYPOINT ["./openim-msgtransfer"] diff --git a/build/images/openim-push/Dockerfile b/build/images/openim-push/Dockerfile index e51b7a44c..5770fe639 100644 --- a/build/images/openim-push/Dockerfile +++ b/build/images/openim-push/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-push ./bin/openim-push +COPY --from=builder /usr/bin/openim-push ./openim-push -ENTRYPOINT ["./bin/openim-push"] +ENTRYPOINT ["./openim-push"] diff --git a/build/images/openim-rpc-auth/Dockerfile b/build/images/openim-rpc-auth/Dockerfile index 8054935bd..fed0d3080 100644 --- a/build/images/openim-rpc-auth/Dockerfile +++ b/build/images/openim-rpc-auth/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-rpc-auth ./bin/openim-rpc-auth +COPY --from=builder /usr/bin/openim-rpc-auth ./openim-rpc-auth -ENTRYPOINT ["./bin/openim-rpc-auth"] +ENTRYPOINT ["./openim-rpc-auth"] diff --git a/build/images/openim-rpc-conversation/Dockerfile b/build/images/openim-rpc-conversation/Dockerfile index 0cfb681a2..e5bd4a491 100644 --- a/build/images/openim-rpc-conversation/Dockerfile +++ b/build/images/openim-rpc-conversation/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-rpc-conversation ./bin/openim-rpc-conversation +COPY --from=builder /usr/bin/openim-rpc-conversation ./openim-rpc-conversation -ENTRYPOINT ["./bin/openim-rpc-conversation"] +ENTRYPOINT ["./openim-rpc-conversation"] diff --git a/build/images/openim-rpc-friend/Dockerfile b/build/images/openim-rpc-friend/Dockerfile index 36870bc7e..c3a9e35f4 100644 --- a/build/images/openim-rpc-friend/Dockerfile +++ b/build/images/openim-rpc-friend/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-rpc-friend ./bin/openim-rpc-friend +COPY --from=builder /usr/bin/openim-rpc-friend ./openim-rpc-friend -ENTRYPOINT ["./bin/openim-rpc-friend"] +ENTRYPOINT ["./openim-rpc-friend"] diff --git a/build/images/openim-rpc-group/Dockerfile b/build/images/openim-rpc-group/Dockerfile index 85ba3b74d..d0db36c07 100644 --- a/build/images/openim-rpc-group/Dockerfile +++ b/build/images/openim-rpc-group/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-rpc-group ./bin/openim-rpc-group +COPY --from=builder /usr/bin/openim-rpc-group ./openim-rpc-group -ENTRYPOINT ["./bin/openim-rpc-group"] +ENTRYPOINT ["./openim-rpc-group"] diff --git a/build/images/openim-rpc-msg/Dockerfile b/build/images/openim-rpc-msg/Dockerfile index 7e1aaf50b..7b4c6156b 100644 --- a/build/images/openim-rpc-msg/Dockerfile +++ b/build/images/openim-rpc-msg/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-rpc-msg ./bin/openim-rpc-msg +COPY --from=builder /usr/bin/openim-rpc-msg ./openim-rpc-msg -ENTRYPOINT ["./bin/openim-rpc-msg"] +ENTRYPOINT ["./openim-rpc-msg"] diff --git a/build/images/openim-rpc-third/Dockerfile b/build/images/openim-rpc-third/Dockerfile index ab3e6c949..a62c8d800 100644 --- a/build/images/openim-rpc-third/Dockerfile +++ b/build/images/openim-rpc-third/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-rpc-third ./bin/openim-rpc-third +COPY --from=builder /usr/bin/openim-rpc-third ./openim-rpc-third -ENTRYPOINT ["./bin/openim-rpc-third"] +ENTRYPOINT ["./openim-rpc-third"] diff --git a/build/images/openim-rpc-user/Dockerfile b/build/images/openim-rpc-user/Dockerfile index cd0121b7d..6cc79a268 100644 --- a/build/images/openim-rpc-user/Dockerfile +++ b/build/images/openim-rpc-user/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -38,8 +38,8 @@ RUN cp /openim/openim-server/_output/bin/platforms/$(go env GOOS)/$(go env GOARC # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin -COPY --from=builder /usr/bin/openim-rpc-user ./bin/openim-rpc-user +COPY --from=builder /usr/bin/openim-rpc-user ./openim-rpc-user -ENTRYPOINT ["./bin/openim-rpc-user"] +ENTRYPOINT ["./openim-rpc-user"] diff --git a/build/images/openim-tools/component/Dockerfile b/build/images/openim-tools/component/Dockerfile index 1be6e776f..5b3447f5b 100644 --- a/build/images/openim-tools/component/Dockerfile +++ b/build/images/openim-tools/component/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -37,7 +37,7 @@ RUN make build BINS=component # FROM ghcr.io/openim-sigs/openim-bash-image:latest FROM ghcr.io/openim-sigs/openim-bash-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin COPY --from=builder /openim/openim-server/_output/bin/tools /openim/openim-server/_output/bin/tools/ COPY --from=builder /openim/openim-server/config /openim/openim-server/config diff --git a/build/images/openim-tools/openim-web/Dockerfile b/build/images/openim-tools/openim-web/Dockerfile index 77ca4cf49..b30fd88c5 100644 --- a/build/images/openim-tools/openim-web/Dockerfile +++ b/build/images/openim-tools/openim-web/Dockerfile @@ -21,7 +21,7 @@ FROM golang:1.20 AS builder ARG GO111MODULE=on ARG GOPROXY=https://goproxy.cn,direct -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin ENV GO111MODULE=$GO111MODULE ENV GOPROXY=$GOPROXY @@ -42,7 +42,7 @@ RUN make build BINS=openim-web FROM ghcr.io/openim-sigs/openim-ubuntu-image:latest -WORKDIR /openim/openim-server +WORKDIR /openim/openim-server/bin COPY --from=builder /openim/openim-server/_output/bin/tools /openim/openim-server/_output/bin/tools/ COPY --from=builder /openim/openim-server/dist /openim/openim-server/dist diff --git a/deployments/README.md b/deployments/README.md index 7859da455..9d5c80f87 100644 --- a/deployments/README.md +++ b/deployments/README.md @@ -130,6 +130,7 @@ GO111MODULE=on go get github.com/roboll/helmfile@latest **Install OpenIM:** ```bash +mkdir ./charts/generated-configs ../scripts/genconfig.sh ../scripts/install/environment.sh ./templates/openim.yaml > ./charts/generated-configs/config.yaml cp ../config/notification.yaml ./charts/generated-configs/notification.yaml ../scripts/genconfig.sh ../scripts/install/environment.sh ./templates/helm-image.yaml > ./charts/generated-configs/helm-image.yaml