Code Review
/
ric-plt
/
dbaas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add sdlcli -tool for troubleshooting SDL and Database problems
[ric-plt/dbaas.git]
/
docker
/
Dockerfile.redis
diff --git
a/docker/Dockerfile.redis
b/docker/Dockerfile.redis
index
4b29ff2
..
044644c
100644
(file)
--- 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.
#
# 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:1
9.10
as cpputest-build
+FROM ubuntu:1
8.04
as cpputest-build
RUN apt update && \
apt install -y \
RUN apt update && \
apt install -y \
@@
-38,7
+38,8
@@
RUN apt update && \
libtool \
make \
pkg-config \
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.
# 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
./configure && \
make test
+RUN ./autogen.sh && \
+ ./configure --disable-unit-test-memcheck && \
+ make test
-FROM nexus3.o-ran-sc.org:1000
4/bldr-alpine3:6-a3.9-nng
as build-env
+FROM nexus3.o-ran-sc.org:1000
2/o-ran-sc/bldr-alpine3-go:2.0.0
as build-env
RUN apk add cpputest
COPY ./redismodule /redismodule
RUN apk add cpputest
COPY ./redismodule /redismodule
@@
-66,9
+70,21
@@
RUN ./autogen.sh && \
make test && \
make install
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.9-alpine3.11 as build
-FROM redis:5.0.5-alpine3.9
+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/libexec/redismodule/libredismodule.so /usr/local/libexec/redismodule/libredismodule.so
+COPY --from=build-env /usr/local/bin/sdlcli /usr/local/bin/
WORKDIR /data
WORKDIR /data