From 557478e170d6f5ffa31fb3014605e6586cbee771 Mon Sep 17 00:00:00 2001 From: Noel Campbell Date: Thu, 3 Nov 2022 15:38:57 -0400 Subject: [PATCH 1/2] Build gssntlmssp from source in Dockerfile --- .../docker/linux/amd64/Dockerfile | 20 +++++++++++++++++++ scripts/linux/buildImage.sh | 1 + 2 files changed, 21 insertions(+) diff --git a/edge-modules/metrics-collector/docker/linux/amd64/Dockerfile b/edge-modules/metrics-collector/docker/linux/amd64/Dockerfile index 60cb61fa2e4..4278104aacf 100755 --- a/edge-modules/metrics-collector/docker/linux/amd64/Dockerfile +++ b/edge-modules/metrics-collector/docker/linux/amd64/Dockerfile @@ -6,6 +6,26 @@ ARG EXE_DIR=. ENV MODULE_NAME "Microsoft.Azure.Devices.Edge.Azure.Monitor.dll" +RUN apk add --no-cache git curl tini util-linux bash neovim openssl + +RUN apk add --no-cache make m4 autoconf automake gcc g++ krb5-dev openssl-dev gettext-dev + +RUN apk add --no-cache libtool libxml2 libxslt libunistring-dev zlib-dev samba-dev + + + +RUN git clone https://github.com/gssapi/gss-ntlmssp + +WORKDIR gss-ntlmssp + +RUN autoreconf -f -i + +RUN ./configure --without-manpages --disable-nls + +RUN make + +RUN make install + WORKDIR /app COPY $EXE_DIR/ ./ diff --git a/scripts/linux/buildImage.sh b/scripts/linux/buildImage.sh index 7389604b348..df000b4e54d 100755 --- a/scripts/linux/buildImage.sh +++ b/scripts/linux/buildImage.sh @@ -22,6 +22,7 @@ DEFAULT_DOCKER_NAMESPACE="microsoft" DOCKER_NAMESPACE=${DEFAULT_DOCKER_NAMESPACE} BUILD_BINARIESDIRECTORY=${BUILD_BINARIESDIRECTORY:=""} SKIP_PUSH=0 +SOURCE_MAP= ############################################################################### # Function to obtain the underlying architecture and check if supported From 7696c537e250c3d400280b76c9ab17926e7ea5e0 Mon Sep 17 00:00:00 2001 From: Noel Campbell Date: Fri, 4 Nov 2022 17:10:59 -0400 Subject: [PATCH 2/2] Edit and copy mech.ntlmssp.conf to appropriate dir --- .../metrics-collector/docker/linux/amd64/Dockerfile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/edge-modules/metrics-collector/docker/linux/amd64/Dockerfile b/edge-modules/metrics-collector/docker/linux/amd64/Dockerfile index 4278104aacf..d1d83ae9188 100755 --- a/edge-modules/metrics-collector/docker/linux/amd64/Dockerfile +++ b/edge-modules/metrics-collector/docker/linux/amd64/Dockerfile @@ -7,24 +7,19 @@ ARG EXE_DIR=. ENV MODULE_NAME "Microsoft.Azure.Devices.Edge.Azure.Monitor.dll" RUN apk add --no-cache git curl tini util-linux bash neovim openssl - RUN apk add --no-cache make m4 autoconf automake gcc g++ krb5-dev openssl-dev gettext-dev - RUN apk add --no-cache libtool libxml2 libxslt libunistring-dev zlib-dev samba-dev - - +RUN apk add libwbclient libunistring libssl1.1 zlib RUN git clone https://github.com/gssapi/gss-ntlmssp - WORKDIR gss-ntlmssp - RUN autoreconf -f -i - RUN ./configure --without-manpages --disable-nls - RUN make - RUN make install +RUN mkdir -p /usr/etc/gss/mech.d +RUN cp examples/mech.ntlmssp /usr/etc/gss/mech.d/mech.ntlmssp.conf +RUN sed -i 's/\${exec_prefix}/\/usr\/local/' /usr/etc/gss/mech.d/mech.ntlmssp.conf WORKDIR /app