Skip to content

Commit 7ed447a

Browse files
committed
Minor refactoring of builder image
1 parent cad52ac commit 7ed447a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maven Docker Builder
22

3-
Implementation of Docker builder image approach with Apache Maven.
3+
Docker builder pattern with Apache Maven.
44

55
## Building
66

builder-image/src/main/resources/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ RUN ln -snf "/usr/share/zoneinfo/${TZ}" /etc/localtime && \
1212
libstdc++-9-dev
1313

1414
ADD ["cmake.tar.gz", "/opt"]
15-
ADD ["boost.tar.gz", "/opt"]
15+
ADD ["boost.tar.gz", "/usr/local/lib"]
1616

1717
ENV PATH="/opt/cmake-@cmake.version@-Linux-x86_64/bin:${PATH}" \
18-
BOOST_DIR="/opt/boost-@boost.version@-x64-gcc9"
18+
BOOST_HOME="/usr/local/lib/boost-@boost.version@-x64-gcc9"
1919

2020
RUN revision="@app.version@" && \
2121
output_file="@output.file@" && \
@@ -28,8 +28,8 @@ RUN revision="@app.version@" && \
2828
-D CMAKE_BUILD_TYPE=RELEASE \
2929
-D Boost_USE_STATIC_LIBS=ON \
3030
-D Boost_NO_SYSTEM_PATHS=ON \
31-
-D BOOST_INCLUDEDIR="${BOOST_DIR}/include" \
32-
-D BOOST_LIBRARYDIR="${BOOST_DIR}/lib" \
31+
-D BOOST_INCLUDEDIR="${BOOST_HOME}/include" \
32+
-D BOOST_LIBRARYDIR="${BOOST_HOME}/lib" \
3333
-D MA_TESTS=OFF \
3434
-D MA_QT=OFF \
3535
-S "${source_dir}" \

0 commit comments

Comments
 (0)