diff --git a/.github/sync.yml b/.github/sync.yml index 413e5fcc7..22083c251 100644 --- a/.github/sync.yml +++ b/.github/sync.yml @@ -75,6 +75,17 @@ OpenIMSDK/OpenKF: dest: .github/.codecov.yml replace: false +openim-sigs/openim-docker: + - source: ./config + dest: ./openim-server/config + replace: true + - source: ./docs + dest: ./openim-server/docs + replace: true + - source: ./scripts + dest: ./openim-server/scripts + replace: true + group: # first group:common to all warehouses # TODO: add the required warehouse here diff --git a/Dockerfile b/Dockerfile index c21c19577..c4db7d483 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,6 @@ FROM ghcr.io/openim-sigs/openim-bash-image:latest WORKDIR ${SERVER_WORKDIR} # Copy scripts and binary files to the production image -COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts -COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config COPY --from=builder ${OPENIM_SERVER_BINDIR} /openim/openim-server/_output/bin CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker-start-all.sh"] diff --git a/docker-compose.yaml b/docker-compose.yaml index feb107da0..4cbe5480f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -98,35 +98,35 @@ services: restart: always command: minio server /data --console-address ':9090' - # openim-server: - # # image: ghcr.io/openimsdk/openim-server:latest - # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest - # # image: openim/openim-server:latest - # # build: . - # container_name: openim-server - # # healthcheck: - # # test: ["CMD-SHELL", "./scripts/check-all.sh"] - # # interval: 30s - # # timeout: 10s - # # retries: 5 - # volumes: - # - ${DATA_DIR}/_output/openim/logs:/openim/openim-server/logs - # - ${DATA_DIR}/config:/openim/openim-server/config - # - ${DATA_DIR}/scripts:/openim/openim-server/scripts - # restart: always - # depends_on: - # - zookeeper - # - kafka - # - mysql - # - mongodb - # - redis - # - minio - # network_mode: "host" - # logging: - # driver: json-file - # options: - # max-size: "1g" - # max-file: "2" + openim-server: + # image: ghcr.io/openimsdk/openim-server:latest + image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest + # image: openim/openim-server:latest + # build: . + container_name: openim-server + # healthcheck: + # test: ["CMD-SHELL", "./scripts/check-all.sh"] + # interval: 30s + # timeout: 10s + # retries: 5 + volumes: + - ${DATA_DIR}/_output/openim/logs:/openim/openim-server/logs + - ${DATA_DIR}/config:/openim/openim-server/config + - ${DATA_DIR}/scripts:/openim/openim-server/scripts + restart: always + depends_on: + - zookeeper + - kafka + - mysql + - mongodb + - redis + - minio + network_mode: "host" + logging: + driver: json-file + options: + max-size: "1g" + max-file: "2" openim-chat: # image: ghcr.io/openimsdk/openim-chat:latest