[SEBA-494] Validating core version matched version requested by synchronizer
Change-Id: Id7018394c70559eae0e424e1e231d8e70b0496de
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index 9079966..6e326dc 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -13,7 +13,8 @@
# limitations under the License.
# xosproject/chameleon
-FROM xosproject/xos-base:2.1.57
+
+FROM xosproject/xos-base:2.2.0
# xos-base already has protoc and dependencies installed
diff --git a/containers/xos/Dockerfile.client b/containers/xos/Dockerfile.client
index e69843c..083d01a 100644
--- a/containers/xos/Dockerfile.client
+++ b/containers/xos/Dockerfile.client
@@ -13,8 +13,8 @@
# limitations under the License.
# xosproject/xos-client
-FROM xosproject/xos-libraries:2.1.57
+FROM xosproject/xos-libraries:2.2.0
# Install XOS client
COPY lib/xos-api /tmp/xos-api
diff --git a/containers/xos/Dockerfile.libraries b/containers/xos/Dockerfile.libraries
index 5432413..4171077 100644
--- a/containers/xos/Dockerfile.libraries
+++ b/containers/xos/Dockerfile.libraries
@@ -13,7 +13,8 @@
# limitations under the License.
# xosproject/xos-libraries
-FROM xosproject/xos-base:2.1.57
+
+FROM xosproject/xos-base:2.2.0
# Add libraries
COPY lib /opt/xos/lib
diff --git a/containers/xos/Dockerfile.synchronizer-base b/containers/xos/Dockerfile.synchronizer-base
index e5c6aca..0110aca 100644
--- a/containers/xos/Dockerfile.synchronizer-base
+++ b/containers/xos/Dockerfile.synchronizer-base
@@ -13,7 +13,8 @@
# limitations under the License.
# xosproject/xos-synchronizer-base
-FROM xosproject/xos-client:2.1.57
+
+FROM xosproject/xos-client:2.2.0
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 c3ef7c7..6d024b9 100644
--- a/containers/xos/Dockerfile.xos-core
+++ b/containers/xos/Dockerfile.xos-core
@@ -13,7 +13,8 @@
# limitations under the License.
# xosproject/xos-core
-FROM xosproject/xos-libraries:2.1.57
+
+FROM xosproject/xos-libraries:2.2.0
# Install XOS
ADD xos /opt/xos
diff --git a/containers/xos/Makefile b/containers/xos/Makefile
index 9b893b7..b17f92e 100644
--- a/containers/xos/Makefile
+++ b/containers/xos/Makefile
@@ -39,15 +39,15 @@
docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-base:${TAG} -f Dockerfile.base .
xos-libraries:
- docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-libraries:${TAG} -f Dockerfile.libraries ../..
+ docker build --no-cache $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-libraries:${TAG} -f Dockerfile.libraries ../..
xos-client:
rm -rf tmp.chameleon
cp -R ../../../../component/chameleon tmp.chameleon
- docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-client:${TAG} -f Dockerfile.client ../..
+ docker build --no-cache $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-client:${TAG} -f Dockerfile.client ../..
xos-core:
- docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-core:${TAG} -f Dockerfile.xos-core ../..
+ docker build --no-cache $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-core:${TAG} -f Dockerfile.xos-core ../..
xos-synchronizer-base:
- docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-synchronizer-base:${TAG} -f Dockerfile.synchronizer-base ../..
+ docker build --no-cache $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}xos-synchronizer-base:${TAG} -f Dockerfile.synchronizer-base ../..
diff --git a/containers/xos/pip_requested.txt b/containers/xos/pip_requested.txt
index 4e17746..c3a3098 100644
--- a/containers/xos/pip_requested.txt
+++ b/containers/xos/pip_requested.txt
@@ -49,3 +49,4 @@
six==1.11.0
structlog==18.1.0
tosca-parser==0.9.0
+semver==2.8.1
diff --git a/containers/xos/pip_requirements.txt b/containers/xos/pip_requirements.txt
index af3f2ae..f8e4ec4 100644
--- a/containers/xos/pip_requirements.txt
+++ b/containers/xos/pip_requirements.txt
@@ -140,3 +140,4 @@
Werkzeug==0.14.1
wrapt==1.10.11
zope.interface==4.5.0
+semver==2.8.1