1.0.2

* jpeg-archive 2.2.0 https://github.com/danielgtaylor/jpeg-archive/releases/tag/v2.2.0 * pngquant 2.12.1 https://github.com/kornelski/pngquant/blob/2.12.1/CHANGELOG#L3
denji · Oct 11, 2018 · c32dc71 · c32dc71
1 parent ec99120
commit c32dc71
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,8 +9,8 @@ ENV \
   IJG_VERSION=9c \
   JHEAD_VERSION=3.00 \
   # https://github.com/danielgtaylor/jpeg-archive/releases
-  JPEGARCHIVE_VERSION=2.1.1 \
-  # http://www.kokkonen.net/tjko/projects.html#jpegoptim
+  JPEGARCHIVE_VERSION=2.2.0 \
+  # https://www.kokkonen.net/tjko/projects.html#jpegoptim
   JPEGOPTIM_VERSION=1.4.6 \
   # https://github.com/mozilla/mozjpeg/releases
   MOZJPEG_VERSION=3.3.1 \
@@ -20,7 +20,7 @@ ENV \
   PNGCRUSH_VERSION=1.8.13 \
   PNGOUT_VERSION=20150319 \
   # https://github.com/pornel/pngquant/releases
-  PNGQUANT_VERSION=2.11.7 \
+  PNGQUANT_VERSION=2.12.1 \
   # https://github.com/ImageOptim/libimagequant/releases
   LIBIMAGEQUANT_VERSION=2.12.1
 
@@ -42,7 +42,7 @@ RUN apk update && apk add \
   libpng \
 
   # svgo
-  nodejs \
+  nodejs yarn \
 
   # image_optim
   ruby \
@@ -88,7 +88,7 @@ RUN apk update && apk add \
   && make && make install \
 
   # jpegoptim
-  && curl -O http://www.kokkonen.net/tjko/src/jpegoptim-$JPEGOPTIM_VERSION.tar.gz \
+  && curl -O https://www.kokkonen.net/tjko/src/jpegoptim-$JPEGOPTIM_VERSION.tar.gz \
   && tar zxf jpegoptim-$JPEGOPTIM_VERSION.tar.gz \
   && cd jpegoptim-$JPEGOPTIM_VERSION \
   && ./configure && make && make install \
@@ -98,8 +98,8 @@ RUN apk update && apk add \
   && tar zxf v$MOZJPEG_VERSION.tar.gz \
   && cd mozjpeg-$MOZJPEG_VERSION \
   && autoreconf -fiv && ./configure && make && make install \
-  && curl -L -O https://github.com/danielgtaylor/jpeg-archive/archive/$JPEGARCHIVE_VERSION.tar.gz \
-  && tar zxf $JPEGARCHIVE_VERSION.tar.gz \
+  && curl -L -O https://github.com/danielgtaylor/jpeg-archive/archive/v$JPEGARCHIVE_VERSION.tar.gz \
+  && tar zxf v$JPEGARCHIVE_VERSION.tar.gz \
   && cd jpeg-archive-$JPEGARCHIVE_VERSION \
   && make && make install \
 
@@ -137,7 +137,7 @@ RUN apk update && apk add \
   && ./configure && make && make install \
 
   # svgo
-  && npm install -g svgo \
+  && yarn global add svgo --prefix /usr/local \
 
   # image_optim
   && echo -e 'install: --no-document\nupdate: --no-document' > "$HOME/.gemrc" \

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -9,8 +9,8 @@ ENV \
   IJG_VERSION=9c \
   JHEAD_VERSION=3.00 \
   # https://github.com/danielgtaylor/jpeg-archive/releases
-  JPEGARCHIVE_VERSION=2.1.1 \
-  # http://www.kokkonen.net/tjko/projects.html#jpegoptim
+  JPEGARCHIVE_VERSION=2.2.0 \
+  # https://www.kokkonen.net/tjko/projects.html#jpegoptim
   JPEGOPTIM_VERSION=1.4.6 \
   # https://github.com/mozilla/mozjpeg/releases
   MOZJPEG_VERSION=3.3.1 \
@@ -20,7 +20,7 @@ ENV \
   PNGCRUSH_VERSION=1.8.13 \
   PNGOUT_VERSION=20150319 \
   # https://github.com/pornel/pngquant/releases
-  PNGQUANT_VERSION=2.11.7 \
+  PNGQUANT_VERSION=2.12.1 \
   # https://github.com/ImageOptim/libimagequant/releases
   LIBIMAGEQUANT_VERSION=2.12.1
 
@@ -30,7 +30,6 @@ WORKDIR /tmp
 # compiled/installed binaries behind in order minimize the
 # footprint of the image layer.
 RUN apk update && apk add \
-
   # runtime dependencies
 
   # advcomp (libstdc++.so, libgcc_s.so)
@@ -43,7 +42,7 @@ RUN apk update && apk add \
   libpng \
 
   # svgo
-  nodejs \
+  nodejs yarn \
 
   # image_optim
   ruby \
@@ -93,7 +92,7 @@ RUN \
 
 # jpegoptim
 RUN \
-  curl -O http://www.kokkonen.net/tjko/src/jpegoptim-$JPEGOPTIM_VERSION.tar.gz \
+  curl -O https://www.kokkonen.net/tjko/src/jpegoptim-$JPEGOPTIM_VERSION.tar.gz \
   && tar zxf jpegoptim-$JPEGOPTIM_VERSION.tar.gz \
   && cd jpegoptim-$JPEGOPTIM_VERSION \
   && ./configure && make && make install
@@ -105,8 +104,8 @@ RUN \
   && cd mozjpeg-$MOZJPEG_VERSION \
   && autoreconf -fiv && ./configure && make && make install
 RUN \
-  curl -L -O https://github.com/danielgtaylor/jpeg-archive/archive/$JPEGARCHIVE_VERSION.tar.gz \
-  && tar zxf $JPEGARCHIVE_VERSION.tar.gz \
+  curl -L -O https://github.com/danielgtaylor/jpeg-archive/archive/v$JPEGARCHIVE_VERSION.tar.gz \
+  && tar zxf v$JPEGARCHIVE_VERSION.tar.gz \
   && cd jpeg-archive-$JPEGARCHIVE_VERSION \
   && make && make install
 
@@ -149,7 +148,7 @@ RUN \
   && ./configure && make && make install
 
 # svgo
-RUN npm install -g svgo
+RUN yarn global add svgo --prefix /usr/local
 
 # image_optim
 RUN \