image_optim_pack 0.9.1.20221127 → 0.9.1.20221210

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a23a131b165e7ba61796c8e9a48a6526b090510f69a0eb8fd41fff1e2da0d1cb
-  data.tar.gz: 479e8f3f1cc5491372806b6c2f7d0aa83ed43ff214fc7b00cccead619a1cd160
+  metadata.gz: 5c0f1dcc4926d96f86ae877c5c014d6501613e3210e2a92e6fa541c7f5fa749a
+  data.tar.gz: 5141ab4158bc188e820f000818720c7502f967df829c0ff0dc6c40346fc4b9c4
 SHA512:
-  metadata.gz: 7762650dc936abf0796644a491b78e1540155bfe683b7bbada65f293a1353b03f96d1593721960b46c994bafa6faac6cba86c2d62fc4eda962884fdd26c6b5b8
-  data.tar.gz: 0741f5e39ed7da733aab2810bdc15a07ba5bc775bb33fdddc2a1d713a853e628d1a998f129e916654c4b5a8a6f0dd92915a66f01f1987282b6d00acea7a1fe1a
+  metadata.gz: 8e96ab0ee79e145d731f0937f4ad8ecc067e28f85609a19cf310cd33f7d6e9218a18e94115a7df0bb454088611f8e27684ece3d74f8959afc78673911dffc948
+  data.tar.gz: b44a3a1b984839bcbe549b9f5ac22c48a510de690b51a7f0a9fb50ac11851548add2425e680362f5565608c7dd384218fedfe4b54f012632ea14b42b22a46e3e

data/.github/workflows/docker-build.yml

@@ -3,9 +3,16 @@ on:
   push:
     tags:
     - '*'
+  workflow_dispatch:
 jobs:
   docker-build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        params:
+        - ''
+        - DOCKER_FILE=Dockerfile.debian DOCKER_TAG_SUFFIX=-debian
+      fail-fast: false
     steps:
     - uses: actions/checkout@v2
     - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
