You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2022/06/22 00:08:09 UTC
[nifi-minifi-cpp] branch main updated (834a2a5e7 -> 7f26a9042)
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
from 834a2a5e7 MINIFICPP-1864 Fix Splunk tests with newer container image
new 4481f2882 MINIFICPP-1863 fixing duplicate entry in PutGCSObject::properties
new 7f26a9042 MINIFICPP-1867 added tzdata to docker-minimal
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docker/Dockerfile | 3 ++-
extensions/gcp/processors/PutGCSObject.h | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
[nifi-minifi-cpp] 02/02: MINIFICPP-1867 added tzdata to docker-minimal
Posted by sz...@apache.org.
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 <ma...@apache.org>
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 <sz...@apache.org>
---
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}
[nifi-minifi-cpp] 01/02: MINIFICPP-1863 fixing duplicate entry in PutGCSObject::properties
Posted by sz...@apache.org.
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 4481f28824a73fcfe7ac8f46575bb58caf7cecc7
Author: Martin Zink <ma...@apache.org>
AuthorDate: Tue Jun 21 23:03:17 2022 +0200
MINIFICPP-1863 fixing duplicate entry in PutGCSObject::properties
Closes #1353
Signed-off-by: Marton Szasz <sz...@apache.org>
---
extensions/gcp/processors/PutGCSObject.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/extensions/gcp/processors/PutGCSObject.h b/extensions/gcp/processors/PutGCSObject.h
index 42d47d560..854dbae62 100644
--- a/extensions/gcp/processors/PutGCSObject.h
+++ b/extensions/gcp/processors/PutGCSObject.h
@@ -58,7 +58,6 @@ class PutGCSObject : public GCSProcessor {
return utils::array_cat(GCSProcessor::properties(), std::array{
Bucket,
Key,
- NumberOfRetries,
ContentType,
MD5Hash,
Crc32cChecksum,