From 44757b3478fa838ecab3ba42b2ec7aab0c30ecf4 Mon Sep 17 00:00:00 2001 From: ebo Date: Fri, 10 Apr 2020 18:51:59 +0100 Subject: netconf-pnp-simulator: fix invalid ref to libssh v0.8.8 This version was upgraded to 0.8.9 on 2020-04-09. Fortunately the new 0.9.4 fixes the bug that was forcing us to use the old 0.8.x Issue-ID: INT-1124 Change-Id: I6dacac8925af047d2e5342a76da6eb221074ddd9 Signed-off-by: ebo --- test/mocks/netconf-pnp-simulator/engine/Dockerfile | 9 ++++----- test/mocks/netconf-pnp-simulator/engine/container-tag.yaml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'test/mocks/netconf-pnp-simulator') diff --git a/test/mocks/netconf-pnp-simulator/engine/Dockerfile b/test/mocks/netconf-pnp-simulator/engine/Dockerfile index a5d17c5e8..a3f8b6ac4 100644 --- a/test/mocks/netconf-pnp-simulator/engine/Dockerfile +++ b/test/mocks/netconf-pnp-simulator/engine/Dockerfile @@ -37,6 +37,7 @@ RUN set -eux \ file \ git \ libev-dev \ + libssh-dev \ openssh-keygen \ openssl \ openssl-dev \ @@ -45,10 +46,9 @@ RUN set -eux \ protobuf-c-dev \ swig \ # for troubleshooting + ctags \ the_silver_searcher \ - vim \ - # v0.9.3 has somes bugs as warned in libnetconf2/CMakeLists.txt:237 - && apk add --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/main libssh-dev==0.8.8-r0 + vim RUN git config --global advice.detachedHead false @@ -152,12 +152,11 @@ RUN set -eux \ coreutils \ libcurl \ libev \ + libssh \ openssl \ pcre \ protobuf-c \ xmlstarlet \ - # v0.9.3 has somes bugs as warned in libnetconf2/CMakeLists.txt:237 - && apk add --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/main libssh==0.8.8-r0 \ && rm -rf /var/cache/apk/* COPY --from=build /opt/ /opt/ diff --git a/test/mocks/netconf-pnp-simulator/engine/container-tag.yaml b/test/mocks/netconf-pnp-simulator/engine/container-tag.yaml index ac1e66329..75e0ac656 100644 --- a/test/mocks/netconf-pnp-simulator/engine/container-tag.yaml +++ b/test/mocks/netconf-pnp-simulator/engine/container-tag.yaml @@ -1 +1 @@ -tag: "2.8.1" +tag: "2.8.2" -- cgit 1.2.3-korg