Update Dockerfile
Browse files- Dockerfile +48 -12
Dockerfile
CHANGED
|
@@ -1,7 +1,52 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
ARG PYTHON_VERSION=3.12.1
|
| 2 |
FROM python:${PYTHON_VERSION}-slim AS base
|
| 3 |
|
| 4 |
-
RUN apt-get update &&
|
| 5 |
apt-get install -y pipenv && \
|
| 6 |
apt-get install -y \
|
| 7 |
fontconfig \
|
|
@@ -12,9 +57,6 @@ RUN apt-get update && apt-get upgrade -y && \
|
|
| 12 |
fonts-noto \
|
| 13 |
git && \
|
| 14 |
rm -rf /var/lib/apt/lists/*
|
| 15 |
-
|
| 16 |
-
RUN apt-get update && \
|
| 17 |
-
apt-get install -y python3-pip-whl python3-setuptools-whl python3-wheel
|
| 18 |
|
| 19 |
ENV PORT=7860
|
| 20 |
|
|
@@ -22,21 +64,15 @@ ENV PIPENV_VENV_IN_PROJECT=1
|
|
| 22 |
|
| 23 |
WORKDIR /app
|
| 24 |
|
| 25 |
-
COPY requirements.txt .
|
| 26 |
-
RUN python -m pip install --upgrade pip
|
| 27 |
-
RUN python -m ensurepip --upgrade
|
| 28 |
-
RUN python -m pip install --upgrade setuptools
|
| 29 |
-
|
| 30 |
-
# RUN pipenv install pip==23.2.1
|
| 31 |
|
| 32 |
-
RUN pipenv install
|
| 33 |
# RUN pipenv install --dev --ignore-pipfile
|
| 34 |
|
| 35 |
COPY . .
|
| 36 |
|
| 37 |
EXPOSE 7860
|
| 38 |
|
| 39 |
-
|
| 40 |
|
| 41 |
# CMD pipenv run python update.py
|
| 42 |
# CMD pipenv run python -m gunicorn main:app -b 0.0.0.0:7860 -w 8 --timeout 600
|
|
|
|
| 1 |
+
# ARG PYTHON_VERSION=3.12.1
|
| 2 |
+
# FROM python:${PYTHON_VERSION}-slim AS base
|
| 3 |
+
|
| 4 |
+
# RUN apt-get update && apt-get upgrade -y && \
|
| 5 |
+
# apt-get install -y pipenv && \
|
| 6 |
+
# apt-get install -y \
|
| 7 |
+
# fontconfig \
|
| 8 |
+
# fonts-dejavu \
|
| 9 |
+
# fonts-dejavu-core \
|
| 10 |
+
# fonts-dejavu-extra \
|
| 11 |
+
# fonts-liberation \
|
| 12 |
+
# fonts-noto \
|
| 13 |
+
# git && \
|
| 14 |
+
# rm -rf /var/lib/apt/lists/*
|
| 15 |
+
|
| 16 |
+
# RUN apt-get update && \
|
| 17 |
+
# apt-get install -y python3-pip-whl python3-setuptools-whl python3-wheel
|
| 18 |
+
|
| 19 |
+
# ENV PORT=7860
|
| 20 |
+
|
| 21 |
+
# ENV PIPENV_VENV_IN_PROJECT=1
|
| 22 |
+
|
| 23 |
+
# WORKDIR /app
|
| 24 |
+
|
| 25 |
+
# COPY requirements.txt .
|
| 26 |
+
# RUN python -m pip install --upgrade pip
|
| 27 |
+
# RUN python -m ensurepip --upgrade
|
| 28 |
+
# RUN python -m pip install --upgrade setuptools
|
| 29 |
+
|
| 30 |
+
# # RUN pipenv install pip==23.2.1
|
| 31 |
+
|
| 32 |
+
# RUN pipenv install
|
| 33 |
+
# # RUN pipenv install --dev --ignore-pipfile
|
| 34 |
+
|
| 35 |
+
# COPY . .
|
| 36 |
+
|
| 37 |
+
# EXPOSE 7860
|
| 38 |
+
|
| 39 |
+
# # RUN pipenv run pip install git+https://github.com/KuntilBogel/EnkaNetwork.py fastapi asyncio enkacard uvicorn requests
|
| 40 |
+
|
| 41 |
+
# # CMD pipenv run python update.py
|
| 42 |
+
# # CMD pipenv run python -m gunicorn main:app -b 0.0.0.0:7860 -w 8 --timeout 600
|
| 43 |
+
# # CMD ["sh", "-c", "pipenv run python -m gunicorn main:app -b 0.0.0.0:7860 -w 8 --timeout 600"]
|
| 44 |
+
|
| 45 |
+
# CMD [ "pipenv", "run", "python", "-m", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860", "--workers", "8", "--timeout-keep-alive", "600" ]
|
| 46 |
ARG PYTHON_VERSION=3.12.1
|
| 47 |
FROM python:${PYTHON_VERSION}-slim AS base
|
| 48 |
|
| 49 |
+
RUN apt-get update && \
|
| 50 |
apt-get install -y pipenv && \
|
| 51 |
apt-get install -y \
|
| 52 |
fontconfig \
|
|
|
|
| 57 |
fonts-noto \
|
| 58 |
git && \
|
| 59 |
rm -rf /var/lib/apt/lists/*
|
|
|
|
|
|
|
|
|
|
| 60 |
|
| 61 |
ENV PORT=7860
|
| 62 |
|
|
|
|
| 64 |
|
| 65 |
WORKDIR /app
|
| 66 |
|
| 67 |
+
# COPY requirements.txt .
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 68 |
|
|
|
|
| 69 |
# RUN pipenv install --dev --ignore-pipfile
|
| 70 |
|
| 71 |
COPY . .
|
| 72 |
|
| 73 |
EXPOSE 7860
|
| 74 |
|
| 75 |
+
RUN pipenv run pip install git+https://github.com/KuntilBogel/EnkaNetwork.py fastapi asyncio enkacard uvicorn requests
|
| 76 |
|
| 77 |
# CMD pipenv run python update.py
|
| 78 |
# CMD pipenv run python -m gunicorn main:app -b 0.0.0.0:7860 -w 8 --timeout 600
|