Update Dockerfile

Dockerfile

@@ -1,20 +1,42 @@
+# Use a suitable base Docker image with necessary dependencies
 FROM circulartextapp/readspaceout
 
-# Set up a new user named "myappuser" with user ID 1000
-ARG USER_ID=1000
-RUN addgroup --system myappgroup && adduser --system --group myappuser --uid ${USER_ID}
-
 # Set the working directory to /app
 WORKDIR /app
 
 # Copy the current directory contents into the container at /app
-COPY . .
+COPY . /app
+
+# Define the user ID in the environment variable USER_ID with a default value
+ARG USER_ID=1000
+ENV USER_ID=$USER_ID
+
+# Check if the user already exists
+RUN if [ -z "$USER_ID" ]; then \
+      echo "User ID not provided. Using the default user ID 1000."; \
+      USER_ID=1000; \
+    fi && \
+    if id "$USER_ID" >/dev/null 2>&1; then \
+      echo "User with ID $USER_ID already exists."; \
+    else \
+      adduser --uid "$USER_ID" --disabled-password --gecos '' appuser; \
+    fi
+
+# Set appropriate permissions for the application directory
+RUN chown -R appuser:appuser /app && chmod -R 755 /app
+
+# Install gosu (adjust the package manager based on your base image)
+RUN apt-get update && apt-get install -y gosu && rm -rf /var/lib/apt/lists/*
+
+# Set the entrypoint script as executable
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
 
-# Set permissions for the app directory
-RUN chown -R myappuser:myappgroup /app && chmod -R 777 /app
+# Switch to the user for improved security
+USER appuser
 
-# Switch to the "myappuser" user
-USER myappuser
+# Define the entrypoint script to handle user creation and application startup
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 
-# Example CMD (modify as needed)
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7860", "--reload"] 
+# Default command to run if the user doesn't provide a command
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7860", "--reload"]