This is an automated email from the ASF dual-hosted git repository.
phrocker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 0accdf6 MINIFICPP-701 - update alpine in docker image to 3.8
0accdf6 is described below
commit 0accdf677f3276a969c2af567b7dc823afdede75
Author: Dustin Rodrigues <[email protected]>
AuthorDate: Thu Jan 3 12:43:16 2019 -0500
MINIFICPP-701 - update alpine in docker image to 3.8
This closes #466.
Signed-off-by: Marc Parisi <[email protected]>
---
docker/Dockerfile | 4 ++--
thirdparty/libarchive-3.3.2/libarchive/archive_openssl_hmac_private.h | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e66b568..2b414f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,7 +18,7 @@
# First stage: the build environment
# Edge required for rocksdb
-FROM alpine:3.5 AS builder
+FROM alpine:3.8 AS builder
MAINTAINER Apache NiFi <[email protected]>
ARG UID
@@ -73,7 +73,7 @@ RUN cd $MINIFI_BASE_DIR \
# Second stage: the runtime image
# Edge required for rocksdb
-FROM alpine:3.5
+FROM alpine:3.8
ARG UID
ARG GID
diff --git
a/thirdparty/libarchive-3.3.2/libarchive/archive_openssl_hmac_private.h
b/thirdparty/libarchive-3.3.2/libarchive/archive_openssl_hmac_private.h
index 59f95b8..b4718f2 100644
--- a/thirdparty/libarchive-3.3.2/libarchive/archive_openssl_hmac_private.h
+++ b/thirdparty/libarchive-3.3.2/libarchive/archive_openssl_hmac_private.h
@@ -28,7 +28,8 @@
#include <openssl/hmac.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline HMAC_CTX *HMAC_CTX_new(void)
