Skip to content

Commit 7c343a3

Browse files
committed
fix: docker release v3.1.1 images optimize
Signed-off-by: Xinwei Xiong(cubxxw-openim) <[email protected]>
1 parent 60800a5 commit 7c343a3

40 files changed

+47
-47
lines changed

docker-compose.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ services:
100100

101101

102102
openim_server:
103-
image: ghcr.io/openimsdk/openim-server:main
103+
image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.11 #ghcr.io/openimsdk/openim-server:main
104104
container_name: openim-server
105105
volumes:
106-
- ./logs:/openim/openim-server/logs
107-
- ./config:/openim/openim-server/config
108-
- ./scripts:/openim/openim-server/scripts
106+
- ./_output/openim/openim-server/logs:/openim/openim-server/logs
107+
- ./_output/openim/openim-server/config:/openim/openim-server/config
108+
- ./_output/openim/openim-server/scripts:/openim/openim-server/scripts
109109
restart: always
110110
depends_on:
111111
- zookeeper
@@ -121,9 +121,9 @@ services:
121121
max-size: "1g"
122122
max-file: "2"
123123

124-
openim_chat:
125-
image: ghcr.io/openimsdk/openim-chat:main
126-
container_name: openim_chat
124+
openim-chat:
125+
image: ghcr.io/openim-sigs/openim-chat:v1.0.0-debug.11 # ghcr.io/openimsdk/openim-chat:main
126+
container_name: openim-chat
127127
volumes:
128128
- ./_output/openim/openim-chat/logs:/openim/openim-chat/logs
129129
- ./_output/openim/openim-chat/config:/openim/openim-chat/config

install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

install_guide.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
echo "Welcome to the Open-IM-Server installation scripts."
44
echo "Please select an deploy option:"

scripts/advertise.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
set -e
44
set -o pipefail

scripts/batch_start_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/build_all_service.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/build_push_k8s_images.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/check_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/coverage.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/docker_check_service.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/docker_start_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/ensure_tag.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Copyright © 2023 OpenIM. All rights reserved.
44
#

scripts/enterprise/check_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/enterprise/function.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/env_check.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/function.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/githooks/commit-msg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIMSDK.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/githooks/pre-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIMSDK.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/githooks/pre-push

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIMSDK.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/init_pwd.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# Copyright © 2023 OpenIM. All rights reserved.
44
#

scripts/install_im_server.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/lib/color.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/lib/golang.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/lib/init.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/lib/logging.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/lib/release.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -455,7 +455,7 @@ EOF
455455
mkdir -p "${release_stage}/release"
456456
cp -R "${OPENIM_ROOT}/scripts/release" "${release_stage}/"
457457
cat <<EOF > "${release_stage}/release/get-openim-binaries.sh"
458-
#!/bin/bash
458+
#!/usr/bin/env bash
459459
460460
# Copyright 2020 Lingfei Kong <[email protected]>. All rights reserved.
461461
# Use of this source code is governed by a MIT style

scripts/lib/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/lib/version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/msg_gateway_start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/msg_transfer_start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/path_info.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/push_start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/start_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/start_cron.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/start_rpc_service.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/stop_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

scripts/style_info.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

test/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Copyright © 2023 OpenIM. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)