X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=0648d881d9fa2ddcbb7933a93493ff58987622e1;hb=c1e4374fb522f55e9263dd2deca3d244e709ebdf;hp=e180c14b226d68f64a7ba39a217aaf846a1210cd;hpb=004ddf010f157b94811766443cbee56fcfa4d00e;p=ric-plt%2Fricdms.git

diff --git a/Dockerfile b/Dockerfile
index e180c14..0648d88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
 
 #-----------------------------------------------------------
 
-FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 AS dms-build
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu20-c-go:1.1.0 AS dms-build
 
 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
-RUN GO111MODULE=on go mod download
+RUN go mod download
 
 # 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 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 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')
 
@@ -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 \
@@ -75,8 +76,12 @@ RUN mkdir -p /opt/dms \
     && chmod -R 755 /opt/dms
 
 COPY --from=dms-build /go/src/ws/cache/go/cmd/ric-dms /opt/dms/ric-dms
-
+COPY --from=dms-build /go/src/ws/config/config.yaml /opt/dms/config.yaml
 WORKDIR /opt/dms
 
 COPY dms-entrypoint.sh /opt/dms/
+
+ARG default_config=/opt/dms/config.yaml
+ENV RIC_DMS_CONFIG_FILE=$default_config
+
 ENTRYPOINT ["/opt/dms/dms-entrypoint.sh"]
\ No newline at end of file