diff --git a/p6/Dockerfile b/p6/Dockerfile index 9dc822f8cd4fa6981bd964821b03b3c64434ab12..d7ee285c49dc58e9b7b6bb8b5dd0ae98ebe92bfc 100644 --- a/p6/Dockerfile +++ b/p6/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update; apt-get install -y wget curl openjdk-17-jdk python3-pip ipro RUN pip3 install numpy==2.1.3 pyspark==3.4.1 cassandra-driver==3.28.0 grpcio==1.58.0 grpcio-tools==1.58.0 # Install packages in requirements.txt, you can add more packages you need to the requirements.txt file -COPY requirements.txt /requirements.txt +COPY /src/requirements.txt /requirements.txt RUN pip3 install -r /requirements.txt # SPARK diff --git a/p6/README.md b/p6/README.md index 4d88b5985a0a115f29d8404742edc8ba9ca434d6..2f0fa656bd0418e11a51aa545544ece66eb083cb 100644 --- a/p6/README.md +++ b/p6/README.md @@ -106,8 +106,7 @@ Note: In both container, you need to set the enviroment variable PROJECT to p6. ### Cassandra Schema Inside the `__init__` method, you firstly need to connect to the Cassandra cluster, with `Cluster(['p6-db-1', 'p6-db-2', 'p6-db-3'])`. You can review how to connect here: - -* **TODO - add the link** +https://git.doit.wisc.edu/cdis/cs/courses/cs544/s25/main/-/tree/main/lec/26-cassandra?ref_type=heads Write additional code using the session to run CQL queries to do the following: diff --git a/p6/cassandra.sh b/p6/cassandra.sh index 1f2e5650601140ccf43b8cdfed7544738637f326..6845086a9cb59c14177bad17a571226131eda4e3 100644 --- a/p6/cassandra.sh +++ b/p6/cassandra.sh @@ -1,6 +1,3 @@ -echo "-Xms128M" >> /apache-cassandra-5.0.0/conf/jvm-server.options -echo "-Xmx128M" >> /apache-cassandra-5.0.0/conf/jvm-server.options - # get the environment variable PROJECT=${PROJECT} diff --git a/p6/docker-compose.yml b/p6/docker-compose.yml index d9ca4512b8e983fdd8ab1b76c3e0adb83c0142d6..276a53fa1aca64830c292628fcf8dd76990ce09d 100644 --- a/p6/docker-compose.yml +++ b/p6/docker-compose.yml @@ -2,7 +2,7 @@ name: ${PROJECT} services: db: - image: ${PROJECT}-base + image: ${PROJECT} hostname: db volumes: - "./src:/src"