Removed cassandra custom image

This commit is contained in:
Volodymyr Babak 2017-05-24 16:37:20 +03:00
parent 868f5d3ca1
commit 8ed9cf8620
6 changed files with 8 additions and 87 deletions

View File

@ -1,21 +0,0 @@
#
# 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
COPY ready-probe.sh /
CMD ["cassandra", "-f"]

View File

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

View File

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

View File

@ -1,28 +0,0 @@
#!/bin/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

@ -1,26 +0,0 @@
#
# 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.
#
version: '2'
services:
cassandra:
ports:
- "9042"
- "9160"
zk:
ports:
- "2181"

View File

@ -35,9 +35,14 @@ services:
- CASSANDRA_URL=${CASSANDRA_URL} - CASSANDRA_URL=${CASSANDRA_URL}
entrypoint: ./install-schema.sh entrypoint: ./install-schema.sh
cassandra: cassandra:
image: "thingsboard/cassandra:k8stest" image: "cassandra:3.9"
ports:
- "9042"
- "9160"
volumes: volumes:
- "${CASSANDRA_DATA_DIR}:/var/lib/cassandra" - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra"
zk: zk:
image: "thingsboard/zk:k8stest" image: "zookeeper:3.4.9"
ports:
- "2181"
restart: always restart: always