Skip to content

Commit d83d040

Browse files
committed
build iipsrv 1.3 by default; parameterize build, too
1 parent c22f37d commit d83d040

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

Dockerfile

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# =============================================================================
2+
#
3+
# These ARGs are used to determine the version of IIPImage to
4+
# build. IIPSRV_BUILD_REF is intended to map to a Git tag or
5+
# branch.
6+
ARG IIPSRV_VERSION="1.3"
7+
ARG IIPSRV_BUILD_REF="iipsrv-${IIPSRV_VERSION:-1.3}"
8+
19
# =============================================================================
210
# Target: base
311
#
@@ -23,6 +31,7 @@ ENV LOGFILE=/dev/stdout
2331
RUN apt-get update && \
2432
apt-get install -y --no-install-recommends \
2533
libgomp1 \
34+
libwebpmux3 \
2635
spawn-fcgi
2736

2837
# ==============================
@@ -49,6 +58,8 @@ CMD ["./iipsrv-entrypoint.sh"]
4958

5059
FROM base AS development
5160

61+
ARG IIPSRV_BUILD_REF
62+
5263
# ==============================
5364
# Install development tools
5465

@@ -59,17 +70,18 @@ RUN apt-get install -y --no-install-recommends \
5970
git \
6071
libtiff-dev \
6172
libtool \
73+
libwebp-dev \
6274
pkg-config
6375

6476
# ==============================
6577
# Build and install iipsrv from source
6678

6779
# Clone iipsrv repo
6880
WORKDIR /tmp
69-
RUN git clone --depth 1 --branch iipsrv-1.1 https://github.com/ruven/iipsrv
81+
RUN git clone --depth 1 --branch "${IIPSRV_BUILD_REF}" https://github.com/ruven/iipsrv
7082

7183
# Build iipsrv binary
72-
WORKDIR iipsrv
84+
WORKDIR /tmp/iipsrv
7385
RUN ./autogen.sh && \
7486
./configure && \
7587
make

0 commit comments

Comments
 (0)