From 170e1c7a708b4a34bdcf6eb1367293e324a55bb3 Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Fri, 14 Jul 2023 22:50:55 -0500 Subject: [PATCH] fix(build): copy extras file into image from models dir --- api/Containerfile.cpu.buster | 12 ++++++------ api/Containerfile.cuda.ubuntu | 12 ++++++------ api/Containerfile.directml.buster | 12 ++++++------ api/Containerfile.rocm.ubuntu | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/api/Containerfile.cpu.buster b/api/Containerfile.cpu.buster index 10dd9c82..8e175b9a 100644 --- a/api/Containerfile.cpu.buster +++ b/api/Containerfile.cpu.buster @@ -14,23 +14,23 @@ ENV PATH="/onnx-web/api/onnx_env/bin:$PATH" RUN pip3 install pip --upgrade -COPY requirements/ /onnx-web/api/requirements/ +COPY api/requirements/ /onnx-web/api/requirements/ RUN pip3 install -r requirements/cpu.txt --no-cache-dir RUN pip3 install -r requirements/base.txt --no-cache-dir -COPY onnx_web/ /onnx-web/api/onnx_web/ +COPY api/onnx_web/ /onnx-web/api/onnx_web/ -COPY extras.json logging.yaml params.json /onnx-web/api/ +COPY api/launch.sh api/logging.yaml api/params.json /onnx-web/api/ -COPY schemas/ /onnx-web/api/schemas/ +COPY api/schemas/ /onnx-web/api/schemas/ -COPY launch.sh /onnx-web/launch.sh +COPY models/extras.json /onnx-web/models/ ENV ONNX_WEB_BUNDLE_PATH="/onnx-web/gui" -COPY gui/ /onnx-web/gui/ +COPY gui/out/ /onnx-web/gui/ ENV ONNX_WEB_DEFAULT_PLATFORM="cpu" diff --git a/api/Containerfile.cuda.ubuntu b/api/Containerfile.cuda.ubuntu index 70cad45d..26c10cd9 100644 --- a/api/Containerfile.cuda.ubuntu +++ b/api/Containerfile.cuda.ubuntu @@ -16,23 +16,23 @@ ENV PATH="/onnx-web/api/onnx_env/bin:$PATH" RUN pip3 install pip --upgrade -COPY requirements/ /onnx-web/api/requirements/ +COPY api/requirements/ /onnx-web/api/requirements/ RUN pip3 install -r requirements/nvidia.txt --no-cache-dir RUN pip3 install -r requirements/base.txt --no-cache-dir -COPY onnx_web/ /onnx-web/api/onnx_web/ +COPY api/onnx_web/ /onnx-web/api/onnx_web/ -COPY extras.json logging.yaml params.json /onnx-web/api/ +COPY api/launch.sh api/logging.yaml api/params.json /onnx-web/api/ -COPY schemas/ /onnx-web/api/schemas/ +COPY api/schemas/ /onnx-web/api/schemas/ -COPY launch.sh /onnx-web/launch.sh +COPY models/extras.json /onnx-web/models/ ENV ONNX_WEB_BUNDLE_PATH="/onnx-web/gui" -COPY gui/ /onnx-web/gui/ +COPY gui/out/ /onnx-web/gui/ ENV ONNX_WEB_DEFAULT_PLATFORM="cuda" diff --git a/api/Containerfile.directml.buster b/api/Containerfile.directml.buster index 8c87b7cd..c430f96f 100644 --- a/api/Containerfile.directml.buster +++ b/api/Containerfile.directml.buster @@ -10,23 +10,23 @@ ENV PATH="/onnx-web/api/onnx_env/bin:$PATH" RUN pip3 install pip --upgrade -COPY requirements/ /onnx-web/api/requirements/ +COPY api/requirements/ /onnx-web/api/requirements/ RUN pip3 install -r requirements/amd-windows-nightly.txt --no-cache-dir RUN pip3 install -r requirements/base.txt --no-cache-dir -COPY onnx_web/ /onnx-web/api/onnx_web/ +COPY api/onnx_web/ /onnx-web/api/onnx_web/ -COPY extras.json logging.yaml params.json /onnx-web/api/ +COPY api/launch.sh api/logging.yaml api/params.json /onnx-web/api/ -COPY schemas/ /onnx-web/api/schemas/ +COPY api/schemas/ /onnx-web/api/schemas/ -COPY launch.sh /onnx-web/launch.sh +COPY models/extras.json /onnx-web/models/ ENV ONNX_WEB_BUNDLE_PATH="/onnx-web/gui" -COPY gui/ /onnx-web/gui/ +COPY gui/out/ /onnx-web/gui/ ENV ONNX_WEB_DEFAULT_PLATFORM="directml" diff --git a/api/Containerfile.rocm.ubuntu b/api/Containerfile.rocm.ubuntu index 8366f797..664697a3 100644 --- a/api/Containerfile.rocm.ubuntu +++ b/api/Containerfile.rocm.ubuntu @@ -14,7 +14,7 @@ ENV PATH="/onnx-web/api/onnx_env/bin:$PATH" RUN pip3 install pip --upgrade -COPY requirements/ /onnx-web/api/requirements/ +COPY api/requirements/ /onnx-web/api/requirements/ RUN pip3 install -r requirements/amd-linux.txt --no-cache-dir @@ -22,17 +22,17 @@ RUN pip3 install -r requirements/base.txt --no-cache-dir WORKDIR /onnx-web/api -COPY onnx_web/ /onnx-web/api/onnx_web/ +COPY api/onnx_web/ /onnx-web/api/onnx_web/ -COPY extras.json logging.yaml params.json /onnx-web/api/ +COPY api/launch.sh api/logging.yaml api/params.json /onnx-web/api/ -COPY schemas/ /onnx-web/api/schemas/ +COPY api/schemas/ /onnx-web/api/schemas/ -COPY launch.sh /onnx-web/launch.sh +COPY models/extras.json /onnx-web/models/ ENV ONNX_WEB_BUNDLE_PATH="/onnx-web/gui" -COPY gui/ /onnx-web/gui/ +COPY gui/out/ /onnx-web/gui/ ENV ONNX_WEB_DEFAULT_PLATFORM="rocm"