circulartext commited on
Commit
4e7e6c5
1 Parent(s): 8aefb58

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +27 -2
Dockerfile CHANGED
@@ -1,4 +1,4 @@
1
- # Use the spaceread base Docker image
2
  FROM circulartextapp/spaceread
3
 
4
  # Set the working directory to /app
@@ -7,6 +7,24 @@ WORKDIR /app
7
  # Copy the current directory contents into the container at /app
8
  COPY . /app
9
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
10
  # Install gosu (adjust the package manager based on your base image)
11
  RUN apt-get update && apt-get install -y gosu && rm -rf /var/lib/apt/lists/*
12
 
@@ -14,5 +32,12 @@ RUN apt-get update && apt-get install -y gosu && rm -rf /var/lib/apt/lists/*
14
  COPY entrypoint.sh /usr/local/bin/entrypoint.sh
15
  RUN chmod +x /usr/local/bin/entrypoint.sh
16
 
 
 
 
 
 
 
17
  # Default command to run if the user doesn't provide a command
18
- CMD ["/usr/local/bin/entrypoint.sh", "${USERNAME:-default_user}"]
 
 
1
+ # Use a suitable base Docker image with necessary dependencies
2
  FROM circulartextapp/spaceread
3
 
4
  # Set the working directory to /app
 
7
  # Copy the current directory contents into the container at /app
8
  COPY . /app
9
 
10
+ # Define the user ID in the environment variable USER_ID with a default value
11
+ ARG USER_ID=1000
12
+ ENV USER_ID=$USER_ID
13
+
14
+ # Check if the user already exists
15
+ RUN if [ -z "$USER_ID" ]; then \
16
+ echo "User ID not provided. Using the default user ID 1000."; \
17
+ USER_ID=1000; \
18
+ fi && \
19
+ if id "$USER_ID" >/dev/null 2>&1; then \
20
+ echo "User with ID $USER_ID already exists."; \
21
+ else \
22
+ useradd -m -u "$USER_ID" user; \
23
+ fi
24
+
25
+ # Set appropriate permissions for the application directory
26
+ RUN chown -R user:user /app && chmod -R 755 /app
27
+
28
  # Install gosu (adjust the package manager based on your base image)
29
  RUN apt-get update && apt-get install -y gosu && rm -rf /var/lib/apt/lists/*
30
 
 
32
  COPY entrypoint.sh /usr/local/bin/entrypoint.sh
33
  RUN chmod +x /usr/local/bin/entrypoint.sh
34
 
35
+ # Switch to the user for improved security
36
+ USER user
37
+
38
+ # Define the entrypoint script to handle user creation and application startup
39
+ ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
40
+
41
  # Default command to run if the user doesn't provide a command
42
+ CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7860", "--reload"]
43
+