Merge b85dbd2 into 1070499

LibraryOfCongress · May 24, 2019 · 2ecb351 · 2ecb351
2 parents 1070499 + b85dbd2
commit 2ecb351
Show file tree

Hide file tree

Showing 10 changed files with 959 additions and 6,865 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-get update -qy && apt-get dist-upgrade -qy && apt-get install -o Dpkg::O
     libz-dev libfreetype6-dev \
     libmemcached-dev \
     libtiff-dev libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev \
-    jpegoptim libjpeg-turbo-progs optipng advancecomp \
     graphviz \
     locales \
     nodejs && apt-get -qy -t stretch-backports install npm && apt-get -qy autoremove && apt-get -qy autoclean

diff --git a/celerybeat/Dockerfile b/celerybeat/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-get update -qy && apt-get dist-upgrade -qy && apt-get install -o Dpkg::O
     libz-dev libfreetype6-dev \
     libmemcached-dev \
     libtiff-dev libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev \
-    jpegoptim libjpeg-turbo-progs optipng advancecomp \
     graphviz \
     locales && apt-get -qy autoremove && apt-get -qy autoclean
 

diff --git a/concordia/static/img/.eslintrc.yaml b/concordia/static/img/.eslintrc.yaml
diff --git a/concordia/static/img/Makefile b/concordia/static/img/Makefile
diff --git a/concordia/static/img/optimize-images.js b/concordia/static/img/optimize-images.js
diff --git a/docs/for-developers.md b/docs/for-developers.md
@@ -197,12 +197,11 @@ $ pipenv run ./manage.py print_frontend_test_urls | xargs npx axe --show-errors
 
 ### Static Image Compression
 
-The `concordia/static/img` directory has a Makefile which will run an
-[imagemin](http://github.com/imagemin/imagemin)-based toolchain. Use of other
-tools such as [ImageOptim](https://github.com/ImageOptim/ImageOptim) may yield
-better results at the expensive of portability and is encouraged at least for
-comparison purposes.
+When you update any of the files under `concordia/static/img`, please use an
+optimizer such as [ImageOptim](https://imageoptim.com) to losslessly compress
+JPEG, PNG, SVG, etc. files.
 
 ```bash
-$ make -C concordia/static/img/
+$ brew cask install imageoptim
+$ open -a ImageOptim concordia/static/img/
 ```
diff --git a/importer/Dockerfile b/importer/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-get update -qy && apt-get dist-upgrade -qy && apt-get install -o Dpkg::O
     libz-dev libfreetype6-dev \
     libmemcached-dev \
     libtiff-dev libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev \
-    jpegoptim libjpeg-turbo-progs optipng advancecomp \
     graphviz \
     locales && apt-get -qy autoremove && apt-get -qy autoclean
 

diff --git a/indexer/Dockerfile b/indexer/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-get update -qy && apt-get dist-upgrade -qy && apt-get install -o Dpkg::O
     libz-dev libfreetype6-dev \
     libmemcached-dev \
     libtiff-dev libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev \
-    jpegoptim libjpeg-turbo-progs optipng advancecomp \
     graphviz \
     locales && apt-get -qy autoremove && apt-get -qy autoclean