circulartext commited on
Commit
e1842cd
1 Parent(s): 4f853e5

Update Dockerfile

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