[SEBA-315] Make kafkaloghandler standalone
[SEBA-314] Update multistructlog version
Change-Id: If013b45f8dfb12a9319fbae600d56250965608b5
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index a6f38b6..67dd70f 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/chameleon
-FROM xosproject/xos-base:2.1.21
+FROM xosproject/xos-base:2.1.22
# xos-base already has protoc and dependencies installed
diff --git a/containers/xos/Dockerfile.client b/containers/xos/Dockerfile.client
index 89b578b..f2fd717 100644
--- a/containers/xos/Dockerfile.client
+++ b/containers/xos/Dockerfile.client
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-client
-FROM xosproject/xos-libraries:2.1.21
+FROM xosproject/xos-libraries:2.1.22
# Install XOS client
COPY xos/xos_client /tmp/xos_client
diff --git a/containers/xos/Dockerfile.libraries b/containers/xos/Dockerfile.libraries
index 4513a2d..801c93e 100644
--- a/containers/xos/Dockerfile.libraries
+++ b/containers/xos/Dockerfile.libraries
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-libraries
-FROM xosproject/xos-base:2.1.21
+FROM xosproject/xos-base:2.1.22
# Add libraries
COPY lib /opt/xos/lib
@@ -23,8 +23,7 @@
RUN cd /opt/xos/lib/xos-util && python setup.py install \
&& cd /opt/xos/lib/xos-config && python setup.py install \
&& cd /opt/xos/lib/xos-genx && python setup.py install \
- && cd /opt/xos/lib/xos-kafka && python setup.py install \
- && cd /opt/xos/lib/kafkaloghandler && python setup.py install
+ && cd /opt/xos/lib/xos-kafka && python setup.py install
# Label image
ARG org_label_schema_schema_version=1.0
diff --git a/containers/xos/Dockerfile.synchronizer-base b/containers/xos/Dockerfile.synchronizer-base
index 35590ab..82cbd49 100644
--- a/containers/xos/Dockerfile.synchronizer-base
+++ b/containers/xos/Dockerfile.synchronizer-base
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-synchronizer-base
-FROM xosproject/xos-client:2.1.21
+FROM xosproject/xos-client:2.1.22
COPY xos/synchronizers/new_base /opt/xos/synchronizers/new_base
COPY xos/xos/logger.py /opt/xos/xos/logger.py
diff --git a/containers/xos/Dockerfile.xos-core b/containers/xos/Dockerfile.xos-core
index b291bc6..bd677ba 100644
--- a/containers/xos/Dockerfile.xos-core
+++ b/containers/xos/Dockerfile.xos-core
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/xos-core
-FROM xosproject/xos-libraries:2.1.21
+FROM xosproject/xos-libraries:2.1.22
# Install XOS
ADD xos /opt/xos
diff --git a/containers/xos/pip_requested.txt b/containers/xos/pip_requested.txt
index a4a7825..34be5b3 100644
--- a/containers/xos/pip_requested.txt
+++ b/containers/xos/pip_requested.txt
@@ -16,10 +16,10 @@
google-api-python-client==1.6.5
grpcio-tools==1.12.0
grpcio==1.12.0
-kafka==1.3.5
+kafkaloghandler==0.8.0
keystoneauth1==3.4.0
mock==2.0.0
-multistructlog==1.5
+multistructlog==2.0.0
netaddr==0.7.19
networkx==1.11
nose==1.3.7
diff --git a/containers/xos/pip_requirements.txt b/containers/xos/pip_requirements.txt
index 49cc324..18666ab 100644
--- a/containers/xos/pip_requirements.txt
+++ b/containers/xos/pip_requirements.txt
@@ -49,14 +49,14 @@
jsonpatch==1.23
jsonpointer==2.0
jsonschema==2.6.0
-kafka==1.3.5
+kafkaloghandler==0.8.0
keystoneauth1==3.4.0
kombu==4.2.1
MarkupSafe==1.0
mock==2.0.0
monotonic==1.5
msgpack==0.5.6
-multistructlog==1.5
+multistructlog==2.0.0
munch==2.3.2
netaddr==0.7.19
netifaces==0.10.7