style: migrate image locations

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
This commit is contained in:
Xinwei Xiong(cubxxw-openim)
2023-07-04 20:18:39 +08:00
parent dae7849393
commit 02a24aebfe
13 changed files with 43 additions and 19 deletions
+1 -1
View File
@@ -141,6 +141,7 @@ go.test:
## go.test.junit-report: Run unit test
.PHONY: go.test.junit-report
go.test.junit-report: tools.verify.go-junit-report
@touch $(TMP_DIR)/coverage.out
@echo "===========> Run unit test > $(TMP_DIR)/report.xml"
# @$(GO) test -v -coverprofile=$(TMP_DIR)/coverage.out 2>&1 $(GO_BUILD_FLAGS) ./... | $(TOOLS_DIR)/go-junit-report -set-exit-code > $(TMP_DIR)/report.xml
@$(GO) test -v -coverprofile=$(TMP_DIR)/coverage.out 2>&1 ./... | $(TOOLS_DIR)/go-junit-report -set-exit-code > $(TMP_DIR)/report.xml
@@ -151,7 +152,6 @@ go.test.junit-report: tools.verify.go-junit-report
## go.test.cover: Run unit test with coverage
.PHONY: go.test.cover
go.test.cover: go.test.junit-report
@touch $(TMP_DIR)/coverage.out
@$(GO) tool cover -func=$(TMP_DIR)/coverage.out | \
awk -v target=$(COVERAGE) -f $(ROOT_DIR)/scripts/coverage.awk
+9 -2
View File
@@ -2,11 +2,18 @@
# Makefile helper functions for swagger
#
## swagger.run: Generate swagger document.
.PHONY: swagger.run
swagger.run: tools.verify.swagger
@echo "===========> Generating swagger API docs"
@swagger generate spec --scan-models -w $(ROOT_DIR)/cmd/genswaggertypedocs -o $(ROOT_DIR)/api/swagger/swagger.yaml
@$(TOOLS_DIR)/swagger generate spec --scan-models -w $(ROOT_DIR)/cmd/genswaggertypedocs -o $(ROOT_DIR)/api/swagger/swagger.yaml
## swagger.serve: Serve swagger spec and docs.
.PHONY: swagger.serve
swagger.serve: tools.verify.swagger
@swagger serve -F=redoc --no-open --port 36666 $(ROOT_DIR)/api/swagger/swagger.yaml
@$(TOOLS_DIR)/swagger serve -F=redoc --no-open --port 36666 $(ROOT_DIR)/api/swagger/swagger.yaml
## swagger.help: Display help information about the release package
.PHONY: swagger.help
swagger.help: scripts/make-rules/swagger.mk
$(call smallhelp)
+5
View File
@@ -101,6 +101,11 @@ install.go-gitlint:
install.go-junit-report:
@$(GO) install github.com/jstemmer/go-junit-report@latest
## install.gotests: Install gotests, used to generate go tests
.PHONY: install.swagger
install.swagger:
@$(GO) install github.com/go-swagger/go-swagger/cmd/swagger@latest
# ==============================================================================
# Tools that might be used include go gvm
#
+14 -13
View File
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#fixme This scripts is the total startup scripts
#fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array
#FIXME This script is the startup script for multiple servers.
#FIXME The full names of the shell scripts that need to be started are placed in the `need_to_start_server_shell` array.
#fixme Put the shell scripts name here
#FIXME Put the shell script names here
need_to_start_server_shell=(
start_rpc_service.sh
push_start.sh
@@ -25,20 +25,21 @@ need_to_start_server_shell=(
msg_gateway_start.sh
start_cron.sh
)
time=`date +"%Y-%m-%d %H:%M:%S"`
echo "==========================================================">>../logs/openIM.log 2>&1 &
echo "==========================================================">>../logs/openIM.log 2>&1 &
echo "==========================================================">>../logs/openIM.log 2>&1 &
echo "==========server start time:${time}===========">>../logs/openIM.log 2>&1 &
echo "==========================================================">>../logs/openIM.log 2>&1 &
echo "==========================================================">>../logs/openIM.log 2>&1 &
echo "==========================================================">>../logs/openIM.log 2>&1 &
echo "==========================================================" >> ../logs/openIM.log 2>&1 &
echo "==========================================================" >> ../logs/openIM.log 2>&1 &
echo "==========================================================" >> ../logs/openIM.log 2>&1 &
echo "==========server start time:${time}===========" >> ../logs/openIM.log 2>&1 &
echo "==========================================================" >> ../logs/openIM.log 2>&1 &
echo "==========================================================" >> ../logs/openIM.log 2>&1 &
echo "==========================================================" >> ../logs/openIM.log 2>&1 &
for i in ${need_to_start_server_shell[*]}; do
chmod +x $i
echo "=====================exec ${i}======================">>../logs/openIM.log
echo "=====================exec ${i}======================" >> ../logs/openIM.log
./$i
if [ $? -ne 0 ]; then
exit -1
if [ $? -ne 0 ]; then
exit -1
fi
done