Fixed cassandra image for kubernetes cluster

Added latest version into Makefile script
This commit is contained in:
volodymyr-babak 2017-05-30 16:54:38 +03:00
parent ecb5c50d61
commit 5e2393eeda
8 changed files with 73 additions and 9 deletions

View File

@ -0,0 +1,23 @@
#
# Copyright © 2016-2017 The Thingsboard Authors
#
# 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.
#
FROM cassandra:3.9
ADD ready-probe.sh /ready-probe.sh
RUN chmod +x /ready-probe.sh
CMD ["cassandra", "-f"]

10
docker/cassandra/Makefile Normal file
View File

@ -0,0 +1,10 @@
VERSION=1.2.4
PROJECT=thingsboard
APP=cassandra
build:
docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
push: build
docker push ${PROJECT}/${APP}:${VERSION}
docker push ${PROJECT}/${APP}:latest

View File

@ -54,7 +54,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: cassandra
image: cassandra:3.9
image: thingsboard/cassandra:1.2.4
imagePullPolicy: Always
ports:
- containerPort: 7000

View File

@ -0,0 +1,28 @@
#!/usr/bin/env bash
#
# Copyright © 2016-2017 The Thingsboard Authors
#
# 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.
#
if [[ $(nodetool status | grep $POD_IP) == *"UN"* ]]; then
if [[ $DEBUG ]]; then
echo "UN";
fi
exit 0;
else
if [[ $DEBUG ]]; then
echo "Not Up";
fi
exit 1;
fi

View File

@ -6,8 +6,9 @@ build:
cp ../../dao/src/main/resources/schema.cql .
cp ../../dao/src/main/resources/demo-data.cql .
cp ../../dao/src/main/resources/system-data.cql .
docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
rm schema.cql demo-data.cql system-data.cql
push: build
docker push ${PROJECT}/${APP}:${VERSION}
docker push ${PROJECT}/${APP}:${VERSION}
docker push ${PROJECT}/${APP}:latest

View File

@ -25,11 +25,11 @@ spec:
image: thingsboard/tb-cassandra-schema:1.2.4
env:
- name: CREATE_SCHEMA
value: "false"
value: "true"
- name: ADD_SYSTEM_DATA
value: "false"
value: "true"
- name : ADD_DEMO_DATA
value: "false"
value: "true"
- name : CASSANDRA_URL
value: "cassandra-headless"
command:

View File

@ -4,8 +4,9 @@ APP=application
build:
cp ../../application/target/thingsboard.deb .
docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
rm thingsboard.deb
push: build
docker push ${PROJECT}/${APP}:${VERSION}
docker push ${PROJECT}/${APP}:${VERSION}
docker push ${PROJECT}/${APP}:latest

View File

@ -3,7 +3,8 @@ PROJECT=thingsboard
APP=zk
build:
docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest .
push: build
docker push ${PROJECT}/${APP}:${VERSION}
docker push ${PROJECT}/${APP}:latest