X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker%2FDockerfile.redis;h=76509193f6c52161b70fce4f9a2b9c0f9e6f5760;hb=refs%2Fchanges%2F32%2F5332%2F4;hp=f3fe3fbe68a8eefaf65547386cbc1661401f5932;hpb=f1d51777ca5f82b3a50c4fcf33d580abf2c43f25;p=ric-plt%2Fdbaas.git diff --git a/docker/Dockerfile.redis b/docker/Dockerfile.redis index f3fe3fb..7650919 100644 --- a/docker/Dockerfile.redis +++ b/docker/Dockerfile.redis @@ -25,7 +25,7 @@ # # NOTE: The valgrind false positive problem could also potentially be solved # with valgrind suppression files but that kind of approach may be fragile. -FROM ubuntu:19.10 as cpputest-build +FROM ubuntu:18.04 as cpputest-build RUN apt update && \ apt install -y \ @@ -38,7 +38,8 @@ RUN apt update && \ libtool \ make \ pkg-config \ - valgrind + valgrind \ + lcov # Cpputest built-in memory checks generate false positives in valgrind. # This is solved by compiling cpputest with memory checking disabled. @@ -55,8 +56,11 @@ RUN ./autogen.sh && \ ./configure && \ make test +RUN ./autogen.sh && \ + ./configure --disable-unit-test-memcheck && \ + make test -FROM nexus3.o-ran-sc.org:10004/bldr-alpine3-go:2-rmr1.13.1 as build-env +FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-go:2.0.0 as build-env RUN apk add cpputest COPY ./redismodule /redismodule @@ -67,7 +71,7 @@ RUN ./autogen.sh && \ make install -FROM redis:5.0.5-alpine3.9 +FROM redis:5.0.9-alpine3.11 as build RUN apk add curl COPY --from=build-env /usr/local/libexec/redismodule/libredismodule.so /usr/local/libexec/redismodule/libredismodule.so