Browse Source

Merge branch 'master' of github.com:thingsboard/thingsboard

pull/1209/head
Andrew Shvayka 8 years ago
parent
commit
d342e4534e
  1. 2
      docker/tb-node/conf/logback.xml
  2. 2
      msa/tb-node/docker/Dockerfile
  3. 2
      msa/tb/docker-cassandra/Dockerfile
  4. 2
      msa/tb/docker-postgres/Dockerfile
  5. 2
      msa/tb/docker-tb/Dockerfile
  6. 2
      msa/transport/coap/docker/Dockerfile
  7. 2
      msa/transport/http/docker/Dockerfile
  8. 2
      msa/transport/mqtt/docker/Dockerfile

2
docker/tb-node/conf/logback.xml

@ -40,7 +40,7 @@
</encoder>
</appender>
<logger name="org.thingsboard.server" level="TRACE" />
<logger name="org.thingsboard.server" level="INFO" />
<logger name="akka" level="INFO" />
<root level="INFO">

2
msa/tb-node/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM openjdk:8-jre
FROM openjdk:8-jdk
COPY start-tb-node.sh ${pkg.name}.deb /tmp/

2
msa/tb/docker-cassandra/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM openjdk:8-jre
FROM openjdk:8-jdk
RUN apt-get update
RUN apt-get install -y curl nmap procps

2
msa/tb/docker-postgres/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM openjdk:8-jre
FROM openjdk:8-jdk
RUN apt-get update
RUN apt-get install -y postgresql postgresql-contrib

2
msa/tb/docker-tb/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM openjdk:8-jre
FROM openjdk:8-jdk
COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/

2
msa/transport/coap/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM openjdk:8-jre
FROM openjdk:8-jdk
COPY logback.xml ${pkg.name}.conf start-tb-coap-transport.sh ${pkg.name}.deb /tmp/

2
msa/transport/http/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM openjdk:8-jre
FROM openjdk:8-jdk
COPY logback.xml ${pkg.name}.conf start-tb-http-transport.sh ${pkg.name}.deb /tmp/

2
msa/transport/mqtt/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM openjdk:8-jre
FROM openjdk:8-jdk
COPY logback.xml ${pkg.name}.conf start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/

Loading…
Cancel
Save