Skip to content

Commit

Permalink
Reflect packaging changes in Docker files
Browse files Browse the repository at this point in the history
  • Loading branch information
obilodeau committed Dec 5, 2023
1 parent 6af9f07 commit 836f64e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ RUN cd /pyrdp && \
# This way changes to source tree will not trigger full images rebuilds
COPY ext/rle.c /pyrdp/ext/rle.c
COPY setup.py /pyrdp/setup.py
COPY pyproject.toml /pyrdp/pyproject.toml
RUN cd /pyrdp \
&& python setup.py build_ext \
&& python setup.py install_lib
&& pip3 --no-cache-dir install '.[full]'


# Handles runtime only (minimize size for distribution)
Expand Down Expand Up @@ -66,9 +66,9 @@ ENV PATH="/opt/venv/bin:$PATH"
# Install python source and package
# NOTE: we are no longer doing this in the compile image to avoid long image rebuilds in development
COPY --from=compile-image /pyrdp /pyrdp
COPY bin/ /pyrdp/bin/
COPY pyrdp/ /pyrdp/pyrdp/
COPY setup.py /pyrdp/setup.py
COPY pyproject.toml /pyrdp/pyproject.toml
RUN cd /pyrdp \
&& python setup.py install

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV PATH="/opt/venv/bin:$PATH"

# Required for ARM builds
# Building dependencies didn't work without an upgraded pip and wheel on ARM
RUN pip3 --no-cache-dir install -U pip wheel
RUN pip3 --no-cache-dir install -U pip setuptools wheel

# Install dependencies only (speeds repetitive builds)
COPY requirements-slim.txt /pyrdp/requirements.txt
Expand Down Expand Up @@ -63,7 +63,6 @@ ENV PATH="/opt/venv/bin:$PATH"
# Install python source and package
# NOTE: we are no longer doing this in the compile image to avoid long image rebuilds in development
COPY --from=compile-image /pyrdp /pyrdp
COPY bin/ /pyrdp/bin/
COPY pyrdp/ /pyrdp/pyrdp/
COPY setup.py /pyrdp/setup.py
RUN cd /pyrdp \
Expand Down

0 comments on commit 836f64e

Please sign in to comment.