Code Review
/
ric-plt
/
o1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
updating to ubuntu20
[ric-plt/o1.git]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
index
e89a3f2
..
17cc7c4
100755
(executable)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-14,7
+14,7
@@
# limitations under the License.
#----------------------------------------------------------
# limitations under the License.
#----------------------------------------------------------
-FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu
18-c-go:1.9
.0 AS o1mediator-build
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu
20-c-go:1.0
.0 AS o1mediator-build
RUN apt update && apt install --reinstall -y \
ca-certificates \
RUN apt update && apt install --reinstall -y \
ca-certificates \
@@
-38,8
+38,10
@@
RUN apt-get update -y && apt-get install -y jq \
swig \
iputils-ping \
python-dev
swig \
iputils-ping \
python-dev
-
-ENV PATH="/usr/local/go/bin:${PATH}"
+#ENV GOLANG_VERSION 1.13.10
+#RUN wget --quiet https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \
+# && tar xvzf go$GOLANG_VERSION.linux-amd64.tar.gz -C /usr/local
+#ENV PATH="/usr/local/go/bin:${PATH}"
ENV GOPATH="/go"
# ======================================================================
ENV GOPATH="/go"
# ======================================================================
@@
-160,9
+162,9
@@
RUN /usr/local/bin/sysrepoctl -i /go/src/ws/agent/yang/o-ran-sc-ric-alarm-v1.yan
CMD ["/bin/bash"]
#----------------------------------------------------------
CMD ["/bin/bash"]
#----------------------------------------------------------
-FROM ubuntu:
18
.04 as o1mediator
+FROM ubuntu:
20
.04 as o1mediator
-RUN apt-get update -y && apt-get install -y jq \
+RUN apt-get update -y &&
DEBIAN_FRONTEND=noninteractive
apt-get install -y jq \
net-tools \
tcpdump \
netcat \
net-tools \
tcpdump \
netcat \
@@
-170,7
+172,7
@@
RUN apt-get update -y && apt-get install -y jq \
nano \
supervisor \
openssl \
nano \
supervisor \
openssl \
- python-pip \
+ python
3
-pip \
libpcre3-dev \
pkg-config \
libavl-dev \
libpcre3-dev \
pkg-config \
libavl-dev \