Update build-docker-image.yml (#312)

* Update build-docker-image.yml

* fix: scripts config

Signed-off-by: Xinwei Xiong (cubxxw) <[email protected]>

* fix: copyright-add

Signed-off-by: Xinwei Xiong (cubxxw) <[email protected]>

* fix: docker compose

Signed-off-by: Xinwei Xiong (cubxxw) <[email protected]>

---------

Signed-off-by: Xinwei Xiong (cubxxw) <[email protected]>

.dockerignore

@@ -19,7 +19,6 @@ CHANGELOG/
 
 # Ignore deployment-related files
 docker-compose.yaml
-deployments/
 
 # Ignore assets
 assets/

.github/workflows/build-docker-image.yml

@@ -50,6 +50,7 @@ jobs:
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
+            type=semver,pattern=v{{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha
@@ -85,6 +86,15 @@ jobs:
         uses: docker/[email protected]
         with:
           images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-chat
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern=v{{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
 
       - name: Log in to AliYun Docker Hub
         uses: docker/login-action@v2
@@ -118,6 +128,15 @@ jobs:
         uses: docker/[email protected]
         with:
           images: ghcr.io/openimsdk/openim-chat
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern=v{{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v2

.github/workflows/scripts-test.yml

@@ -79,7 +79,7 @@ jobs:
         sleep 30;
     - name: start all services
       run: |
-        sudo cp ./config/config.yaml.template ./config/config.yaml
+        sudo cp ./deployments/templates/config.yaml ./config/config.yaml
         sudo make start
       shell: bash
 

Dockerfile

@@ -43,5 +43,6 @@ WORKDIR ${CHAT_WORKDIR}
 COPY --from=builder ${OPENIM_CHAT_BINDIR} /openim/openim-chat/_output/bin
 COPY --from=builder ${CHAT_WORKDIR}/config /openim/openim-chat/config
 COPY --from=builder ${CHAT_WORKDIR}/scripts /openim/openim-chat/scripts
+COPY --from=builder ${SERVER_WORKDIR}/deployments /openim/openim-server/deployments
 
 CMD ["/openim/openim-chat/scripts/docker_start_all.sh"]

Makefile

@@ -93,10 +93,6 @@ else
 	IMAGE_PLAT := $(PLATFORM)
 endif
 
-# Copy githook scripts when execute makefile
-# TODO! GIT_FILE_SIZE_LIMIT=42000000 git commit -m "This commit is allowed file sizes up to 42MB"
-COPY_GITHOOK:=$(shell cp -f scripts/githooks/* .git/hooks/; chmod +x .git/hooks/*)
-
 # Linux command settings
 FIND := find . ! -path './image/*' ! -path './vendor/*' ! -path './bin/*'
 XARGS := xargs -r
@@ -193,6 +189,18 @@ endif
 .PHONY: all
 all: copyright-verify tidy build start check #lint cover
 
+## init: Init openim-chat config
+.PHONY: init
+init:
+	@echo "===========> Init openim-chat config"
+	@$(ROOT_DIR)/scripts/init-config.sh
+
+## init-githooks: Initialize git hooks ✨
+.PHONY: init-githooks
+init-githooks:
+	@echo "===========> Initializing git hooks"
+	@${ROOT_DIR}/scripts/init-githooks.sh
+
 ## build: Build binaries by default.
 .PHONY: build
 build: go.build.verify $(addprefix go.build., $(addprefix $(PLATFORM)., $(BINS)))

README.md

@@ -48,7 +48,7 @@ sudo docker compose up -d
 **Setting configuration items:**
 
 ```bash
-cp ./config/config.yaml.template ./config/config.yaml
+make init
 ```
 
 > Then modify the configuration file `config/config.yaml` according to your needs

build/images/Dockerfile

@@ -1,3 +1,17 @@
+# Copyright © 2023 OpenIM open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM BASE_IMAGE
 
 WORKDIR ${SERVER_WORKDIR}

cmd/rpc/chat-rpc/main.go

@@ -1,3 +1,17 @@
+// Copyright © 2023 OpenIM open source community. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package main
 
 import (

config/Readme.md

@@ -0,0 +1,17 @@
+# Configuration file
+
+The configuration file is automatically generated through make init or scripts/init-config.sh.
+
+Add the configuration file to the policy that adds version management
+
+
+```bash
+make init
+```
+
+
+## Fix config/config.yaml
+
+```bash
+vim config/config.yaml
+```

deployment/helm-charts/Chart.yaml → deployments/helm-charts/Chart.yaml

@@ -1,3 +1,17 @@
+# Copyright © 2023 OpenIM open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v2
 name: admin-api
 description: A Helm chart for Kubernetes

deployment/helm-charts/charts/admin-rpc/Chart.yaml → deployments/helm-charts/charts/admin-rpc/Chart.yaml

@@ -1,3 +1,17 @@
+# Copyright © 2023 OpenIM open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v2
 name: admin-rpc
 description: A Helm chart for Kubernetes

deployment/helm-charts/charts/admin-rpc/templates/deployment.yaml → deployments/helm-charts/charts/admin-rpc/templates/deployment.yaml

@@ -1,3 +1,17 @@
+# Copyright © 2023 OpenIM open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:

deployment/helm-charts/charts/admin-rpc/templates/hpa.yaml → deployments/helm-charts/charts/admin-rpc/templates/hpa.yaml

@@ -1,3 +1,17 @@
+# Copyright © 2023 OpenIM open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 {{- if .Values.autoscaling.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler

deployment/helm-charts/charts/admin-rpc/templates/ingress.yaml → deployments/helm-charts/charts/admin-rpc/templates/ingress.yaml

@@ -1,3 +1,17 @@
+# Copyright © 2023 OpenIM open source community. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "admin-rpc.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}