diff --git a/images/broker/alpine/Dockerfile b/images/broker/alpine/Dockerfile index 571451ca..64c786bd 100644 --- a/images/broker/alpine/Dockerfile +++ b/images/broker/alpine/Dockerfile @@ -34,7 +34,7 @@ RUN set -eux; \ apk add --virtual .build-deps curl gnupg unzip; \ curl https://archive.apache.org/dist/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip -o rocketmq.zip; \ curl https://archive.apache.org/dist/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip.asc -o rocketmq.zip.asc; \ - curl https://www.apache.org/dist/rocketmq/KEYS -o KEYS; \ + curl -L https://www.apache.org/dist/rocketmq/KEYS -o KEYS; \ \ gpg --import KEYS; \ gpg --batch --verify rocketmq.zip.asc rocketmq.zip; \ @@ -71,4 +71,4 @@ RUN chmod a+x ${ROCKETMQ_HOME}/bin/brokerGenConfig.sh \ WORKDIR ${ROCKETMQ_HOME}/bin -CMD ["/bin/bash", "./brokerStart.sh"] \ No newline at end of file +CMD ["/bin/bash", "./brokerStart.sh"] diff --git a/images/namesrv/alpine/Dockerfile b/images/namesrv/alpine/Dockerfile index 73c1f18b..64538bf4 100644 --- a/images/namesrv/alpine/Dockerfile +++ b/images/namesrv/alpine/Dockerfile @@ -34,7 +34,7 @@ RUN set -eux; \ apk add --virtual .build-deps curl gnupg unzip; \ curl https://archive.apache.org/dist/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip -o rocketmq.zip; \ curl https://archive.apache.org/dist/rocketmq/${ROCKETMQ_VERSION}/rocketmq-all-${ROCKETMQ_VERSION}-bin-release.zip.asc -o rocketmq.zip.asc; \ - curl https://www.apache.org/dist/rocketmq/KEYS -o KEYS; \ + curl -L https://www.apache.org/dist/rocketmq/KEYS -o KEYS; \ gpg --import KEYS; \ gpg --batch --verify rocketmq.zip.asc rocketmq.zip; \ unzip rocketmq.zip; \ diff --git a/images/namesrv/alpine/runserver-customize.sh b/images/namesrv/alpine/runserver-customize.sh index c05e77ec..17164074 100755 --- a/images/namesrv/alpine/runserver-customize.sh +++ b/images/namesrv/alpine/runserver-customize.sh @@ -55,7 +55,15 @@ calculate_heap_sizes() case "`uname`" in Linux) system_memory_in_mb=`free -m| sed -n '2p' | awk '{print $2}'` + system_memory_in_mb_in_docker=$(($(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)/1024/1024)) + if [ $system_memory_in_mb_in_docker -lt $system_memory_in_mb ];then + system_memory_in_mb=$system_memory_in_mb_in_docker + fi system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` + system_cpu_cores_in_docker=$(($(cat /sys/fs/cgroup/cpu/cpu.cfs_quota_us)/$(cat /sys/fs/cgroup/cpu/cpu.cfs_period_us))) + if [ $system_cpu_cores_in_docker -lt $system_cpu_cores -a $system_cpu_cores_in_docker -ne 0 ];then + system_cpu_cores=$system_cpu_cores_in_docker + fi ;; FreeBSD) system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'`