Skip to content

Commit 6c2c026

Browse files
authored
Compile oxipng from source (#688)
* Download and compile oxipng from source * Move oxipng install step after rust since it uses cargo
1 parent 4810f76 commit 6c2c026

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

image/base/install-oxipng

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
22
set -e
33

44
# version check: https://github.com/shssoichiro/oxipng/releases
5-
OXIPNG_VERSION="7.0.0"
6-
OXIPNG_FILE="oxipng-${OXIPNG_VERSION}-x86_64-unknown-linux-musl.tar.gz"
7-
OXIPNG_HASH="f794df937abcc2ef9357dcc52c39908f390461921fcbd19793f35d33120bfc8e"
5+
OXIPNG_VERSION="8.0.0"
6+
OXIPNG_HASH="ef96d6340e70900de0a38ace8f5f20878f6c256b18b0c59cd87f2b515437b87b"
7+
OXIPNG_ARCHIVE="v${OXIPNG_VERSION}.tar.gz"
8+
OXIPNG_DIR="oxipng-${OXIPNG_VERSION}"
89

910
# Install other deps
10-
apt -y -q install advancecomp jhead jpegoptim libjpeg-turbo-progs optipng
11+
apt-get -y install advancecomp jhead jpegoptim libjpeg-turbo-progs optipng
1112

12-
mkdir /oxipng-install
13-
cd /oxipng-install
13+
cd /tmp
14+
wget -q https://github.com/shssoichiro/oxipng/archive/refs/tags/${OXIPNG_ARCHIVE}
15+
sha256sum ${OXIPNG_ARCHIVE}
16+
echo "${OXIPNG_HASH} ${OXIPNG_ARCHIVE}" | sha256sum -c
1417

15-
wget -q https://github.com/shssoichiro/oxipng/releases/download/v${OXIPNG_VERSION}/${OXIPNG_FILE}
16-
sha256sum ${OXIPNG_FILE}
17-
echo "${OXIPNG_HASH} ${OXIPNG_FILE}" | sha256sum -c
18+
tar -zxf ${OXIPNG_ARCHIVE}
19+
cd ${OXIPNG_DIR}
1820

19-
tar --strip-components=1 -xzf $OXIPNG_FILE
20-
cp -v ./oxipng /usr/local/bin
21-
cd / && rm -fr /oxipng-install
21+
/usr/local/cargo/bin/cargo build --release
22+
cp target/release/oxipng /usr/local/bin
23+
24+
cd / && rm -fr /tmp/${OXIPNG_DIR}

image/base/slim.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ RUN /tmp/install-jemalloc
6969
ADD install-nginx /tmp/install-nginx
7070
RUN /tmp/install-nginx
7171

72-
ADD install-oxipng /tmp/install-oxipng
73-
RUN /tmp/install-oxipng
74-
7572
ADD install-redis /tmp/install-redis
7673
RUN /tmp/install-redis
7774

7875
ADD install-rust /tmp/install-rust
7976
RUN /tmp/install-rust
8077

78+
ADD install-oxipng /tmp/install-oxipng
79+
RUN /tmp/install-oxipng
80+
8181
ADD install-ruby /tmp/install-ruby
8282
RUN /tmp/install-ruby
8383

0 commit comments

Comments
 (0)