Skip to content

Commit ffdfb0e

Browse files
committed
update libs
1 parent 45d56c5 commit ffdfb0e

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

base/gdal2.4/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ WORKDIR /opt
1212

1313
# versions of packages
1414
ENV \
15-
HDF4_VERSION=4.2.14 \
16-
HDF5_VERSION=1.10.5 \
17-
NETCDF_VERSION=4.6.3 \
18-
LIBPNG_VERSION=1.6.36 \
19-
LIBJPEG_TURBO_VERSION=2.0.4 \
15+
HDF4_VERSION=4.2.15 \
16+
HDF5_VERSION=1.12.0 \
17+
NETCDF_VERSION=4.7.4 \
18+
LIBPNG_VERSION=1.6.37 \
19+
LIBJPEG_TURBO_VERSION=2.0.5 \
2020
OPENJPEG_VERSION=2.3.1 \
21-
PG_VERSION=12.1 \
21+
PG_VERSION=13.0 \
2222
PKGCONFIG_VERSION=0.29.2 \
2323
SZIP_VERSION=2.1.1 \
2424
WEBP_VERSION=1.1.0 \
25-
ZSTD_VERSION=1.4.4
25+
ZSTD_VERSION=1.4.5
2626

2727
ENV LD_LIBRARY_PATH $LD_LIBRARY_PATH:/$PREFIX/lib:/$PREFIX/lib64
2828

@@ -214,7 +214,7 @@ RUN cd /tmp/gdal \
214214
--without-gif \
215215
--without-gnm \
216216
--without-lerc \
217-
--without-libtool \
217+
--without-libtool \
218218
--without-pcraster \
219219
--without-pcidsk
220220

@@ -234,17 +234,17 @@ RUN mkdir /tmp/patchelf \
234234
# Move /lib64 (libjpeg) to /lib
235235
RUN mv $PREFIX/lib64/lib* $PREFIX/lib/
236236

237-
# FIX
237+
# FIX
238238
RUN for i in $PREFIX/bin/*; do patchelf --force-rpath --set-rpath '$ORIGIN/../lib' $i; done
239239

240240
# Build final image
241241
FROM lambci/lambda-base:build as runner
242242

243243
ENV PREFIX /opt
244-
COPY --from=builder /opt/lib/ $PREFIX/lib/
244+
COPY --from=builder /opt/lib/ $PREFIX/lib/
245245
COPY --from=builder /opt/include/ $PREFIX/include/
246246
COPY --from=builder /opt/share/ $PREFIX/share/
247-
COPY --from=builder /opt/bin/ $PREFIX/bin/
247+
COPY --from=builder /opt/bin/ $PREFIX/bin/
248248

249249
ENV \
250250
GDAL_VERSION=2.4.4 \

base/gdal3.1/Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ WORKDIR /opt
1212

1313
# versions of packages
1414
ENV \
15-
HDF4_VERSION=4.2.14 \
16-
HDF5_VERSION=1.10.5 \
17-
NETCDF_VERSION=4.6.3 \
18-
LIBPNG_VERSION=1.6.36 \
19-
LIBJPEG_TURBO_VERSION=2.0.4 \
15+
HDF4_VERSION=4.2.15 \
16+
HDF5_VERSION=1.12.0 \
17+
NETCDF_VERSION=4.7.4 \
18+
LIBPNG_VERSION=1.6.37 \
19+
LIBJPEG_TURBO_VERSION=2.0.5 \
2020
OPENJPEG_VERSION=2.3.1 \
21-
PG_VERSION=12.1 \
21+
PG_VERSION=13.0 \
2222
PKGCONFIG_VERSION=0.29.2 \
2323
SZIP_VERSION=2.1.1 \
2424
WEBP_VERSION=1.1.0 \
25-
ZSTD_VERSION=1.4.4
25+
ZSTD_VERSION=1.4.5
2626

2727
ENV LD_LIBRARY_PATH $LD_LIBRARY_PATH:/$PREFIX/lib:/$PREFIX/lib64
2828

@@ -135,7 +135,7 @@ RUN mkdir /tmp/postgres \
135135

136136
# sqlite
137137
RUN mkdir /tmp/sqlite \
138-
&& curl -sfL https://www.sqlite.org/2020/sqlite-autoconf-3310100.tar.gz | tar zxf - -C /tmp/sqlite --strip-components=1 \
138+
&& curl -sfL https://www.sqlite.org/2020/sqlite-autoconf-3330000.tar.gz | tar zxf - -C /tmp/sqlite --strip-components=1 \
139139
&& cd /tmp/sqlite \
140140
&& CFLAGS="-O2 -Wl,-S" CXXFLAGS="-O2 -Wl,-S" ./configure --prefix=$PREFIX --disable-static \
141141
&& make -j $(nproc) --silent && make install && make clean \
@@ -152,7 +152,7 @@ ENV \
152152
# OSGEO
153153
ENV \
154154
GEOS_VERSION=3.8.1 \
155-
PROJ_VERSION=6.3.1
155+
PROJ_VERSION=7.1.1
156156

157157
# proj
158158
RUN mkdir /tmp/proj \
@@ -215,13 +215,13 @@ RUN cd /tmp/gdal \
215215
--without-gif \
216216
--without-gnm \
217217
--without-lerc \
218-
--without-libtool \
218+
--without-libtool \
219219
--without-pcraster \
220220
--without-pcidsk
221221

222222
RUN cd /tmp/gdal \
223223
&& make -j $(nproc) --silent && make install && make clean \
224-
&& rm -rf /tmp/gdal
224+
&& rm -rf /tmp/gdal
225225

226226
# from https://github.com/pypa/manylinux/blob/d8ef5d47433ba771fa4403fd48f352c586e06e43/docker/build_scripts/build.sh#L133-L138
227227
# Install patchelf (latest with unreleased bug fixes)
@@ -235,17 +235,17 @@ RUN mkdir /tmp/patchelf \
235235
# Move /lib64 (libjpeg) to /lib
236236
RUN mv $PREFIX/lib64/lib* $PREFIX/lib/
237237

238-
# FIX
238+
# FIX
239239
RUN for i in $PREFIX/bin/*; do patchelf --force-rpath --set-rpath '$ORIGIN/../lib' $i; done
240240

241241
# Build final image
242242
FROM lambci/lambda-base:build as runner
243243

244244
ENV PREFIX /opt
245-
COPY --from=builder /opt/lib/ $PREFIX/lib/
245+
COPY --from=builder /opt/lib/ $PREFIX/lib/
246246
COPY --from=builder /opt/include/ $PREFIX/include/
247247
COPY --from=builder /opt/share/ $PREFIX/share/
248-
COPY --from=builder /opt/bin/ $PREFIX/bin/
248+
COPY --from=builder /opt/bin/ $PREFIX/bin/
249249

250250
ENV \
251251
GDAL_VERSION=3.1.0 \

0 commit comments

Comments
 (0)