Skip to content

Commit

Permalink
fix: fix Security vulnerability
Browse files Browse the repository at this point in the history
Signed-off-by: Xinwei Xiong (cubxxw) <[email protected]>
  • Loading branch information
cubxxw committed Dec 19, 2023
1 parent bfe776f commit 8d1b5e6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/openimci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ jobs:

- name: Run Docker Compose
run: |
make init
./scripts/init-config.sh --force
docker-compose up -d
docker-compose ps
docker-compose logs openim-server
docker-compose logs openim-chat
docker-compose down
test-example:
Expand All @@ -31,7 +33,7 @@ jobs:
- 'example/only-openim-server.yml'
- 'example/only-openim-web.yml'
- 'example/volume-all-server.yml'

steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand All @@ -41,7 +43,7 @@ jobs:

- name: Run Docker ${{ matrix.compose-file }} Compose
run: |
make init
./scripts/init-config.sh --force
docker-compose -f ${{ matrix.compose-file }} up -d
docker-compose -f ${{ matrix.compose-file }} ps
docker-compose -f ${{ matrix.compose-file }} down
8 changes: 6 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ services:
ipv4_address: ${OPENIM_SERVER_NETWORK_ADDRESS:-172.28.0.8}

openim-chat:
image: ${IMAGE_REGISTRY:-ghcr.io/openimsdk}/openim-chat:${CHAT_IMAGE_VERSION:-latest}
image: openim-chat:test
container_name: openim-chat
healthcheck:
test: ["CMD", "/openim/openim-chat/scripts/check_all.sh"]
Expand All @@ -175,12 +175,15 @@ services:
- ZOOKEEPER_PORT=${ZOOKEEPER_PORT:-12181}
- OPENIM_SERVER_ADDRESS=${DOCKER_BRIDGE_GATEWAY:-172.28.0.1}
- API_OPENIM_PORT=${API_OPENIM_PORT:-10002}
# - MYSQL_ADDRESS=${DOCKER_BRIDGE_GATEWAY:-172.28.0.1}
# - MYSQL_PORT=${MYSQL_PORT:-13306}
- REDIS_ADDRESS=${DOCKER_BRIDGE_GATEWAY:-172.28.0.1}
- REDIS_PORT=${REDIS_PORT:-16379}
ports:
- "${OPENIM_CHAT_API_PORT:-10008}:10008"
- "${OPENIM_ADMIN_API_PORT:-10009}:10009"
volumes:
- "./openim-chat/logs:/openim/openim-chat/logs"
- "./openim-chat/_output/logs:/openim/openim-chat/_output/logs"
- "./openim-chat/config:/openim/openim-chat/config"
restart: always
user: root:root
Expand All @@ -189,6 +192,7 @@ services:
- mongodb
- redis
- minio
- openim-server
logging:
driver: json-file
options:
Expand Down
2 changes: 2 additions & 0 deletions scripts/clean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ fi
pushd $OPENIM_ROOT
delete_dir "$DATA_DIR/components"
delete_dir "$DATA_DIR/openim-server/config"
delete_dir "$DATA_DIR/openim-server/logs"
delete_dir "$DATA_DIR/openim-chat/config"
delete_dir "$DATA_DIR/openim-chat/logs"
docker network prune -f
popd

0 comments on commit 8d1b5e6

Please sign in to comment.