Code Review
/
ric-plt
/
ricdms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Documentation for RICDMS deployment manifest
[ric-plt/ricdms.git]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
index
0d5642f
..
0648d88
100644
(file)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-14,7
+14,7
@@
#-----------------------------------------------------------
#-----------------------------------------------------------
-FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu
18-c-go:1.9
.0 AS dms-build
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu
20-c-go:1.1
.0 AS dms-build
RUN apt-get update -y && apt-get install -y jq
RUN apt-get update -y && apt-get install -y jq
@@
-42,7
+42,7
@@
WORKDIR "/go/src/ws"
# Module prepare (if go.mod/go.sum updated)
COPY go.mod /go/src/ws
COPY go.sum /go/src/ws
# Module prepare (if go.mod/go.sum updated)
COPY go.mod /go/src/ws
COPY go.sum /go/src/ws
-RUN
GO111MODULE=on
go mod download
+RUN go mod download
# build and test
COPY . /go/src/ws
# build and test
COPY . /go/src/ws
@@
-51,10
+51,11
@@
COPY . /go/src/ws
RUN /go/bin/swagger generate server -f api/ric-dms-api-2.0.yaml -t pkg/ --exclude-main
# Build the code
RUN /go/bin/swagger generate server -f api/ric-dms-api-2.0.yaml -t pkg/ --exclude-main
# Build the code
-RUN
GO111MODULE=on GO_ENABLED=0 GOOS=linux
go build -a -installsuffix cgo -o /go/src/ws/cache/go/cmd/ric-dms cmd/ric-dms.go
+RUN go build -a -installsuffix cgo -o /go/src/ws/cache/go/cmd/ric-dms cmd/ric-dms.go
# Run unit tests
# Run unit tests
-#RUN GO111MODULE=on GO_ENABLED=0 GOOS=linux go test -p 1 -cover ./pkg/resthooks/
+ENV RIC_DMS_CONFIG_FILE=/go/src/ws/config/config-test.yaml
+RUN go test -p 1 -cover ./pkg/resthooks/
RUN gofmt -l $(find cmd/ pkg/ -name '*.go' -not -name '*_test.go')
RUN gofmt -l $(find cmd/ pkg/ -name '*.go' -not -name '*_test.go')
@@
-62,7
+63,7
@@
CMD ["/bin/bash"]
#----------------------------------------------------------
#----------------------------------------------------------
-FROM ubuntu:
18
.04 as ric-dms
+FROM ubuntu:
20
.04 as ric-dms
RUN apt-get update -y \
&& apt-get install --reinstall -y sudo openssl ca-certificates ca-cacert \
RUN apt-get update -y \
&& apt-get install --reinstall -y sudo openssl ca-certificates ca-cacert \