Skip to content

Commit 68ffdaf

Browse files
committed
fix(Dockerfile): correct paths for LibRaw and SQLite binaries in installation
1 parent 4f3f75a commit 68ffdaf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN apt-get update \
3939
zlib1g-dev \
4040
&& rm -rf /var/lib/apt/lists/* \
4141
&& npm install --force --location=global npm yarn \
42-
&& mkdir -p /opt/photostructure/tools \
42+
&& mkdir -p /opt/photostructure/tools/bin \
4343
&& mkdir -p /tmp/libraw \
4444
&& cd /tmp/libraw \
4545
&& curl -L https://api.github.com/repos/LibRaw/LibRaw/tarball/0339685891bd485c3568309aaba369afd29bbacd | tar -xz --strip 1 \
@@ -48,16 +48,16 @@ RUN apt-get update \
4848
&& make -j `nproc` \
4949
&& /bin/bash ./libtool --tag=CXX --mode=link g++ -all-static -g -O2 -o bin/dcraw_emu samples/bin_dcraw_emu-dcraw_emu.o lib/libraw.la -ljpeg -lz -lm \
5050
&& /bin/bash ./libtool --tag=CXX --mode=link g++ -all-static -g -O2 -o bin/raw-identify samples/bin_raw_identify-raw-identify.o lib/libraw.la -ljpeg -lz -lm \
51-
&& cp -p bin/dcraw_emu bin/raw-identify /opt/photostructure/tools/ \
51+
&& cp -p bin/dcraw_emu bin/raw-identify /opt/photostructure/tools/bin/ \
5252
&& rm -rf /tmp/libraw \
5353
&& mkdir -p /tmp/sqlite \
5454
&& cd /tmp/sqlite \
5555
&& curl https://sqlite.org/2025/sqlite-autoconf-3510100.tar.gz | tar -xz --strip 1 \
5656
&& ./configure --enable-static --disable-shared --enable-readline \
5757
&& make -j `nproc` \
58-
&& cp -p sqlite3 /opt/photostructure/tools/ \
58+
&& cp -p sqlite3 /opt/photostructure/tools/bin/ \
5959
&& rm -rf /tmp/sqlite \
60-
&& strip /opt/photostructure/tools/*
60+
&& strip /opt/photostructure/tools/bin/*
6161

6262
# Stripped LibRaw and SQLite binaries should now be sitting in
6363
# /opt/photostructure/tools/bin.

0 commit comments

Comments
 (0)