From b8f801333d6816fcda8718f3f44adb3fec88b5eb Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <me@rreverser.com>
Date: Fri, 2 Aug 2019 16:32:13 +0100
Subject: [PATCH] Switch to prebuilt WABT and wasm-pack

Significantly speeds up `npm run build:image` commands (as they don't need to compile anything anymore) and slightly reduces size of Docker images:
 - `squoosh-rotate`: 1.87GB -> 1.84GB
 - `squoosh-resize`: 2.02GB -> 1.85GB
 - `squoosh-hqx`: 2.06GB -> 1.9GB
---
 codecs/hqx/Dockerfile             |  22 +++++++---------------
 codecs/hqx/pkg/squooshhqx_bg.wasm | Bin 224267 -> 224266 bytes
 codecs/resize/Dockerfile          |  20 ++++++--------------
 codecs/resize/pkg/resize_bg.wasm  | Bin 19893 -> 19893 bytes
 codecs/rotate/Dockerfile          |  16 ++++------------
 5 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/codecs/hqx/Dockerfile b/codecs/hqx/Dockerfile
index 47a13318..54c29ea2 100644
--- a/codecs/hqx/Dockerfile
+++ b/codecs/hqx/Dockerfile
@@ -1,20 +1,12 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-
-RUN git clone --depth 1 --recursive https://github.com/WebAssembly/wabt /usr/src/wabt
-RUN mkdir -p /usr/src/wabt/build
-WORKDIR /usr/src/wabt/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/opt/wabt && \
-  make && \
-  make install
-
 FROM rust
-RUN rustup target add wasm32-unknown-unknown && \
-  cargo install wasm-pack
+RUN rustup target add wasm32-unknown-unknown
+RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
-COPY --from=0 /opt/wabt /opt/wabt
 RUN mkdir /opt/binaryen && \
  curl -L https://github.com/WebAssembly/binaryen/releases/download/1.38.32/binaryen-1.38.32-x86-linux.tar.gz  | tar -xzf - -C /opt/binaryen --strip 1
-ENV PATH="/opt/binaryen:/opt/wabt/bin:${PATH}"
+
+RUN mkdir /opt/wabt && \
+ curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
+
+ENV PATH="/opt/binaryen:/opt/wabt:${PATH}"
 WORKDIR /src
diff --git a/codecs/hqx/pkg/squooshhqx_bg.wasm b/codecs/hqx/pkg/squooshhqx_bg.wasm
index c5d4857b2f434ea1f4d8aefaccb9641497e01448..93f5be74c4fe47e59092636d85f0b538f49ad8d5 100644
GIT binary patch
delta 99
zcmeCa!P|9%x1oixg=q_OtSRH3?Qy2e%{+|Dw?A@ZP7-7Kp}pNLf_bqJ<Fx6ovY1zL
zUC|a`P+?$T_@O<0XEw8!vVx8P0~e5Q48(juTwIi_pOcxSS5(a4_~XF=25v@10AY_E
Ag8%>k

delta 100
zcmeCW!P|X<x1oixg=q_OtSRG-?Qy2e%{+`Nwm))YP7-4h(b?`6!Ms?Aar*RES<EZd
z&S(oTa4|427y~gM5EmCE>*r)9=@k_-Fnj>YsQ|@9bf(YEX7=K6{PExb12-ch04$Ik
AhX4Qo

diff --git a/codecs/resize/Dockerfile b/codecs/resize/Dockerfile
index af9dcc32..4d58a71f 100644
--- a/codecs/resize/Dockerfile
+++ b/codecs/resize/Dockerfile
@@ -1,17 +1,9 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-RUN git clone --recursive https://github.com/WebAssembly/wabt /usr/src/wabt
-RUN mkdir -p /usr/src/wabt/build
-WORKDIR /usr/src/wabt/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/opt/wabt && \
-  make && \
-  make install
-
 FROM rust
-RUN rustup target add wasm32-unknown-unknown && \
-  cargo install wasm-pack
+RUN rustup target add wasm32-unknown-unknown
+RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
-COPY --from=0 /opt/wabt /opt/wabt
-ENV PATH="/opt/wabt/bin:${PATH}"
+RUN mkdir /opt/wabt && \
+ curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
+
+ENV PATH="/opt/wabt:${PATH}"
 WORKDIR /src
diff --git a/codecs/resize/pkg/resize_bg.wasm b/codecs/resize/pkg/resize_bg.wasm
index 50fc8dc98d7dab98a5f1aed9f4f1eb8c9b76e37a..c54e145bf2ec21953635db426474c3702b1f6437 100644
GIT binary patch
delta 62
zcmdlwn{n%G#tmDvnBH`5-llbo1xQb>)87lCYz?A8qO%MXSV8n2Q+-B|@LMxa5ZA)I
GRtx}odK*yy

delta 62
zcmdlwn{n%G#tmDvm>Onp-llbo1xQb>)87lCYz?A8qO%MXSV8n2Q+-B|@LMxa5ZA)I
GRtx|!kQmzl

diff --git a/codecs/rotate/Dockerfile b/codecs/rotate/Dockerfile
index 103ca5a3..30b9f7ce 100644
--- a/codecs/rotate/Dockerfile
+++ b/codecs/rotate/Dockerfile
@@ -1,16 +1,8 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-RUN git clone --recursive https://github.com/WebAssembly/wabt /usr/src/wabt
-RUN mkdir -p /usr/src/wabt/build
-WORKDIR /usr/src/wabt/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/opt/wabt && \
-  make && \
-  make install
-
 FROM rust
 RUN rustup target add wasm32-unknown-unknown
 
-COPY --from=0 /opt/wabt /opt/wabt
-ENV PATH="/opt/wabt/bin:${PATH}"
+RUN mkdir /opt/wabt && \
+ curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
+
+ENV PATH="/opt/wabt:${PATH}"
 WORKDIR /src