update dockerfile

.gitignore

@@ -0,0 +1 @@
+.idea

Dockerfile

@@ -29,9 +29,14 @@ RUN chmod +x /start.sh \
 
 # Install Elasticsearch
 RUN curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
-RUN echo "deb https://artifacts.elastic.co/packages/7.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-7.x.list
+RUN echo "deb https://artifacts.elastic.co/packages/8.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-8.x.list
 RUN apt update
-RUN apt -y install elasticsearch
+RUN apt -y install elasticsearch=8.5.3
+
+# Disable security in elasticsearch configuration
+RUN sudo sed -i "s/xpack.security.enabled: true/xpack.security.enabled: false/g" /etc/elasticsearch/elasticsearch.yml
+RUN sudo sed -i "s/cluster.initial_master_nodes/#cluster.initial_master_nodes/g" /etc/elasticsearch/elasticsearch.yml
+RUN sudo sed -i '$ a\cluster.routing.allocation.disk.threshold_enabled: false' /etc/elasticsearch/elasticsearch.yml
 
 # Executing argilla along with elasticsearch
 CMD /bin/bash /start.sh

load_data.py

@@ -12,7 +12,7 @@ def load_datasets():
     # This is the code that you want to execute when the endpoint is available
     print("Argilla is available! Loading datasets")
     api_key = sys.argv[-1]
-    rg.init(api_key=api_key, workspace="admin")
+    rg.init(api_key=api_key, workspace="team")
 
     # load dataset from json
     my_dataframe = pd.read_json(

start.sh

@@ -5,11 +5,6 @@ set -e
 # Changing user
 sudo -S su user
 
-# Disable security in elasticsearch configuration
-sudo sed -i "s/xpack.security.enabled: true/xpack.security.enabled: false/g" /etc/elasticsearch/elasticsearch.yml
-sudo sed -i "s/cluster.initial_master_nodes/#cluster.initial_master_nodes/g" /etc/elasticsearch/elasticsearch.yml
-echo "cluster.routing.allocation.disk.threshold_enabled: false" | sudo tee -a /etc/elasticsearch/elasticsearch.yml
-
 # Create elasticsearch directory and change ownerships
 sudo mkdir -p /var/run/elasticsearch
 sudo chown -R elasticsearch:elasticsearch /var/run/elasticsearch
@@ -20,10 +15,16 @@ sudo systemctl daemon-reload
 sudo systemctl enable elasticsearch.service
 sudo systemctl start elasticsearch.service
 
+# Generate hashed passwords
+team_password=$(htpasswd -nbB "" "$TEAM_PASSWORD" | cut -d ":" -f 2 | tr -d "\n")
+argilla_password=$(htpasswd -nbB "" "$ARGILLA_PASSWORD" | cut -d ":" -f 2 | tr -d "\n")
+
+
 # Update API_KEY and PASSWORD from users.yml
-sudo sed -i 's,API_KEY,'"$API_KEY"',g' /packages/users.yml
-sudo sed -i 's,ADMIN_PASSWORD,'"$ADMIN_PASSWORD"',g' /packages/users.yml
-sudo sed -i 's,ARGILLA_PASSWORD,'"$ARGILLA_PASSWORD"',g' /packages/users.yml
+sudo sed -i 's,TEAM_API_KEY,'"$TEAM_API_KEY"',g' /packages/users.yml
+sudo sed -i 's,ARGILLA_API_KEY,'"$ARGILLA_API_KEY"',g' /packages/users.yml
+sudo sed -i 's,TEAM_PASSWORD,'"$team_password"',g' /packages/users.yml
+sudo sed -i 's,ARGILLA_PASSWORD,'"$argilla_password"',g' /packages/users.yml
 
 # Load data
 pip3 install datasets