Update Dockerfile

Dockerfile

@@ -7,10 +7,10 @@ ARG SERVICE_GID=1000
 
 ENV PYTHON_VERSION=3.10
 ENV POETRY_VENV=/app/.venv
-ENV HF_HOME="/app/.cache"
-ENV ASR_MODEL_PATH="/app/.cache"
 
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get -qq update && apt-get -qq install --no-install-recommends \
+RUN export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -qq update \
+    && apt-get -qq install --no-install-recommends \
     python${PYTHON_VERSION} \
     python${PYTHON_VERSION}-venv \
     python3-pip \
@@ -27,27 +27,26 @@ RUN ln -s -f /usr/bin/python${PYTHON_VERSION} /usr/bin/python3 && \
     ln -s -f /usr/bin/python${PYTHON_VERSION} /usr/bin/python && \
     ln -s -f /usr/bin/pip3 /usr/bin/pip
 
-RUN groupadd -g $SERVICE_GID $SERVICE_USER && \
-    useradd -m -u $SERVICE_UID -g $SERVICE_GID -s /bin/bash $SERVICE_USER
+RUN groupadd -g $SERVICE_GID $SERVICE_USER || true
+RUN useradd -u $SERVICE_UID -g $SERVICE_GID -d /app -s /usr/sbin/nologin $SERVICE_USER || true
 
-USER $SERVICE_USER
-WORKDIR /home/$SERVICE_USER
-
-RUN mkdir -p /app/.cache && chmod -R 777 /app
+COPY --chown=$SERVICE_UID:$SERVICE_GID . /app
+COPY --chown=$SERVICE_UID:$SERVICE_GID --from=swagger-ui /usr/share/nginx/html/swagger-ui.css /app/swagger-ui-assets/swagger-ui.css
+COPY --chown=$SERVICE_UID:$SERVICE_GID --from=swagger-ui /usr/share/nginx/html/swagger-ui-bundle.js /app/swagger-ui-assets/swagger-ui-bundle.js
 
-ENV HF_HOME="/app/.cache"
-ENV ASR_MODEL_PATH="/app/.cache"
-ENV PATH="${PATH}:${POETRY_VENV}/bin"
+RUN chown $SERVICE_UID:$SERVICE_GID /app
 
-COPY --chown=$SERVICE_USER:$SERVICE_USER . /app
-COPY --chown=$SERVICE_USER:$SERVICE_USER --from=swagger-ui /usr/share/nginx/html/swagger-ui.css /app/swagger-ui-assets/swagger-ui.css
-COPY --chown=$SERVICE_USER:$SERVICE_USER --from=swagger-ui /usr/share/nginx/html/swagger-ui-bundle.js /app/swagger-ui-assets/swagger-ui-bundle.js
+USER $SERVICE_USER
 
 WORKDIR /app
-RUN python3 -m venv $POETRY_VENV && $POETRY_VENV/bin/pip install -U pip setuptools && \
-    $POETRY_VENV/bin/pip install poetry==1.6.1
 
-COPY --chown=$SERVICE_USER:$SERVICE_USER poetry.lock pyproject.toml ./
+RUN python3 -m venv $POETRY_VENV \
+    && $POETRY_VENV/bin/pip install -U pip setuptools \
+    && $POETRY_VENV/bin/pip install poetry==1.6.1
+
+ENV PATH="${PATH}:${POETRY_VENV}/bin"
+
+COPY --chown=$SERVICE_UID:$SERVICE_GID poetry.lock pyproject.toml ./
 
 RUN poetry config virtualenvs.in-project true
 RUN poetry install --no-root
@@ -56,9 +55,7 @@ RUN poetry install && rm -rf /app/.cache/pypoetry
 RUN $POETRY_VENV/bin/pip install --no-cache-dir torch==1.13.1+cu117 -f https://download.pytorch.org/whl/torch
 
 WORKDIR /app/reascripts/ReaSpeech
-RUN ls -la /app/reascripts/ReaSpeech
 RUN make publish
-
 WORKDIR /app
 RUN rm -rf reascripts