This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 25882c125acebbb899ad24861052156e44584119 Author: Gabor Gyimesi <[email protected]> AuthorDate: Sat Dec 7 15:17:23 2024 +0100 MINIFICPP-2497 Remove alpine-conf package from docker image Closes #1906 Signed-off-by: Marton Szasz <[email protected]> --- docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 68e4645a1..a7e5a2122 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -93,12 +93,13 @@ ENV MINIFI_VERSIONED_HOME ${MINIFI_BASE_DIR}/nifi-minifi-cpp-${MINIFI_VERSION} RUN addgroup -g ${GID} ${USER} && adduser -u ${UID} -D -G ${USER} -g "" ${USER} && \ install -d -o ${USER} -g ${USER} ${MINIFI_BASE_DIR} && ln -s ${MINIFI_VERSIONED_HOME} ${MINIFI_HOME} && \ apk add --no-cache libstdc++ tzdata alpine-conf && \ - if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_PYTHON_SCRIPTING=ON"; then apk add --no-cache python3; fi + if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_PYTHON_SCRIPTING=ON"; then apk add --no-cache python3; fi && \ + setup-timezone -z UTC && \ + apk del alpine-conf # Copy built minifi distribution from builder COPY --from=build --chown=${USER}:${USER} ${MINIFI_VERSIONED_HOME} ${MINIFI_HOME} COPY --from=build --chown=${USER}:${USER} ${MINIFI_BASE_DIR}/docker/conf/minifi-log.properties ${MINIFI_HOME}/conf/minifi-log.properties -RUN setup-timezone -z UTC USER ${USER} WORKDIR ${MINIFI_HOME}
