From cd217a9ea41bed05498465de032c99f1bea449cb Mon Sep 17 00:00:00 2001 From: kev Date: Fri, 14 Aug 2020 11:26:15 +0800 Subject: [PATCH] update snort --- prestosql/Dockerfile.alpine | 2 +- prestosql/Dockerfile.debian | 2 +- prestosql/conf/coordinator/config.properties | 1 + prestosql/conf/coordinator/jvm.config | 2 ++ snort/Dockerfile | 6 +++--- snort/arm/Dockerfile | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/prestosql/Dockerfile.alpine b/prestosql/Dockerfile.alpine index 0dd5d2a..2dbc66c 100644 --- a/prestosql/Dockerfile.alpine +++ b/prestosql/Dockerfile.alpine @@ -2,7 +2,7 @@ # Dockerfile for prestosql # -FROM openjdk:16-jdk-alpine +FROM openjdk:11-jdk-alpine MAINTAINER EasyPi Software Foundation ENV PRESTO_VERSION=340 diff --git a/prestosql/Dockerfile.debian b/prestosql/Dockerfile.debian index 4008dc3..c49e42f 100644 --- a/prestosql/Dockerfile.debian +++ b/prestosql/Dockerfile.debian @@ -2,7 +2,7 @@ # Dockerfile for prestosql # -FROM openjdk:16-jdk-slim-buster +FROM openjdk:11-jdk-slim-buster MAINTAINER EasyPi Software Foundation ENV PRESTO_VERSION=340 diff --git a/prestosql/conf/coordinator/config.properties b/prestosql/conf/coordinator/config.properties index bb11096..e1c1cb6 100644 --- a/prestosql/conf/coordinator/config.properties +++ b/prestosql/conf/coordinator/config.properties @@ -3,6 +3,7 @@ node-scheduler.include-coordinator=false http-server.http.port=8080 query.max-memory=50GB query.max-memory-per-node=1GB +query.max-stage-count=200 query.max-total-memory-per-node=2GB discovery-server.enabled=true discovery.uri=http://127.0.0.1:8080 diff --git a/prestosql/conf/coordinator/jvm.config b/prestosql/conf/coordinator/jvm.config index afd8e8a..657c015 100644 --- a/prestosql/conf/coordinator/jvm.config +++ b/prestosql/conf/coordinator/jvm.config @@ -1,4 +1,5 @@ -server +-Xms8G -Xmx16G -XX:+UseG1GC -XX:G1HeapRegionSize=32M @@ -7,3 +8,4 @@ -XX:+HeapDumpOnOutOfMemoryError -XX:+ExitOnOutOfMemoryError -XX:OnOutOfMemoryError=kill -9 %p +-DHADOOP_USER_NAME=hive diff --git a/snort/Dockerfile b/snort/Dockerfile index 3696df1..5296723 100644 --- a/snort/Dockerfile +++ b/snort/Dockerfile @@ -2,11 +2,11 @@ # Dockerfile for snort # -FROM centos:7 +FROM centos:8 MAINTAINER EasyPi Software Foundation -ENV SNORT_VERSION=2.9.16 -ENV SNORT_URL=https://www.snort.org/downloads/snort/snort-${SNORT_VERSION}-1.centos7.x86_64.rpm +ENV SNORT_VERSION=2.9.16.1 +ENV SNORT_URL=https://www.snort.org/downloads/snort/snort-${SNORT_VERSION}-1.centos8.x86_64.rpm ENV RULES_URL=https://www.snort.org/downloads/community/community-rules.tar.gz RUN set -xe \ diff --git a/snort/arm/Dockerfile b/snort/arm/Dockerfile index 2ace048..c628fa1 100644 --- a/snort/arm/Dockerfile +++ b/snort/arm/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile for snort-arm # -FROM easypi/alpine-arm +FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation RUN set -xe \