From cc873d4fdf41e42768495265dddb9bffd6198e11 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 30 Oct 2018 11:42:45 +0200 Subject: [PATCH 1/2] Use JDK instead of JRE in docker images --- msa/tb-node/docker/Dockerfile | 2 +- msa/tb/docker-cassandra/Dockerfile | 2 +- msa/tb/docker-postgres/Dockerfile | 2 +- msa/tb/docker-tb/Dockerfile | 2 +- msa/transport/coap/docker/Dockerfile | 2 +- msa/transport/http/docker/Dockerfile | 2 +- msa/transport/mqtt/docker/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/msa/tb-node/docker/Dockerfile b/msa/tb-node/docker/Dockerfile index c86d020d20..57a6151e37 100644 --- a/msa/tb-node/docker/Dockerfile +++ b/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/ diff --git a/msa/tb/docker-cassandra/Dockerfile b/msa/tb/docker-cassandra/Dockerfile index 175ad9abe1..a15408dddb 100644 --- a/msa/tb/docker-cassandra/Dockerfile +++ b/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 diff --git a/msa/tb/docker-postgres/Dockerfile b/msa/tb/docker-postgres/Dockerfile index 9447d51387..c1b3f029b0 100644 --- a/msa/tb/docker-postgres/Dockerfile +++ b/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 diff --git a/msa/tb/docker-tb/Dockerfile b/msa/tb/docker-tb/Dockerfile index df7e692fbe..497a03c959 100644 --- a/msa/tb/docker-tb/Dockerfile +++ b/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/ diff --git a/msa/transport/coap/docker/Dockerfile b/msa/transport/coap/docker/Dockerfile index dcaef3a358..9240b2a4f0 100644 --- a/msa/transport/coap/docker/Dockerfile +++ b/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/ diff --git a/msa/transport/http/docker/Dockerfile b/msa/transport/http/docker/Dockerfile index 212047fa42..6c83b9c76b 100644 --- a/msa/transport/http/docker/Dockerfile +++ b/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/ diff --git a/msa/transport/mqtt/docker/Dockerfile b/msa/transport/mqtt/docker/Dockerfile index 5827c65229..f636e2f3a7 100644 --- a/msa/transport/mqtt/docker/Dockerfile +++ b/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/ From 83a55468a4d6e415f626858d94d04f888875ebd6 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 30 Oct 2018 11:45:02 +0200 Subject: [PATCH 2/2] Update logback to INFO level for tb-node --- docker/tb-node/conf/logback.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tb-node/conf/logback.xml b/docker/tb-node/conf/logback.xml index 8bf38eb287..1c69f537bc 100644 --- a/docker/tb-node/conf/logback.xml +++ b/docker/tb-node/conf/logback.xml @@ -40,7 +40,7 @@ - +