@@ -13,4 +20,4 @@ jobs:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    - run: make docker-push
+    - run: make docker-push ${{ matrix.params }}

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.9.1.20221210 (2022-12-10)
+
+* oxipng 7.0.0 [@toy](https://github.com/toy)
+
 ## v0.9.1.20221127 (2022-11-27)
 
 * advancecomp 2.4 and libpng 1.6.39 [@toy](https://github.com/toy)

data/Dockerfile.debian

@@ -0,0 +1,179 @@
+FROM debian as base
+ENV LD_LIBRARY_PATH=/usr/local/lib
+WORKDIR /tmp
+
+FROM base as build
+RUN apt-get update && apt-get install -y build-essential cmake nasm bash findutils
+COPY script/extract ./
+ENV CPATH=/usr/local/include
+
+FROM build as libz
+ARG LIBZ_VER
+ARG LIBZ_SHA256
+COPY download/libz-$LIBZ_VER.tar.gz download/
+RUN ./extract libz && \
+    cd build/libz && \
+    ./configure && \
+    make install
+
+FROM libz as libpng
+ARG LIBPNG_VER
+ARG LIBPNG_SHA256
+COPY download/libpng-$LIBPNG_VER.tar.gz download/
+RUN ./extract libpng && \
+    cd build/libpng && \
+    ./configure --with-zlib-prefix=/usr/local && \
+    make install
+
+FROM libpng as liblcms
+ARG LIBLCMS_VER
+ARG LIBLCMS_SHA256
+COPY download/liblcms-$LIBLCMS_VER.tar.gz download/
+RUN ./extract liblcms && \
+    cd build/liblcms && \
+    ./configure && \
+    make install
+
+FROM build as libjpeg
+ARG LIBJPEG_VER
+ARG LIBJPEG_SHA256
+COPY download/libjpeg-$LIBJPEG_VER.tar.gz download/
+RUN ./extract libjpeg && \
+    cd build/libjpeg && \
+    ./configure && \
+    make install
+
+FROM build as libmozjpeg
+ARG LIBMOZJPEG_VER
+ARG LIBMOZJPEG_SHA256
+COPY download/libmozjpeg-$LIBMOZJPEG_VER.tar.gz download/
+RUN ./extract libmozjpeg && \
+    cd build/libmozjpeg && \
+    cmake -DPNG_SUPPORTED=0 . && \
+    make install
+
+FROM libpng as advancecomp
+ARG ADVANCECOMP_VER
+ARG ADVANCECOMP_SHA256
+COPY download/advancecomp-$ADVANCECOMP_VER.tar.gz download/
+RUN ./extract advancecomp && \
+    cd build/advancecomp && \
+    ./configure && \
+    make install
+
+FROM build as gifsicle
+ARG GIFSICLE_VER
+ARG GIFSICLE_SHA256
+COPY download/gifsicle-$GIFSICLE_VER.tar.gz download/
+RUN ./extract gifsicle && \
+    cd build/gifsicle && \
+    ./configure && \
+    make install
+
+FROM build as jhead
+ARG JHEAD_VER
+ARG JHEAD_SHA256
+COPY download/jhead-$JHEAD_VER.tar.gz download/
+RUN ./extract jhead && \
+    cd build/jhead && \
+    make && \
+    install -c jhead /usr/local/bin
+
+FROM libmozjpeg as jpegarchive
+ARG JPEGARCHIVE_VER
+ARG JPEGARCHIVE_SHA256
+COPY download/jpegarchive-$JPEGARCHIVE_VER.tar.gz download/
+RUN ./extract jpegarchive && \
+    cd build/jpegarchive && \
+    CFLAGS=-fcommon make install
+
+FROM libjpeg as jpegoptim
+ARG JPEGOPTIM_VER
+ARG JPEGOPTIM_SHA256
+COPY download/jpegoptim-$JPEGOPTIM_VER.tar.gz download/
+RUN ./extract jpegoptim && \
+    cd build/jpegoptim && \
+    ./configure && \
+    make install
+
+FROM libpng as optipng
+ARG OPTIPNG_VER
+ARG OPTIPNG_SHA256
+COPY download/optipng-$OPTIPNG_VER.tar.gz download/
+RUN ./extract optipng && \
+    cd build/optipng && \
+    ./configure && \
+    make install
+
+FROM rust:1 as oxipng
+RUN apt-get update && apt-get install -y build-essential
+COPY script/extract ./
+ARG OXIPNG_VER
+ARG OXIPNG_SHA256
+COPY download/oxipng-$OXIPNG_VER.tar.gz download/
+RUN ./extract oxipng && \
+    cd build/oxipng && \
+    cargo build --release && \
+    install -c target/release/oxipng /usr/local/bin
+
+FROM libpng as pngcrush
+ARG PNGCRUSH_VER
+ARG PNGCRUSH_SHA256
+COPY download/pngcrush-$PNGCRUSH_VER.tar.gz download/
+RUN ./extract pngcrush && \
+    cd build/pngcrush && \
+    make && \
+    install -c pngcrush /usr/local/bin
+
+FROM build as pngout
+ARG PNGOUT_LINUX_STATIC_VER
+ARG PNGOUT_LINUX_STATIC_SHA256
+COPY download/pngout_linux_static-$PNGOUT_LINUX_STATIC_VER.tar.gz download/
+RUN ./extract pngout_linux_static && \
+    cd build/pngout_linux_static && \
+    cp amd64/pngout-static /usr/local/bin/pngout
+
+FROM liblcms as pngquant
+ARG PNGQUANT_VER
+ARG PNGQUANT_SHA256
+COPY download/pngquant-$PNGQUANT_VER.tar.gz download/
+RUN ./extract pngquant && \
+    cd build/pngquant && \
+    make install
+
+# FROM build as [name]
+# ARG [NAME]_VER
+# ARG [NAME]_SHA256
+# COPY download/[name]-$[NAME]_VER.tar.gz download/
+# RUN ./extract [name] && \
+#     cd build/[name] && \
+#     ./configure && \
+#     make install
+
+FROM base as image_optim
+RUN apt-get update && apt-get install -y ruby npm perl-base dumb-init
+
+COPY README.markdown /
+COPY acknowledgements /acknowledgements
+
+COPY --from=advancecomp /usr/local/bin/advpng          /usr/local/bin/
+COPY --from=gifsicle    /usr/local/bin/gifsicle        /usr/local/bin/
+COPY --from=jhead       /usr/local/bin/jhead           /usr/local/bin/
+COPY --from=jpegarchive /usr/local/bin/jpeg-recompress /usr/local/bin/
+COPY --from=jpegoptim   /usr/local/bin/jpegoptim       /usr/local/bin/
+COPY --from=libjpeg     /usr/local/bin/jpegtran        /usr/local/bin/
+COPY --from=optipng     /usr/local/bin/optipng         /usr/local/bin/
+COPY --from=oxipng      /usr/local/bin/oxipng          /usr/local/bin/
+COPY --from=pngcrush    /usr/local/bin/pngcrush        /usr/local/bin/
+COPY --from=pngout      /usr/local/bin/pngout          /usr/local/bin/
+COPY --from=pngquant    /usr/local/bin/pngquant        /usr/local/bin/
+
+COPY --from=libjpeg     /usr/local/lib/libjpeg.so.9    /usr/local/lib/
+COPY --from=libpng      /usr/local/lib/libpng16.so.16  /usr/local/lib/
+COPY --from=libz        /usr/local/lib/libz.so.1       /usr/local/lib/
+COPY --from=liblcms     /usr/local/lib/liblcms2.so.2   /usr/local/lib/
+
+RUN npm -g install svgo
+RUN gem install --no-document image_optim
+ENTRYPOINT ["dumb-init", "image_optim"]
+CMD ["--help"]

data/Makefile

@@ -13,7 +13,7 @@ LIBMOZJPEG_VER := 4.1.1
 LIBPNG_VER := 1.6.39
 LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.7
-OXIPNG_VER := 6.0.1
+OXIPNG_VER := 7.0.0
 PNGCRUSH_VER := 1.8.13
 PNGOUT_VER := 20200115
 PNGOUT_LINUX_VER := $(PNGOUT_VER)
@@ -277,28 +277,30 @@ update-versions :
 
 DOCKER_IMAGE := ghcr.io/toy/image_optim
 DOCKER_TAG := $(shell date +%Y%m%d)
+DOCKER_FILE := Dockerfile
 
 docker-build : download
 	@docker build \
 		--pull \
 		$(foreach archive,$(ARCHIVES),--build-arg $(archive)_VER=$($(archive)_VER) --build-arg $(archive)_SHA256=$($(archive)_SHA256)) \
-		-t $(DOCKER_IMAGE):latest \
+		-t $(DOCKER_IMAGE):latest$(DOCKER_TAG_SUFFIX) \
+		-f $(DOCKER_FILE) \
 		.
 	@docker tag \
-		$(DOCKER_IMAGE):latest \
-		$(DOCKER_IMAGE):$(DOCKER_TAG)
+		$(DOCKER_IMAGE):latest$(DOCKER_TAG_SUFFIX) \
+		$(DOCKER_IMAGE):$(DOCKER_TAG)$(DOCKER_TAG_SUFFIX)
 .PHONY : docker-build
 
 docker-test : docker-build
 	@docker run \
 		--rm \
-		$(DOCKER_IMAGE):latest \
+		$(DOCKER_IMAGE):latest$(DOCKER_TAG_SUFFIX) \
 		--info
 .PHONY : docker-test
 
 docker-push : docker-test
-	@docker push $(DOCKER_IMAGE):latest
-	@docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
+	@docker push $(DOCKER_IMAGE):latest$(DOCKER_TAG_SUFFIX)
+	@docker push $(DOCKER_IMAGE):$(DOCKER_TAG)$(DOCKER_TAG_SUFFIX)
 .PHONY : docker-push
 
 # ====== CLEAN ======

data/checksums.mk

@@ -9,7 +9,7 @@ LIBMOZJPEG_SHA256 := 66b1b8d6b55d263f35f27f55acaaa3234df2a401232de99b6d099e2bb0a
 LIBPNG_SHA256 := af4fb7f260f839919e5958e5ab01a275d4fe436d45442a36ee62f73e5beb75ba
 LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 OPTIPNG_SHA256 := 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
-OXIPNG_SHA256 := 02625687bf19263bc2d537f9f81f85784c5b729c003e9dbb8551126d0e28ba7a
+OXIPNG_SHA256 := 2a669c9b966cb54f8247c0accc9d90502944359abdd4143d9162d64e0acbaf76
 PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
 PNGOUT_LINUX_SHA256 := ac38bba6f0de29033de866538c3afa64341319b695bbe388efbc5fd9e830e928
 PNGOUT_LINUX_STATIC_SHA256 := 7a78ea475d65a00981bf418e5dfa3b34e42d6460fb992340802873bb14b08597

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.9.1.20221127'
+  s.version     = '0.9.1.20221210'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/script/platform_downloads

@@ -45,7 +45,7 @@ table = Terminal::Table.new
 
 table.headings = ['version', 'days', 'base dls'] + platforms.map do |platform|
   platform.split('-').reverse.join("\n")
-end
+end + ['total']
 
 versions.group_by(&:number).each do |version_n, platform_versions|
   next if platform_versions.length == 1
@@ -65,7 +65,7 @@ versions.group_by(&:number).each do |version_n, platform_versions|
     version_n,
     (version_time[version_n] / (24 * 60 * 60)).round,
     base_downloads,
-  ] + platform_values
+  ] + platform_values + [downloads_by_platform.values.sum]
 end
 
 (1...table.number_of_columns).each do |column|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.9.1.20221127
+  version: 0.9.1.20221210
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-27 00:00:00.000000000 Z
+date: 2022-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -107,6 +107,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.markdown
 - Dockerfile
+- Dockerfile.debian
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -210,7 +211,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim_pack/issues
   changelog_uri: https://github.com/toy/image_optim_pack/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.9.1.20221127
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.9.1.20221210
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message:
 rdoc_options: []