Commit 8ed9cf8620351b3e80e30a72a83b0f8ced1f1366

Authored by Volodymyr Babak
1 parent 868f5d3c

Removed cassandra custom image

1   -#
2   -# Copyright © 2016-2017 The Thingsboard Authors
3   -#
4   -# Licensed under the Apache License, Version 2.0 (the "License");
5   -# you may not use this file except in compliance with the License.
6   -# You may obtain a copy of the License at
7   -#
8   -# http://www.apache.org/licenses/LICENSE-2.0
9   -#
10   -# Unless required by applicable law or agreed to in writing, software
11   -# distributed under the License is distributed on an "AS IS" BASIS,
12   -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13   -# See the License for the specific language governing permissions and
14   -# limitations under the License.
15   -#
16   -
17   -FROM cassandra:3.9
18   -
19   -COPY ready-probe.sh /
20   -
21   -CMD ["cassandra", "-f"]
\ No newline at end of file
1   -VERSION=k8stest
2   -PROJECT=thingsboard
3   -APP=cassandra
4   -
5   -build:
6   - docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
7   -
8   -push: build
9   - docker push ${PROJECT}/${APP}:${VERSION}
\ No newline at end of file
... ... @@ -54,7 +54,7 @@ spec:
54 54 topologyKey: "kubernetes.io/hostname"
55 55 containers:
56 56 - name: cassandra
57   - image: thingsboard/cassandra:k8stest
  57 + image: cassandra:3.9
58 58 imagePullPolicy: Always
59 59 ports:
60 60 - containerPort: 7000
... ...
1   -#!/bin/bash
2   -#
3   -# Copyright © 2016-2017 The Thingsboard Authors
4   -#
5   -# Licensed under the Apache License, Version 2.0 (the "License");
6   -# you may not use this file except in compliance with the License.
7   -# You may obtain a copy of the License at
8   -#
9   -# http://www.apache.org/licenses/LICENSE-2.0
10   -#
11   -# Unless required by applicable law or agreed to in writing, software
12   -# distributed under the License is distributed on an "AS IS" BASIS,
13   -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14   -# See the License for the specific language governing permissions and
15   -# limitations under the License.
16   -#
17   -
18   -if [[ $(nodetool status | grep $POD_IP) == *"UN"* ]]; then
19   - if [[ $DEBUG ]]; then
20   - echo "UN";
21   - fi
22   - exit 0;
23   -else
24   - if [[ $DEBUG ]]; then
25   - echo "Not Up";
26   - fi
27   - exit 1;
28   -fi
\ No newline at end of file
1   -#
2   -# Copyright © 2016-2017 The Thingsboard Authors
3   -#
4   -# Licensed under the Apache License, Version 2.0 (the "License");
5   -# you may not use this file except in compliance with the License.
6   -# You may obtain a copy of the License at
7   -#
8   -# http://www.apache.org/licenses/LICENSE-2.0
9   -#
10   -# Unless required by applicable law or agreed to in writing, software
11   -# distributed under the License is distributed on an "AS IS" BASIS,
12   -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13   -# See the License for the specific language governing permissions and
14   -# limitations under the License.
15   -#
16   -
17   -version: '2'
18   -
19   -services:
20   - cassandra:
21   - ports:
22   - - "9042"
23   - - "9160"
24   - zk:
25   - ports:
26   - - "2181"
... ... @@ -35,9 +35,14 @@ services:
35 35 - CASSANDRA_URL=${CASSANDRA_URL}
36 36 entrypoint: ./install-schema.sh
37 37 cassandra:
38   - image: "thingsboard/cassandra:k8stest"
  38 + image: "cassandra:3.9"
  39 + ports:
  40 + - "9042"
  41 + - "9160"
39 42 volumes:
40 43 - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra"
41 44 zk:
42   - image: "thingsboard/zk:k8stest"
  45 + image: "zookeeper:3.4.9"
  46 + ports:
  47 + - "2181"
43 48 restart: always
... ...