diff --git a/docker/docker-compose-arm64v8.yml b/docker/docker-compose-arm64v8.yml index 457fe45..bd8d28a 100644 --- a/docker/docker-compose-arm64v8.yml +++ b/docker/docker-compose-arm64v8.yml @@ -1,10 +1,5 @@ version: '2' services: - face_detector: - image: shareai/face_detector:arm64v8_latest - build: - context: ./face_detection - dockerfile: Dockerfile.arm64v8 redis: image: shareai/redis:arm64v8_latest build: @@ -15,23 +10,28 @@ services: build: dockerfile: Dockerfile.arm64v8 context: ./broker - camera: - image: shareai/shinobi:arm64v8_latest - build: - context: ./camera - dockerfile: Dockerfile.arm64v8 flower: image: shareai/flower:arm64v8_latest build: context: ./flower dockerfile: Dockerfile.arm64v8 - embedding: - image: shareai/embedding:arm64v8_latest - build: - context: ./embedding - dockerfile: Dockerfile.arm64v8 minio: image: shareai/minio:arm64v8_latest build: context: ./minio dockerfile: Dockerfile.arm64v8 + camera: + image: shareai/shinobi:arm64v8_latest + build: + context: ../src/camera + dockerfile: Dockerfile.arm64v8 + face_detector: + image: shareai/face_detector:arm64v8_latest + build: + context: ../src/face_detection + dockerfile: Dockerfile.arm64v8 + embedding: + image: shareai/embedding:arm64v8_latest + build: + context: ../src/embedding + dockerfile: Dockerfile.arm64v8 diff --git a/docker/docker-compose-nano-r32.6.1.yml b/docker/docker-compose-nano-r32.6.1.yml index 0932d19..94d9d4b 100644 --- a/docker/docker-compose-nano-r32.6.1.yml +++ b/docker/docker-compose-nano-r32.6.1.yml @@ -3,7 +3,7 @@ services: redis: image: shareai/redis:arm64v8_latest build: - context: ./redis + context: ./redis../src/ dockerfile: Dockerfile.arm64v8 broker: image: shareai/broker:arm64v8_latest @@ -15,23 +15,23 @@ services: build: context: ./minio dockerfile: Dockerfile.arm64v8 + flower: + image: shareai/flower:nano_r32.6.1 + build: + context: ./flower + dockerfile: Dockerfile.nano_r32.6.1 embedding: image: shareai/embedding:nano_r32.6.1 build: - context: ../../src/embedding + context: ../src/embedding dockerfile: Dockerfile.nano_r32.6.1 face_detector: image: shareai/face_detector:nano_r32.6.1 build: - context: ../../src/face_detection + context: ../src/face_detection dockerfile: Dockerfile.nano_r32.6.1 camera: image: shareai/nvr:nano_r32.6.1 build: - context: ../../src/camera - dockerfile: Dockerfile.nano_r32.6.1 - flower: - image: shareai/flower:nano_r32.6.1 - build: - context: ./flower + context: ../src/camera dockerfile: Dockerfile.nano_r32.6.1 diff --git a/docker/docker-compose-x86.yml b/docker/docker-compose-x86.yml index 0aaa03c..b72e2b0 100644 --- a/docker/docker-compose-x86.yml +++ b/docker/docker-compose-x86.yml @@ -1,15 +1,15 @@ version: '2' services: - face_detector: - image: shareai/face_detector:x86 - build: - context: ../../src/face_detection - dockerfile: Dockerfile.x86 redis: image: shareai/redis:x86 build: context: ./redis dockerfile: Dockerfile.x86 + flower: + image: shareai/flower:x86 + build: + context: ./flower + dockerfile: Dockerfile.x86 broker: image: shareai/broker:x86 build: @@ -18,15 +18,15 @@ services: camera: image: shareai/nvr:x86 build: - context: ../../src/camera + context: ../src/camera dockerfile: Dockerfile.x86 - flower: - image: shareai/flower:x86 + face_detector: + image: shareai/face_detector:x86 build: - context: ./flower + context: ../src/face_detection dockerfile: Dockerfile.x86 embedding: image: shareai/embedding:x86 build: - context: ../../src/embedding + context: ../src/embedding dockerfile: Dockerfile.x86 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8192064..2d3aff0 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,10 +1,5 @@ version: '2' services: - face_detector: - image: shareai/face_detector:arm32v7 - build: - context: ./face_detection - dockerfile: Dockerfile redis: image: shareai/redis:arm32v7 build: @@ -15,18 +10,23 @@ services: build: dockerfile: Dockerfile context: ./broker - camera: - image: shareai/shinobi:arm32v7 - build: - context: ./camera flower: image: shareai/flower:arm32v7 build: context: ./flower + camera: + image: shareai/shinobi:arm32v7 + build: + context: ../src/camera + face_detector: + image: shareai/face_detector:arm32v7 + build: + context: ../src/face_detection + dockerfile: Dockerfile embedding: image: shareai/embedding:v1.1_arm32v7 build: - context: ./embedding + context: ../src/embedding rtspserver: image: shareai/rtspserver:arm32v7 build: