update dockerfile

Dockerfile

@@ -1,42 +1,28 @@
-FROM python:3.9-slim
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.5.3
 
-# Exposing ports
-EXPOSE 6900
-
-# Environment variables
-ENV ARGILLA_LOCAL_AUTH_USERS_DB_FILE=/packages/users.yml
+# Environment variable
 ENV UVICORN_PORT=6900
+ENV xpack.security.enabled=false
+ENV cluster.routing.allocation.disk.threshold_enabled=false
+ENV discovery.type=single-node
+ENV ES_JAVA_OPTS=-'Xms512m -Xmx512m'
 
-# Copying argilla distribution files
-COPY *.whl /packages/
-
-# Copy users db file along with execution script
-COPY start.sh /
-COPY load_data.py /
-COPY users.yml /packages/
+USER root
 
 # Install packages
 RUN apt update
-RUN apt -y install python3.9-dev gcc gnupg apache2-utils systemctl curl sudo vim
+RUN apt -y install curl python3.9 python3.9-dev python3.9-distutils gcc gnupg apache2-utils sudo openssl systemctl
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+RUN python3.9 get-pip.py
+RUN pip3 install datasets
 
-# Create new user for starting elasticsearch
-RUN useradd -ms /bin/bash user -p "$(openssl passwd -1 ubuntu)"
-RUN echo 'user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 
-# Install argilla
-RUN chmod +x /start.sh \
-    && for wheel in /packages/*.whl; do pip3 install "$wheel"[server]; done
+COPY start.sh /
+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/8.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-8.x.list
-RUN apt update
-RUN apt -y install elasticsearch=8.5.3
+COPY dist/*.whl /packages/
 
-# 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
+# Install argilla
+RUN for wheel in /packages/*.whl; do pip install "$wheel"[server]; done
 
-# Executing argilla along with elasticsearch
-CMD /bin/bash /start.sh
+CMD ["/start.sh"]

start.sh

@@ -2,33 +2,12 @@
 
 set -e
 
-# Changing user
-sudo -S su user
+# Start Elasticsearch
+echo "Starting Elasticsearch"
+elasticsearch &
 
-# Create elasticsearch directory and change ownerships
-sudo mkdir -p /var/run/elasticsearch
-sudo chown -R elasticsearch:elasticsearch /var/run/elasticsearch
-sudo chown -R user:user /load_data.py
+echo "Waiting for elasticsearch to start"
+sleep 15
 
-# Start elasticsearch
-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,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
-python3.9 /load_data.py "$API_KEY" &
-
-# Start argilla
+# Start Argilla
 uvicorn argilla:app --host "0.0.0.0"