diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..123599d Binary files /dev/null and b/.DS_Store differ diff --git a/builder-docker/dh-sdk/Dockerfile b/builder-docker/dh-sdk/Dockerfile deleted file mode 100644 index ab89487..0000000 --- a/builder-docker/dh-sdk/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM harbor.sino-assist.com/marsal1212/java11:latest - -ADD dhsdk /dhsdk - -WORKDIR /dhsdk - -RUN echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/dhsdk:/dhsdk/lib'>>/etc/profile \ - && /bin/bash -c 'source /etc/profile' - -CMD ["java","--version"] - -# 打包之前先解压dhsdk.zip文件 -# docker build -f Dockerfile -t harbor.sino-assist.com/marsal1212/dhsdk-java11:latest . -# 是为了gps-pass中的大华sdk单独做的镜像 \ No newline at end of file diff --git a/builder-docker/dh-sdk/dhsdk.zip b/builder-docker/dh-sdk/dhsdk.zip deleted file mode 100644 index 821ea6d..0000000 Binary files a/builder-docker/dh-sdk/dhsdk.zip and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libDPSDK_Core.so b/builder-docker/dh-sdk/dhsdk/lib/libDPSDK_Core.so deleted file mode 100644 index 38ac52e..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libDPSDK_Core.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libEFSAdapter.so b/builder-docker/dh-sdk/dhsdk/lib/libEFSAdapter.so deleted file mode 100644 index 0b1ee57..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libEFSAdapter.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libEFSClient.so b/builder-docker/dh-sdk/dhsdk/lib/libEFSClient.so deleted file mode 100644 index 679792f..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libEFSClient.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libPicSdk.so b/builder-docker/dh-sdk/dhsdk/lib/libPicSdk.so deleted file mode 100644 index a499890..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libPicSdk.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libPlatformSDK.so b/builder-docker/dh-sdk/dhsdk/lib/libPlatformSDK.so deleted file mode 100644 index 7d90949..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libPlatformSDK.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libStreamConvertor.so b/builder-docker/dh-sdk/dhsdk/lib/libStreamConvertor.so deleted file mode 100644 index 8e1b354..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libStreamConvertor.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libaacdec.so b/builder-docker/dh-sdk/dhsdk/lib/libaacdec.so deleted file mode 100644 index b1a1465..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libaacdec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libamrdec.so b/builder-docker/dh-sdk/dhsdk/lib/libamrdec.so deleted file mode 100644 index 1a7855f..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libamrdec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libavcodec-55.so b/builder-docker/dh-sdk/dhsdk/lib/libavcodec-55.so deleted file mode 100644 index c8aa9e9..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libavcodec-55.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libavutil-52.so b/builder-docker/dh-sdk/dhsdk/lib/libavutil-52.so deleted file mode 100644 index 1e196cf..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libavutil-52.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libdhlog.so b/builder-docker/dh-sdk/dhsdk/lib/libdhlog.so deleted file mode 100644 index 073e0bf..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libdhlog.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libdhplay.so b/builder-docker/dh-sdk/dhsdk/lib/libdhplay.so deleted file mode 100644 index e0d03d9..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libdhplay.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libdsl.so b/builder-docker/dh-sdk/dhsdk/lib/libdsl.so deleted file mode 100644 index d95f4c2..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libdsl.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libdslalien.so b/builder-docker/dh-sdk/dhsdk/lib/libdslalien.so deleted file mode 100644 index 1cbe024..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libdslalien.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libh264dec.so b/builder-docker/dh-sdk/dhsdk/lib/libh264dec.so deleted file mode 100644 index a11725b..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libh264dec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libh26ldec.so b/builder-docker/dh-sdk/dhsdk/lib/libh26ldec.so deleted file mode 100644 index 5916bea..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libh26ldec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libhevcdec.so b/builder-docker/dh-sdk/dhsdk/lib/libhevcdec.so deleted file mode 100644 index a1cc22b..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libhevcdec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libmjpegdec.so b/builder-docker/dh-sdk/dhsdk/lib/libmjpegdec.so deleted file mode 100644 index 8faf612..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libmjpegdec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libmp2dec.so b/builder-docker/dh-sdk/dhsdk/lib/libmp2dec.so deleted file mode 100644 index 62d6082..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libmp2dec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libmp3dec.so b/builder-docker/dh-sdk/dhsdk/lib/libmp3dec.so deleted file mode 100644 index 62b2fb3..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libmp3dec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libmpeg4dec.so b/builder-docker/dh-sdk/dhsdk/lib/libmpeg4dec.so deleted file mode 100644 index c4383d9..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libmpeg4dec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/liboggdec.so b/builder-docker/dh-sdk/dhsdk/lib/liboggdec.so deleted file mode 100644 index ad0804c..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/liboggdec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libpostproc.so b/builder-docker/dh-sdk/dhsdk/lib/libpostproc.so deleted file mode 100644 index f1f0405..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libpostproc.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/lib/libsvac_dec.so b/builder-docker/dh-sdk/dhsdk/lib/libsvac_dec.so deleted file mode 100644 index 6fac591..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/lib/libsvac_dec.so and /dev/null differ diff --git a/builder-docker/dh-sdk/dhsdk/libDPSDK_Java.so b/builder-docker/dh-sdk/dhsdk/libDPSDK_Java.so deleted file mode 100644 index af4546d..0000000 Binary files a/builder-docker/dh-sdk/dhsdk/libDPSDK_Java.so and /dev/null differ diff --git a/builder-docker/java11/.DS_Store b/builder-docker/java11/.DS_Store new file mode 100644 index 0000000..952d4a2 Binary files /dev/null and b/builder-docker/java11/.DS_Store differ diff --git a/builder-docker/java11/skywalking-agent/optional-plugins/apm-kafka-commons-8.15.0.jar b/builder-docker/java11/skywalking-agent/plugins/apm-kafka-commons-8.15.0.jar similarity index 100% rename from builder-docker/java11/skywalking-agent/optional-plugins/apm-kafka-commons-8.15.0.jar rename to builder-docker/java11/skywalking-agent/plugins/apm-kafka-commons-8.15.0.jar diff --git a/builder-docker/java11/skywalking-agent/optional-plugins/apm-kafka-plugin-8.15.0.jar b/builder-docker/java11/skywalking-agent/plugins/apm-kafka-plugin-8.15.0.jar similarity index 100% rename from builder-docker/java11/skywalking-agent/optional-plugins/apm-kafka-plugin-8.15.0.jar rename to builder-docker/java11/skywalking-agent/plugins/apm-kafka-plugin-8.15.0.jar diff --git a/builder-docker/java11/skywalking-agent/optional-plugins/apm-mybatis-3.x-plugin-8.15.0.jar b/builder-docker/java11/skywalking-agent/plugins/apm-mybatis-3.x-plugin-8.15.0.jar similarity index 100% rename from builder-docker/java11/skywalking-agent/optional-plugins/apm-mybatis-3.x-plugin-8.15.0.jar rename to builder-docker/java11/skywalking-agent/plugins/apm-mybatis-3.x-plugin-8.15.0.jar diff --git a/builder-docker/java11/skywalking-agent/plugins/apm-spring-rabbitmq-5.x-plugin.jar b/builder-docker/java11/skywalking-agent/plugins/apm-spring-rabbitmq-5.x-plugin.jar new file mode 100644 index 0000000..d351062 Binary files /dev/null and b/builder-docker/java11/skywalking-agent/plugins/apm-spring-rabbitmq-5.x-plugin.jar differ diff --git a/docker-swarm/minio/README b/docker-swarm/minio/README new file mode 100644 index 0000000..04359c3 --- /dev/null +++ b/docker-swarm/minio/README @@ -0,0 +1,12 @@ + +# es index生命周期参考 https://developer.aliyun.com/article/793119,为索引配置索引模板即可,索引模板中添加ilm +# { +# "index": { +# "lifecycle": { +# "name": "90-days-default" +# } +# } +# } + + +env $(cat ./env_crm1 | xargs) envsubst < ./docker-compose.yml | docker stack deploy --compose-file - crm1_log --with-registry-auth \ No newline at end of file diff --git a/docker-swarm/minio/docker-compose.yml b/docker-swarm/minio/docker-compose.yml new file mode 100644 index 0000000..3698cc9 --- /dev/null +++ b/docker-swarm/minio/docker-compose.yml @@ -0,0 +1,35 @@ +version: '3.8' + +networks: + default: + name: ${NAMESPACE} + external: true +services: + minio: + image: docker.io/bitnami/minio:2023 + hostname: ${NAMESPACE}-minio + ports: + - '${NODE_PORT}:9000' + - '${NODE_PORT_1}:9001' + environment: + # 时区上海 + TZ: Asia/Shanghai + # 管理后台用户名 + MINIO_ROOT_USER: ${MINIO_ROOT_USER} + # 管理后台密码,最小8个字符 + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} + volumes: + - 'data:/data' + deploy: + update_config: + order: start-first + placement: + constraints: + - node.labels.${NAMESPACE}_minio==1 +volumes: + data: + driver: local + + + + diff --git a/docker-swarm/minio/env_crm1 b/docker-swarm/minio/env_crm1 new file mode 100644 index 0000000..962a3a2 --- /dev/null +++ b/docker-swarm/minio/env_crm1 @@ -0,0 +1,5 @@ +NAMESPACE=crm1 +NODE_PORT=9000 +NODE_PORT_1=9001 +MINIO_ROOT_USER=minioadmin +MINIO_ROOT_PASSWORD=gkxl###650 \ No newline at end of file diff --git a/docker-swarm/minio/env_review b/docker-swarm/minio/env_review new file mode 100644 index 0000000..0d12a7f --- /dev/null +++ b/docker-swarm/minio/env_review @@ -0,0 +1,5 @@ +NAMESPACE=review +NODE_PORT=9000 +NODE_PORT_1=9001 +MINIO_ROOT_USER=minioadmin +MINIO_ROOT_PASSWORD=gkxl###650 \ No newline at end of file