Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ RUN /usr/sbin/adduser -D --uid 1001 pillow \
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
&& chown -R pillow:pillow /vpy3

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions amazon-2-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ RUN cd /depends \
&& ./install_raqm.sh \
&& ./install_webp.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions amazon-2023-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ RUN cd /depends \
&& ./install_raqm.sh \
&& ./install_webp.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions arch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ RUN /sbin/useradd -m -U --uid 1001 pillow \
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
&& chown -R pillow:pillow /vpy3

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions centos-stream-10-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ RUN cd /depends \
&& ./install_raqm.sh \
&& ldconfig

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions centos-stream-9-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ RUN cd /depends \
&& ./install_raqm.sh \
&& ldconfig

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions debian-12-bookworm-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ RUN virtualenv -p /usr/bin/python3.11 --system-site-packages /vpy3 \
ADD depends /depends
RUN cd /depends && ./install_imagequant.sh && ./install_libavif.sh && ./install_raqm.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions debian-12-bookworm-x86/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ RUN virtualenv -p /usr/bin/python3.11 --system-site-packages /vpy3 \
ADD depends /depends
RUN cd /depends && ./install_imagequant.sh && ./install_libavif.sh && ./install_raqm.sh

ENV FORCE_COLOR=1

USER pillow
ENTRYPOINT ["linux32"]
CMD ["depends/test.sh"]
Expand Down
2 changes: 2 additions & 0 deletions debian-13-trixie-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \
ADD depends /depends
RUN cd /depends && ./install_imagequant.sh && ./install_libavif.sh && ./install_raqm.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions debian-13-trixie-x86/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \
ADD depends /depends
RUN cd /depends && ./install_imagequant.sh && ./install_libavif.sh && ./install_raqm.sh

ENV FORCE_COLOR=1

USER pillow
ENTRYPOINT ["linux32"]
CMD ["depends/test.sh"]
Expand Down
2 changes: 2 additions & 0 deletions fedora-42-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \

ADD depends /depends

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions fedora-43-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \

ADD depends /depends

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions gentoo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ RUN virtualenv --system-site-packages /vpy3 \
ADD depends /depends
RUN cd /depends && ./install_imagequant.sh && ./install_libavif.sh && ./install_raqm.sh && ldconfig

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
1 change: 1 addition & 0 deletions manylinux2014-wheel-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ COPY --from=0 /usr/local/lib /usr/local/lib
COPY --from=0 /usr/local/include /usr/local/include
RUN yum install -y zlib-devel
COPY build.sh /build.sh
ENV FORCE_COLOR=1

CMD ["/bin/sh /build.sh"]
1 change: 1 addition & 0 deletions manylinux_2_28-wheel-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ COPY --from=0 /usr/local/lib /usr/local/lib
COPY --from=0 /usr/local/include /usr/local/include
RUN yum install -y zlib-devel
COPY build.sh /build.sh
ENV FORCE_COLOR=1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The manylinux only build wheels, it doesn't run pytest directly.

The make test (line 36 of its Makefile) for this pulls $(TEST_IMAGE), which is pythonpillow/fedora-43-amd64.

After this PR is merged and pushed, pythonpillow/fedora-43-amd64 will have colour enabled, so its next run should have colour.

We could probably omit FORCE_COLOR=1 from the manylinux Dockerfiles, but I put it in for any other commands that can enable colour. Although I didn't check. Maybe the pip calls?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


CMD ["/bin/sh /build.sh"]
2 changes: 2 additions & 0 deletions ubuntu-22.04-jammy-amd64-valgrind/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ RUN cd /depends \

COPY python.supp /depends

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions ubuntu-22.04-jammy-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ RUN cd /depends \
&& ./install_libavif.sh \
&& ./install_raqm.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions ubuntu-24.04-noble-amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ ADD depends /depends
RUN cd /depends \
&& ./install_raqm.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions ubuntu-24.04-noble-arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ ADD depends /depends
RUN cd /depends \
&& ./install_raqm.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions ubuntu-24.04-noble-ppc64le/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ ADD depends /depends
RUN cd /depends \
&& ./install_raqm.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down
2 changes: 2 additions & 0 deletions ubuntu-24.04-noble-s390x/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ RUN cd /depends \
&& ./install_raqm.sh \
&& ./install_webp.sh

ENV FORCE_COLOR=1

USER pillow
CMD ["depends/test.sh"]

Expand Down