Skip to content

Commit 06b947f

Browse files
authored
Merge pull request #285 from calibreapp/melsumner/remove-mozjpeg
Remove mozjpeg
2 parents 2eb4576 + a424753 commit 06b947f

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

Dockerfile

-20
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ ENV DEBIAN_FRONTEND=noninteractive
44
ENV TZ=Etc/UTC
55
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
66

7-
ARG MOZJPEG_VERSION=3.3.1
87
ARG VIPS_VERSION=8.10.1
98

10-
ARG MOZJPEG_URL=https://github.com/mozilla/mozjpeg/archive
119
ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
1210

13-
# mozjpeg installs to /opt/mozjpeg ... we need that on PKG_CONFIG_PATH so
14-
# that libvips configure can find it
15-
ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/mozjpeg/lib64/pkgconfig
16-
1711
# libvips installs to /usr/local by default .. /usr/local/bin is on the
1812
# default path in ubuntu, but /usr/local/lib is not
1913
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
@@ -37,20 +31,6 @@ RUN apt-get update \
3731
swig \
3832
gobject-introspection
3933

40-
RUN cd /usr/local/src \
41-
&& wget ${MOZJPEG_URL}/v${MOZJPEG_VERSION}.tar.gz \
42-
&& tar xzf v${MOZJPEG_VERSION}.tar.gz
43-
44-
RUN cd /usr/local/src/mozjpeg-${MOZJPEG_VERSION} \
45-
&& aclocal \
46-
&& autoconf \
47-
&& autoheader \
48-
&& libtoolize \
49-
&& automake --add-missing \
50-
&& ./configure \
51-
&& make \
52-
&& make install
53-
5434
# we must not use any packages which depend directly or indirectly on libjpeg,
5535
# since we want to use our own mozjpeg build
5636
RUN apt-get install -y \

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Image Actions is a Github Action built by performance experts at [Calibre](https
1010
Image Actions offers:
1111

1212
- **Fast, efficient and near-lossless compression**
13-
- Best image compression algorithms available ([mozjpeg](https://github.com/mozilla/mozjpeg) and [libvips](https://github.com/libvips/libvips))
13+
- Best image compression algorithms available ([libvips](https://github.com/libvips/libvips))
1414
- [Ease of customisation](#Configuration): use default settings or adapt to your needs
1515
- Running on demand or schedule
1616
- Supports GitHub Enterprise
@@ -313,7 +313,6 @@ Happy to hear you’re interested in contributing to Image Actions! Please find
313313
#### Image compression tools:
314314
315315
- [sharp](https://github.com/lovell/sharp)
316-
- [mozjpeg](https://github.com/mozilla/mozjpeg)
317316
- [libvips](https://github.com/libvips/libvips)
318317
319318
## 💼 License

0 commit comments

Comments
 (0)