change environments

Author: solderzzc

docker/aws.env

@@ -1,7 +1,7 @@
-AWS_END_POINT=minio
+AWS_END_POINT=dp.sharpai.org
 AWS_PORT=9000
 AWS_USE_SSL=false
 AWS_ACCESS_KEY=QUA2IU17RHOKE6NUZ7T2
 AWS_SECRET_KEY=MQniMc5K3lsRbv9OPaUbJN9ft2eTQJ1rh4Yx6C17
 AWS_BUCKET=faces
-AWS_READABLE_PREFIX=http://minio:9000/faces/
+AWS_READABLE_PREFIX=http://dp.sharpai.org:9000/faces/

docker/docker-compose-x86.yml

@@ -35,7 +35,7 @@ services:
   camera:
     container_name: "camera"
     command: sh -c "if [ ! -f /opt/nvr/conf/conf.sqlite ]; then cp /opt/nvr/sql/shinobi.sample.sqlite /opt/nvr/conf/conf.sqlite -a ; fi && sleep 3 &&  (node /opt/nvr/cron.js &) && node /opt/nvr/camera.js"
-    image: shareai/shinobi:x86
+    image: shareai/nvr:x86
     restart: always
     privileged: true
     environment:
@@ -58,7 +58,6 @@ services:
       - ./workaipython/sql:/opt/nvr/conf
       - ./dev/shm/streams:/dev/shm/streams
       - ./opt/nvr/detector/images:/opt/nvr/detector/images
-      - ../src/shinobi/2018.03.15.14.50_patchs/camera.js:/opt/nvr/camera.js
   flower:
     command: sh -c "flower --port=5555"
     image: shareai/flower:x86
@@ -103,7 +102,7 @@ services:
         aliases:
           - facd_detector
   embedding:
-    command: sh -c "cd /data/runtime/src/ && ls /data/runtime -l &&  ls /data/runtime/src && ./start_embedding_only.sh"
+    command: sh -c "./start_embedding_only.sh"
     image: shareai/embedding:x86
     container_name: "embedding"
     env_file:
@@ -142,13 +141,13 @@ services:
       - "flower"
       - "redis"
       - "broker"
-    command: sh -c "export && cd /opt/nvr/detector && npm install && node /opt/nvr/detector/index.js"
+    command: sh -c "export && cd /opt/nvr/detector && node /opt/nvr/detector/index.js"
     logging:
       driver: json-file
       options:
         max-size: "10m"
         max-file: "10"
-    image: shareai/shinobi:x86
+    image: shareai/nvr:x86
     restart: always
     privileged: true
     env_file:
@@ -172,23 +171,5 @@ services:
       - ./opt/nvr/detector/images:/opt/nvr/detector/images
       - ./opt/nvr/detector/face_motion:/opt/nvr/detector/face_motion
       - ./opt/nvr/detector/face_cropped:/opt/nvr/detector/face_cropped
-      - ../src/detector/deepeye.js:/opt/nvr/detector/deepeye.js
-      - ../src/detector/index.js:/opt/nvr/detector/index.js
-      - ../src/detector/motion.js:/opt/nvr/detector/motion.js
-      #- ../src/detector/maintainer.js:/opt/nvr/detector/maintainer.js
-      - ../src/detector/workai-v2.js:/opt/nvr/detector/workai-v2.js
-      - ../src/detector/workai.js:/opt/nvr/detector/workai.js
-      - ../src/detector/upload_aws.js:/opt/nvr/detector/upload.js
-      - ../src/detector/makegif.js:/opt/nvr/detector/makegif.js
-      - ../src/detector/package.json:/opt/nvr/detector/package.json
-      - ../src/detector/conf.json:/opt/nvr/detector/conf.json
-      - ../src/detector/waitqueue.js:/opt/nvr/detector/waitqueue.js
-      - ../src/detector/timeline.js:/opt/nvr/detector/timeline.js
-      - ../src/detector/visit.js:/opt/nvr/detector/visit.js
-      - ../src/detector/face_motions.js:/opt/nvr/detector/face_motions.js
-      - ../src/detector/mqttgif.js:/opt/nvr/detector/mqttgif.js
-      - ../src/detector/realtime_message.js:/opt/nvr/detector/realtime_message.js
-      - ../src/detector/upload_listener.js:/opt/nvr/detector/upload_listener.js
-      - ../src/detector/config:/opt/nvr/detector/config
 networks:
   main:

docker/servers.env

@@ -1,5 +1,5 @@
-MQTT_BROKER_ADDRESS=mqttserver
+MQTT_BROKER_ADDRESS=dp.sharpai.org
 MQTT_BROKER_PORT=1883
 MQTT_BROKER_TRANSPORT=tcp
-API_SERVER_ADDRESS=apiserver
+API_SERVER_ADDRESS=dp.sharpai.org
 API_SERVER_PORT=3000