[CORD-3090] Remove Filebeat logging
Change-Id: Ib735bf6170af8d1f71a75bff6de417a54aafc0a6
diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index dd0f13a..b4fe6d7 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -1,4 +1,3 @@
-
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,15 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
# xosproject/vtn-synchronizer
+
FROM xosproject/xos-synchronizer-base:candidate
COPY xos/synchronizer /opt/xos/synchronizers/vtn
COPY VERSION /opt/xos/synchronizers/vtn/
-ENTRYPOINT []
-
WORKDIR "/opt/xos/synchronizers/vtn"
# Label image
@@ -53,4 +50,4 @@
org.opencord.component.xos.vcs-url=$org_opencord_component_xos_vcs_url \
org.opencord.component.xos.vcs-ref=$org_opencord_component_xos_vcs_ref
-CMD bash -c "cd /opt/xos/synchronizers/vtn; ./run-from-api.sh"
+CMD ["/usr/bin/python", "/opt/xos/synchronizers/vtn/vtn-synchronizer.py"]
diff --git a/xos/synchronizer/run-from-api.sh b/xos/synchronizer/run-from-api.sh
deleted file mode 100755
index 70ea7eb..0000000
--- a/xos/synchronizer/run-from-api.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-python vtn-synchronizer.py
diff --git a/xos/synchronizer/vtn-synchronizer.py b/xos/synchronizer/vtn-synchronizer.py
index b5944a8..e1126e5 100755
--- a/xos/synchronizer/vtn-synchronizer.py
+++ b/xos/synchronizer/vtn-synchronizer.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# Copyright 2017-present Open Networking Foundation
#
@@ -13,9 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-#!/usr/bin/env python
-
# This imports and runs ../../xos-observer.py
import importlib
@@ -32,4 +30,3 @@
mod = importlib.import_module("synchronizers.new_base.xos-synchronizer")
mod.main()
-