Arm architecture revision (#8)

* ARM architecture docker file revision * ARM architecture docker file revision --------- Co-authored-by: liuboyin.lby <[email protected]>
modelscope · Oct 21, 2024 · c33bf27 · c33bf27
1 parent 40acb1f
commit c33bf27
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/DockerfileArm b/DockerfileArm
@@ -14,7 +14,7 @@
 #    sudo docker run -it --rm --memory=4G --net=host memoryscope
 # To run docker image with arguments (refer to memoryscope/core/config/arguments.py): 
 #    sudo docker run -it --rm --memory=4G --net=host -e "OPENAI_API_KEY=sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -e "language=en" -e "human_name=superman" -e "generation_backend=openai_generation" -e "generation_model=gpt-4o" -e "embedding_backend=openai_embedding" -e "embedding_model=text-embedding-3-small" -e "enable_ranker=False" memoryscope
-
+#docker run -it --rm ghcr.io/modelscope/memoryscope_arm /bin/bash
 FROM python:3.11
 
 # (Not necessary) Change pip source
@@ -28,7 +28,8 @@ USER elastic_search_user
 WORKDIR /home/elastic_search_user/elastic_search
 RUN wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.15.2-linux-aarch64.tar.gz
 RUN tar -xzf elasticsearch-8.15.2-linux-aarch64.tar.gz
-WORKDIR /home/elastic_search_user/elastic_search/elasticsearch-8.15.2
+RUN mv /home/elastic_search_user/elastic_search/elasticsearch-8.15.2 /home/elastic_search_user/elastic_search/elasticsearch-8.15.0
+WORKDIR /home/elastic_search_user/elastic_search/elasticsearch-8.15.0
 ENV DISCOVERY_TYPE=single-node \
     XPACK_SECURITY_ENABLED=false \
     XPACK_LICENSE_SELF_GENERATED_TYPE=trial
@@ -51,4 +52,5 @@ RUN pip3 install -r requirements.txt
 
 # Launch!
 # CMD ["bash"]
-CMD ["bash", "examples/docker/entrypoint.sh"]
+CMD ["bash", "examples/docker/entrypoint.sh"]
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,9 +1,10 @@
 services:
   memory_scope_main:
-    image: ghcr.io/modelscope/memoryscope:main
+    image: ghcr.io/modelscope/memoryscope_arm:main
+#    image: ghcr.io/modelscope/memoryscope_arm:main # For ARM architecture
     environment:
       DASHSCOPE_API_KEY: "sk-0000000000"
-      # OPENAI_API_KEY: "sk-0000000000"
+#      OPENAI_API_KEY: "sk-0000000000"
     volumes:
       - ./memoryscope/core/config:/memory_scope_project/memoryscope/memoryscope/core/config
     deploy: