Skip to content

Commit cad52ac

Browse files
committed
Turned off unused and danger filtering of Dockerfile performed by docker-maven-plugin by default
1 parent 7d08401 commit cad52ac

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

app-image/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<build>
8484
<contextDir>${project.build.directory}/context</contextDir>
8585
<cleanup>${docker.cleanup}</cleanup>
86+
<filter>false</filter>
8687
</build>
8788
</image>
8889
</images>

builder-image/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
<build>
9494
<contextDir>${project.build.directory}/context</contextDir>
9595
<cleanup>${docker.cleanup}</cleanup>
96+
<filter>false</filter>
9697
</build>
9798
</image>
9899
</images>

builder-image/src/main/resources/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN ln -snf "/usr/share/zoneinfo/${TZ}" /etc/localtime && \
1414
ADD ["cmake.tar.gz", "/opt"]
1515
ADD ["boost.tar.gz", "/opt"]
1616

17-
ENV CMAKE_DIR="/opt/cmake-@cmake.version@-Linux-x86_64" \
17+
ENV PATH="/opt/cmake-@cmake.version@-Linux-x86_64/bin:${PATH}" \
1818
BOOST_DIR="/opt/boost-@boost.version@-x64-gcc9"
1919

2020
RUN revision="@app.version@" && \
@@ -23,7 +23,7 @@ RUN revision="@app.version@" && \
2323
git clone "https://github.com/mabrarov/asio_samples.git" "${source_dir}" && \
2424
git -C "${source_dir}" checkout "${revision}" && \
2525
build_dir="$(mktemp -d)" && \
26-
"${CMAKE_DIR}/bin/cmake" \
26+
cmake \
2727
-D CMAKE_SKIP_BUILD_RPATH=ON \
2828
-D CMAKE_BUILD_TYPE=RELEASE \
2929
-D Boost_USE_STATIC_LIBS=ON \
@@ -34,7 +34,7 @@ RUN revision="@app.version@" && \
3434
-D MA_QT=OFF \
3535
-S "${source_dir}" \
3636
-B "${build_dir}" && \
37-
"${CMAKE_DIR}/bin/cmake" --build "${build_dir}" --target ma_echo_server && \
37+
cmake --build "${build_dir}" --target ma_echo_server && \
3838
mkdir -p "$(dirname "${output_file}")" && \
3939
tar -C "${build_dir}/examples/ma_echo_server" -czf "${output_file}" ma_echo_server && \
4040
rm -rf "${build_dir}" && \

0 commit comments

Comments
 (0)