Skip to content

Commit c990723

Browse files
committed
fix whitespace
1 parent 5bcc444 commit c990723

File tree

1 file changed

+34
-35
lines changed

1 file changed

+34
-35
lines changed

docker/Dockerfile.base

+34-35
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
1-
ARG BASE_IMAGE=nvidia/cuda:12.2.2-cudnn8-devel-ubuntu22.04 \
2-
CONDA_VERSION=latest \
3-
PYTHON_VERSION=3.11
1+
ARG BASE_IMAGE=nvidia/cuda:12.2.2-cudnn8-devel-ubuntu22.04 \
2+
CONDA_VERSION=latest \
3+
PYTHON_VERSION=3.11
44

5-
FROM "${BASE_IMAGE}"
5+
FROM "${BASE_IMAGE}"
66

7-
ARG CONDA_VERSION \
8-
PYTHON_VERSION
7+
ARG CONDA_VERSION \
8+
PYTHON_VERSION
99

10-
11-
ENV DEBIAN_FRONTEND=noninteractive \
12-
CONDA_VERSION="${CONDA_VERSION}" \
13-
PATH="/workspace/miniconda3/bin:${PATH}" \
14-
PYTHON_VERSION="${PYTHON_VERSION}"
10+
ENV DEBIAN_FRONTEND=noninteractive \
11+
CONDA_VERSION="${CONDA_VERSION}" \
12+
PATH="/workspace/miniconda3/bin:${PATH}" \
13+
PYTHON_VERSION="${PYTHON_VERSION}"
1514

1615
# System dependencies
17-
RUN apt update && apt install -yqq \
18-
git \
19-
wget \
20-
nano \
21-
socat \
22-
libsndfile1 \
23-
build-essential llvm tk-dev && \
24-
rm -rf /var/lib/apt/lists/*
16+
RUN apt update && apt install -yqq \
17+
git \
18+
wget \
19+
nano \
20+
socat \
21+
libsndfile1 \
22+
build-essential llvm tk-dev && \
23+
rm -rf /var/lib/apt/lists/*
2524

2625
# Conda setup
27-
RUN mkdir -p /workspace/comfystream && \
28-
wget "https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh" -O /tmp/miniconda.sh && \
29-
bash /tmp/miniconda.sh -b -p /workspace/miniconda3 && \
30-
eval "$(/workspace/miniconda3/bin/conda shell.bash hook)" && \
31-
conda create -n comfystream python="${PYTHON_VERSION}" -y && \
32-
rm /tmp/miniconda.sh && \
33-
conda run -n comfystream --no-capture-output pip install aiortc aiohttp requests tqdm pyyaml --root-user-action=ignore
26+
RUN mkdir -p /workspace/comfystream && \
27+
wget "https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh" -O /tmp/miniconda.sh && \
28+
bash /tmp/miniconda.sh -b -p /workspace/miniconda3 && \
29+
eval "$(/workspace/miniconda3/bin/conda shell.bash hook)" && \
30+
conda create -n comfystream python="${PYTHON_VERSION}" -y && \
31+
rm /tmp/miniconda.sh && \
32+
conda run -n comfystream --no-capture-output pip install aiortc aiohttp requests tqdm pyyaml --root-user-action=ignore
3433

3534
# Clone ComfyUI
36-
ADD --link https://github.com/comfyanonymous/ComfyUI.git /workspace/ComfyUI
35+
ADD --link https://github.com/comfyanonymous/ComfyUI.git /workspace/ComfyUI
3736

3837
# Copy only files needed for setup
39-
COPY --link ./src/comfystream/scripts /workspace/comfystream/src/comfystream/scripts
40-
COPY --link ./configs /workspace/comfystream/configs
38+
COPY --link ./src/comfystream/scripts /workspace/comfystream/src/comfystream/scripts
39+
COPY --link ./configs /workspace/comfystream/configs
4140

4241
# Run setup_nodes (cached unless setup_nodes.py or nodes/ changes)
43-
RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream python src/comfystream/scripts/setup_nodes.py --workspace /workspace/ComfyUI
42+
RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream python src/comfystream/scripts/setup_nodes.py --workspace /workspace/ComfyUI
4443

4544
# Copy ComfyStream files into ComfyUI
46-
COPY . /workspace/comfystream
45+
COPY . /workspace/comfystream
4746

4847
# Copy comfystream and example workflows to ComfyUI
49-
COPY ./workflows/comfyui/* /workspace/ComfyUI/user/default/workflows
48+
COPY ./workflows/comfyui/* /workspace/ComfyUI/user/default/workflows
5049

5150
# Install ComfyUI requirements
52-
RUN conda run -n comfystream --no-capture-output --cwd /workspace/ComfyUI pip install -r requirements.txt --root-user-action=ignore
51+
RUN conda run -n comfystream --no-capture-output --cwd /workspace/ComfyUI pip install -r requirements.txt --root-user-action=ignore
5352

5453
# Install ComfyStream requirements
5554
RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream pip install -r requirements.txt --root-user-action=ignore
@@ -59,7 +58,7 @@ RUN conda run -n comfystream --no-capture-output --cwd /workspace/comfystream py
5958
RUN conda run -n comfystream --no-capture-output pip install --upgrade tensorrt-cu12-bindings tensorrt-cu12-libs --root-user-action=ignore
6059

6160
# Configure no environment activation by default
62-
RUN conda config --set auto_activate_base false && \
63-
conda init bash
61+
RUN conda config --set auto_activate_base false && \
62+
conda init bash
6463

6564
WORKDIR /workspace/comfystream

0 commit comments

Comments
 (0)