[nifi-minifi-cpp] branch main updated: MINIFICPP-2036 Handle different ccache directory locations

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/main by this push:
     new c172824f1 MINIFICPP-2036 Handle different ccache directory locations
c172824f1 is described below

commit c172824f1302617aa569a03f049a01b37ab12f7c
Author: Ferenc Gerlits <fg...@gmail.com>
AuthorDate: Thu Feb 2 10:01:30 2023 +0100

    MINIFICPP-2036 Handle different ccache directory locations
    
    Signed-off-by: Adam Debreceni <ad...@apache.org>
    
    This closes #1500
---
 docker/DockerBuild.sh    | 2 +-
 docker/Dockerfile        | 7 +++----
 docker/centos/Dockerfile | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/DockerBuild.sh b/docker/DockerBuild.sh
index 3f6ed54b3..0f53f7f77 100755
--- a/docker/DockerBuild.sh
+++ b/docker/DockerBuild.sh
@@ -51,7 +51,7 @@ function dump_ccache() {
   docker_ccache_dump_location=$2
   container_id=$(docker run --rm -d "${ccache_source_image}" sh -c "while true; do sleep 1; done")
   mkdir -p "${docker_ccache_dump_location}"
-  docker cp "${container_id}:/home/minificpp/.ccache/." "${docker_ccache_dump_location}"
+  docker cp "${container_id}:/opt/minifi/.ccache/." "${docker_ccache_dump_location}"
   docker rm -f "${container_id}"
 }
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d5bdb0117..160208923 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -72,18 +72,17 @@ ENV MINIFI_VERSION ${MINIFI_VERSION}
 RUN addgroup -g ${GID} ${USER} && adduser -u ${UID} -D -G ${USER} -g "" ${USER} && \
     install -d -o ${USER} -g ${USER} ${MINIFI_BASE_DIR}
 COPY --chown=${USER}:${USER} . ${MINIFI_BASE_DIR}
-RUN if [ -d "${MINIFI_BASE_DIR}/.ccache" ]; then mv ${MINIFI_BASE_DIR}/.ccache /home/${USER}/.ccache; fi
 
 USER ${USER}
 
-ENV PATH /usr/lib/ccache/bin:${PATH}
 RUN mkdir ${MINIFI_BASE_DIR}/build
 WORKDIR ${MINIFI_BASE_DIR}/build
-RUN cmake -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS} ${MINIFI_OPTIONS} -DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \
+RUN export PATH=/usr/lib64/ccache/bin${PATH:+:${PATH}} && \
+    export CCACHE_DIR=${MINIFI_BASE_DIR}/.ccache && \
+    cmake -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS} ${MINIFI_OPTIONS} -DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \
     make -j "$(nproc)" package && \
     tar -xzvf "${MINIFI_BASE_DIR}/build/nifi-minifi-cpp-${MINIFI_VERSION}.tar.gz" -C "${MINIFI_BASE_DIR}"
 
-
 # Release image
 FROM ${BASE_ALPINE_IMAGE} AS release
 LABEL maintainer="Apache NiFi <de...@nifi.apache.org>"
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index 7b8307bf4..be82d8571 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -49,8 +49,7 @@ RUN cd $MINIFI_BASE_DIR && \
 
 # Setup minificpp user
 RUN groupadd -g ${GID} ${USER} && useradd -g ${GID} ${USER} && \
-    chown -R ${USER}:${USER} ${MINIFI_BASE_DIR} && \
-    if [ -d "${MINIFI_BASE_DIR}/.ccache" ]; then mv ${MINIFI_BASE_DIR}/.ccache /home/${USER}/.ccache; fi
+    chown -R ${USER}:${USER} ${MINIFI_BASE_DIR}
 
 USER ${USER}
 
@@ -59,5 +58,6 @@ RUN cd $MINIFI_BASE_DIR && \
     cd build && \
     source /opt/rh/devtoolset-11/enable && \
     export PATH=/usr/lib64/ccache${PATH:+:${PATH}} && \
+    export CCACHE_DIR=${MINIFI_BASE_DIR}/.ccache && \
     cmake3 -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS} ${MINIFI_OPTIONS} -DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \
     make -j "$(nproc)" package