Code Review
/
sim
/
o1-interface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add supoprt for D release use-case.
[sim/o1-interface.git]
/
ntsimulator
/
deploy
/
o-ran
/
local.Dockerfile
diff --git
a/ntsimulator/deploy/nts-manager/ubuntu.Dockerfile
b/ntsimulator/deploy/o-ran/local.Dockerfile
similarity index 71%
rename from
ntsimulator/deploy/nts-manager/ubuntu.Dockerfile
rename to
ntsimulator/deploy/o-ran/local.Dockerfile
index
4978e0d
..
765bace
100644
(file)
--- a/
ntsimulator/deploy/nts-manager/ubuntu.Dockerfile
+++ b/
ntsimulator/deploy/o-ran/local.Dockerfile
@@
-17,18
+17,16
@@
#### DEVICE ####
################
#### DEVICE ####
################
-FROM
nexus3.o-ran-sc.org:10004/
o-ran-sc/nts-ng-base:latest
+FROM o-ran-sc/nts-ng-base:latest
LABEL maintainer="alexandru.stancu@highstreet-technologies.com / adrian.lita@highstreet-technologies.com"
# ntsim-ng configuration and deployment
COPY ./yang /opt/dev/deploy/yang
LABEL maintainer="alexandru.stancu@highstreet-technologies.com / adrian.lita@highstreet-technologies.com"
# ntsim-ng configuration and deployment
COPY ./yang /opt/dev/deploy/yang
+COPY ./data /opt/dev/deploy/data
COPY ./config.json /opt/dev/ntsim-ng/config/config.json
# ntsim-ng init docker
COPY ./config.json /opt/dev/ntsim-ng/config/config.json
# ntsim-ng init docker
-RUN /opt/dev/ntsim-ng/ntsim-ng --docker-init -w /opt/dev/ntsim-ng
-
-# supervisor configuration
-COPY ./supervisord.conf /etc/supervisord.conf
+RUN /opt/dev/ntsim-ng/ntsim-ng --container-init -w /opt/dev/ntsim-ng
# finishing container build
ARG BUILD_DATE
# finishing container build
ARG BUILD_DATE
@@
-38,13
+36,8
@@
LABEL build-date=$BUILD_DATE
EXPOSE 830-929
EXPOSE 21-22
EXPOSE 830-929
EXPOSE 21-22
-# host IP address to bind to
-ENV NETCONF_NTS_HOST_IP=127.0.0.1
-# starting port for host allocation
-ENV NETCONF_NTS_HOST_BASE_PORT=50000
-
-ENV DOCKER_ENGINE_VERSION=1.40
+ENV NTS_FUNCTION_TYPE=NTS_FUNCTION_TYPE_O_RAN_FH
# run
WORKDIR /opt/dev/workspace
# run
WORKDIR /opt/dev/workspace
-CMD ["
sh", "-c", "/usr/bin/supervisord -c /etc/supervisord.conf
"]
+CMD ["
/opt/dev/ntsim-ng/ntsim-ng", "-w/opt/dev/ntsim-ng", "--supervisor
"]