dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix create database in docker images. No more Californium.properties

Browse Source
This commit is contained in:
Andrii Shvaika 2020-11-25 18:12:54 +02:00
parent c32a2ac064
commit c4b36b0c6f
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
View File

@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
import org.eclipse.californium.core.CoapResource; import org.eclipse.californium.core.CoapResource;
import org.eclipse.californium.core.CoapServer; import org.eclipse.californium.core.CoapServer;
import org.eclipse.californium.core.network.CoapEndpoint; import org.eclipse.californium.core.network.CoapEndpoint;
import org.eclipse.californium.core.network.config.NetworkConfig;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -46,7 +47,7 @@ public class CoapTransportService {
public void init() throws UnknownHostException { public void init() throws UnknownHostException {
log.info("Starting CoAP transport..."); log.info("Starting CoAP transport...");
log.info("Starting CoAP transport server"); log.info("Starting CoAP transport server");
this.server = new CoapServer(); this.server = new CoapServer(NetworkConfig.createStandardWithoutFile());
createResources(); createResources();
InetAddress addr = InetAddress.getByName(coapTransportContext.getHost()); InetAddress addr = InetAddress.getByName(coapTransportContext.getHost());
InetSocketAddress sockAddr = new InetSocketAddress(addr, coapTransportContext.getPort()); InetSocketAddress sockAddr = new InetSocketAddress(addr, coapTransportContext.getPort());

6
msa/tb/docker-cassandra/start-db.sh
View File

@ -27,7 +27,11 @@ fi
exec setsid nohup postgres >> ${PGLOG}/postgres.log 2>&1 & exec setsid nohup postgres >> ${PGLOG}/postgres.log 2>&1 &
if [ ! -f ${firstlaunch} ]; then if [ ! -f ${firstlaunch} ]; then
psql -U ${pkg.user} -d postgres -c "CREATE DATABASE thingsboard" sleep 2
while ! psql -U ${pkg.user} -d postgres -c "CREATE DATABASE thingsboard"
do
sleep 1
done
fi fi
cassandra_data_dir=${CASSANDRA_DATA} cassandra_data_dir=${CASSANDRA_DATA}

6
msa/tb/docker-postgres/start-db.sh
View File

@ -27,5 +27,9 @@ fi
exec setsid nohup postgres >> ${PGLOG}/postgres.log 2>&1 & exec setsid nohup postgres >> ${PGLOG}/postgres.log 2>&1 &
if [ ! -f ${firstlaunch} ]; then if [ ! -f ${firstlaunch} ]; then
psql -U ${pkg.user} -d postgres -c "CREATE DATABASE thingsboard" sleep 2
while ! psql -U ${pkg.user} -d postgres -c "CREATE DATABASE thingsboard"
do
sleep 1
done
fi fi