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 61f7982b9b05bdc9f6f518126873d1d84268d6c9
Author: Gabor Gyimesi <gamezb...@gmail.com>
AuthorDate: Mon Oct 2 13:57:55 2023 +0200
MINIFICPP-2227 Upgrade docker base image to alpine:3.18
Closes #1667
Signed-off-by: Marton Szasz <sza...@apache.org>
---
cmake/BundledLibcURL.cmake | 2 ++
docker/Dockerfile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/cmake/BundledLibcURL.cmake b/cmake/BundledLibcURL.cmake
index 775a2d7e6..095c2d58d 100644
--- a/cmake/BundledLibcURL.cmake
+++ b/cmake/BundledLibcURL.cmake
@@ -42,6 +42,8 @@ function(use_bundled_curl SOURCE_DIR BINARY_DIR)
-DCURL_DISABLE_CRYPTO_AUTH=ON
-DCURL_CA_PATH=none
-DCURL_USE_LIBSSH2=OFF
+ -DUSE_LIBIDN2=OFF
+ -DCURL_USE_LIBPSL=OFF
-DCMAKE_DEBUG_POSTFIX=
-DHAVE_GLIBC_STRERROR_R=1
-DHAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT=""
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 934f0a3f1..d4092357f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,7 +16,7 @@
# under the License.
#
-ARG BASE_IMAGE="alpine:3.17"
+ARG BASE_IMAGE="alpine:3.18"
# Build image
FROM ${BASE_IMAGE} AS build
