X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker%2FDockerfile.redis;h=044644c2dc2c3f629c885570a8a4f7b113701058;hb=8b416f09c290e434ca42c69edd894a4fb8b91db1;hp=d97625b99c6e65edfc5cb004790d26323969c831;hpb=500140607e04314dfc739b106a825707f14ac0fa;p=ric-plt%2Fdbaas.git diff --git a/docker/Dockerfile.redis b/docker/Dockerfile.redis index d97625b..044644c 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 \ @@ -60,7 +60,7 @@ RUN ./autogen.sh && \ ./configure --disable-unit-test-memcheck && \ make test -FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-alpine3:12-a3.11 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 @@ -70,9 +70,21 @@ RUN ./autogen.sh && \ make test && \ make install +# Build sdlcli -tool +RUN cd /go/src && \ + git clone "https://gerrit.o-ran-sc.org/r/ric-plt/sdlgo" && \ + cd sdlgo && \ + go build -v -o /usr/local/bin/sdlcli cmd/sdlcli/main.go -FROM redis:5.0.5-alpine3.9 as build +FROM redis:5.0.9-alpine3.11 as build + +RUN apk --update add --upgrade --no-cache \ + apk-tools \ + openssl \ + ssl_client \ + musl-utils \ + busybox -RUN apk add curl COPY --from=build-env /usr/local/libexec/redismodule/libredismodule.so /usr/local/libexec/redismodule/libredismodule.so +COPY --from=build-env /usr/local/bin/sdlcli /usr/local/bin/ WORKDIR /data