Skip to content

Commit 7f521bd

Browse files
committed
restructure Dockerfile a little bit
1 parent 199f4dd commit 7f521bd

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

Dockerfile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN \
1919
automake16 \
2020
libpng-devel \
2121
nasm wget tar zlib-devel curl-devel zip libjpeg-devel rsync git ssh bzip2 automake \
22+
jq-libs jq-devel jq xz-devel openssl-devel \
2223
glib2-devel libtiff-devel pkg-config libcurl-devel; # required for pkg-config
2324

2425

@@ -132,8 +133,6 @@ RUN \
132133
&& make install DESTDIR=
133134

134135
RUN \
135-
yum install -y \
136-
openssl-devel ; \
137136
git clone https://github.com/PDAL/PDAL.git; \
138137
cd PDAL; \
139138
git checkout $PDAL_VERSION; \
@@ -157,8 +156,6 @@ RUN \
157156
make ; make install; make install DESTDIR= ;
158157

159158
RUN \
160-
yum install -y \
161-
xz-devel; \
162159
git clone https://github.com/connormanning/entwine.git; \
163160
cd entwine; \
164161
git checkout $ENTWINE_VERSION; \
@@ -170,12 +167,8 @@ RUN \
170167
make -j4 && \
171168
make install DESTDIR= ;
172169

173-
RUN \
174-
yum install -y \
175-
jq-libs jq-devel jq
176-
177170
RUN rm /build/usr/lib/*.la ; rm /build/usr/lib/*.a
178-
RUN rm /build/usr/lib64/*.la ; rm /build/usr/lib64/*.a
171+
RUN rm /build/usr/lib64/*.a
179172
RUN ldconfig
180173
ADD package-pdal.sh /
181174

0 commit comments

Comments
 (0)