szaszm commented on a change in pull request #1094:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1094#discussion_r645159423
##########
File path: cmake/DockerConfig.cmake
##########
@@ -65,10 +65,19 @@ add_custom_target(
COMMAND ${CMAKE_SOURCE_DIR}/docker/DockerBuild.sh
-u 1000
-g 1000
+ -t minimal
-v
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
- -i minimal
+ -c ENABLE_PYTHON=OFF
+ -c ENABLE_LIBRDKAFKA=ON
+ -c ENABLE_AWS=ON
+ -c DISABLE_CONTROLLER=ON
+ -c DISABLE_SCRIPTING=ON
+ -c DISABLE_PYTHON_SCRIPTING=ON
+ -c DISABLE_ENCRYPT_CONFIG=ON
+ -c AWS_ENABLE_UNITY_BUILD=OFF
-c DOCKER_BASE_IMAGE=${DOCKER_BASE_IMAGE}
-c BUILD_NUMBER=${BUILD_NUMBER}
+ -c CMAKE_BUILD_TYPE=MinSizeRel
Review comment:
I don't think a minimal image should mean size-optimized. I'd rather
have inlining unless it's about as embedded as an arduino.
##########
File path: thirdparty/openwsman/openwsman.patch
##########
@@ -79,3 +79,39 @@ diff -rupN orig/src/lib/wsman-soap.c
patched/src/lib/wsman-soap.c
max_connections_per_thread = (* fptr)();
}
else{
+
+diff -rupN orig/src/lib/u/lock.c patched/src/lib/u/lock.c
+--- orig/src/lib/u/lock.c 2021-05-31 13:44:43.992941115 +0200
++++ patched/src/lib/u/lock.c 2021-05-31 12:00:21.972733061 +0200
+@@ -50,7 +50,7 @@
+ extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type);
+ #endif
+
+-#if defined (__SVR4) && defined (__sun)
++#if (defined (__SVR4) && defined (__sun)) || !defined(__GLIBC__)
Review comment:
why?
##########
File path: CMakeLists.txt
##########
@@ -583,8 +583,11 @@ add_subdirectory(main)
add_subdirectory(nanofi)
add_dependencies(nanofi minifiexe)
-add_subdirectory(encrypt-config)
-add_dependencies(encrypt-config minifi)
+option(DISABLE_ENCRYPT_CONFIG "Disables build of encrypt-config binary." OFF)
+if (NOT DISABLE_ENCRYPT_CONFIG)
Review comment:
There was a discussion about double negatives in the ConsumeJournald PR.
It should apply here, too.
https://github.com/apache/nifi-minifi-cpp/pull/1044#discussion_r622005451
##########
File path: thirdparty/openwsman/openwsman.patch
##########
@@ -79,3 +79,39 @@ diff -rupN orig/src/lib/wsman-soap.c
patched/src/lib/wsman-soap.c
max_connections_per_thread = (* fptr)();
}
else{
+
+diff -rupN orig/src/lib/u/lock.c patched/src/lib/u/lock.c
+--- orig/src/lib/u/lock.c 2021-05-31 13:44:43.992941115 +0200
++++ patched/src/lib/u/lock.c 2021-05-31 12:00:21.972733061 +0200
+@@ -50,7 +50,7 @@
+ extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type);
+ #endif
+
+-#if defined (__SVR4) && defined (__sun)
++#if (defined (__SVR4) && defined (__sun)) || !defined(__GLIBC__)
+ #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+ #endif
+
+@@ -94,7 +94,7 @@ void u_destroy_lock(void* data)
+ void u_unlock(void* data)
+ {
+ if ( data )
+- {
++ {
+ pthread_mutex_unlock((pthread_mutex_t*)data);
+ }
+ }
+
+diff -rupN orig/include/u/lock.h patched/include/u/lock.h
+--- orig/include/u/lock.h 2021-05-31 13:44:43.992941115 +0200
++++ patched/include/u/lock.h 2021-05-31 12:00:30.792726402 +0200
+@@ -2,7 +2,7 @@
+ #ifndef LOCKING_H
+ #define LOCKING_H
+
+-#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
|| defined (__APPLE__)
++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
|| defined (__APPLE__) || !defined(__GLIBC__)
Review comment:
why?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
