update dockerfile and users.yml

Dockerfile

@@ -1,38 +1,31 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+FROM ubuntu:20.04
 
-# Install Python
-RUN cd /etc/yum.repos.d/
-RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
-RUN yum install -y python39 python39-pip wget
-
-# Copy setup files
-COPY ./requirements.txt requirements.txt
-COPY ./start.sh start.sh
-RUN chown elasticsearch:elasticsearch requirements.txt
-RUN chown elasticsearch:elasticsearch start.sh
-
-# Change the user to the default user for the elasticsearch image
-USER elasticsearch
+# Exposing ports
+EXPOSE 6900
 
-# API KEY and password
-RUN --mount=type=secret,id=API_KEY,mode=0444,required=false
-ARG API_KEY=$(cat /run/secrets/API_KEY)
+# Environment variables
+ENV USERS_DB=/users.yml
+ENV UVICORN_PORT=6900
 
-RUN --mount=type=secret,id=PASSWORD,mode=0444,required=false
-ARG PASSWORD=$(cat /run/secrets/PASSWORD)
+# Install Python
+RUN apt update
+RUN apt -y install curl python3.9 python3.9-dev python3.9-distutils gcc gnupg
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+RUN python3.9 get-pip.py
 
-# Install Python deps
-RUN pip3 install -U -r requirements.txt
+# Install argilla
+RUN pip install argilla[server]
 
-RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.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 apt update
+RUN apt -y install elasticsearch
 
-# Make scripts executable
-RUN chmod +x wait-for-it.sh
-RUN chmod +x start.sh
+# Copy users db file along with execution script
+COPY users.yml /
+COPY start.sh /
+RUN chmod +x /start.sh
 
-# Expose the application's port
-EXPOSE 6900
+CMD /bin/bash /start.sh
 
-# Set the command to run the shell script
-CMD ["./start.sh"]

start.sh

@@ -1,16 +0,0 @@
-
-ES_JAVA_OPTS=-'Xms512m -Xmx512m' elasticsearch -E node.name=elasticsearch -E cluster.name=es-local -E discovery.type=single-node -E cluster.routing.allocation.disk.threshold_enabled=false &
-./wait-for-it.sh -t 30 localhost:9200
-if [ -z "$API_KEY" ] && [ -z "$PASSWORD" ]; then
-  python3 -m argilla
-elif [ -z "$API_KEY" ] && [ -n "$PASSWORD" ]; then
-  export ARGILLA_LOCAL_AUTH_DEFAULT_PASSWORD=$PASSWORD
-  python3 -m argilla
-elif [ -n "$API_KEY" ] && [ -z "$PASSWORD" ]; then
-  export ARGILLA_LOCAL_AUTH_DEFAULT_APIKEY=$API_KEY
-  python3 -m argilla
-else
-  export ARGILLA_LOCAL_AUTH_DEFAULT_APIKEY=$API_KEY
-  export ARGILLA_LOCAL_AUTH_DEFAULT_PASSWORD=$PASSWORD
-  python3 -m argilla
-fi

users.yml

@@ -0,0 +1,9 @@
+- username: argilla
+  hashed_password: $2b$12$vyJHxSgZ1MDeXvqOEVln.OjWiSY9x/wiAx8j9nP2VH0m9cOoyUq.a
+  api_key: "argilla.apikey"
+  workspaces: ["huggingface"]
+- username: admin
+  hashed_password: $2b$12$vyJHxSgZ1MDeXvqOEVln.OjWiSY9x/wiAx8j9nP2VH0m9cOoyUq.a
+  api_key: "admin.apikey"
+  workspaces: []
+