Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove mozjpeg #285

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove mozjpeg #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
046ac83
Update README to remove references to mozjpeg
MelSumner Oct 28, 2024
15f2a45
remove references to mozjpeg in Dockerfile
MelSumner Oct 28, 2024
a424753
remove references to mozjpeg in dockerfile pt2
MelSumner Oct 28, 2024
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
20 changes: 0 additions & 20 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,10 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Etc/UTC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

ARG MOZJPEG_VERSION=3.3.1
ARG VIPS_VERSION=8.10.1

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

# mozjpeg installs to /opt/mozjpeg ... we need that on PKG_CONFIG_PATH so
# that libvips configure can find it
ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/mozjpeg/lib64/pkgconfig

# libvips installs to /usr/local by default .. /usr/local/bin is on the
# default path in ubuntu, but /usr/local/lib is not
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
Expand All @@ -37,20 +31,6 @@ RUN apt-get update \
swig \
gobject-introspection

RUN cd /usr/local/src \
&& wget ${MOZJPEG_URL}/v${MOZJPEG_VERSION}.tar.gz \
&& tar xzf v${MOZJPEG_VERSION}.tar.gz

RUN cd /usr/local/src/mozjpeg-${MOZJPEG_VERSION} \
&& aclocal \
&& autoconf \
&& autoheader \
&& libtoolize \
&& automake --add-missing \
&& ./configure \
&& make \
&& make install

# we must not use any packages which depend directly or indirectly on libjpeg,
# since we want to use our own mozjpeg build
RUN apt-get install -y \
Copy link
Collaborator Author

@MelSumner MelSumner Oct 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@benschwarz does this mean we don't need these either, since we're removing mozjpeg?

Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Image Actions is a Github Action built by performance experts at [Calibre](https
Image Actions offers:

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