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 7f26a9042984a333cdd689a768f4eb7304e13155 Author: Martin Zink <[email protected]> AuthorDate: Tue Jun 21 23:04:02 2022 +0200 MINIFICPP-1867 added tzdata to docker-minimal ... and set the image timezone to UTC. Because the Cron scheduler and some EL functions require the timezone database to be present, but it was not. Closes #1356 Signed-off-by: Marton Szasz <[email protected]> --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 404a87a0a..565a51357 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -163,7 +163,7 @@ ENV PATH ${PATH}:/usr/lib/jvm/default-jvm/bin 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++ && \ + apk add --no-cache libstdc++ tzdata alpine-conf && \ if [ "$ENABLE_GPS" = "ON" ]; then apk add --no-cache gpsd; fi && \ if [ "$ENABLE_JNI" = "ON" ]; then apk add --no-cache openjdk8-jre-base; fi && \ if [ "$ENABLE_PCAP" = "ON" ]; then apk add --no-cache libpcap; fi && \ @@ -175,6 +175,7 @@ RUN addgroup -g ${GID} ${USER} && adduser -u ${UID} -D -G ${USER} -g "" ${USER} # 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}
