diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 864659a..f9293da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,6 +53,8 @@ build:docker: needs: - job: build:java artifacts: true + variables: + NACOS_SENTINEL_JAVA_OPTS: -Xms256m -Xmx512m before_script: - echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$(printf "%s:%s" "${DOCKER_USERNAME}" "${DOCKER_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json script: @@ -68,6 +70,7 @@ build:docker: --build-arg CI_SERVER_URL=${CI_SERVER_URL} --build-arg CI_PIPELINE_ID=${CI_PIPELINE_ID} --build-arg CI_JOB_ID=${CI_JOB_ID} + --build-arg NACOS_SENTINEL_JAVA_OPTS="${NACOS_SENTINEL_JAVA_OPTS}" --build-arg GROUP_ID=${GROUP_ID} --build-arg ARTIFACT_ID=${ARTIFACT_ID} --build-arg VERSION=${VERSION} diff --git a/Dockerfile b/Dockerfile index ea24886..a4fc0e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ WORKDIR /home ARG GROUP_ID=${GROUP_ID} ARG ARTIFACT_ID=${ARTIFACT_ID} ARG VERSION=${VERSION} +ARG NACOS_SENTINEL_JAVA_OPTS=${NACOS_SENTINEL_JAVA_OPTS} ARG CI_SERVER_URL=${CI_SERVER_URL} ARG CI_PIPELINE_ID=${CI_PIPELINE_ID} ARG CI_JOB_ID=${CI_JOB_ID} @@ -12,6 +13,7 @@ ARG CI_JOB_ID=${CI_JOB_ID} RUN printf "GROUP_ID: %s\n" "$GROUP_ID" \ && printf "ARTIFACT_ID: %s\n" "$ARTIFACT_ID" \ && printf "VERSION: %s\n" "$VERSION" \ + && printf "NACOS_SENTINEL_JAVA_OPTS: %s\n" "$NACOS_SENTINEL_JAVA_OPTS" \ && printf "CI_PIPELINE_ID: %s\n" "$CI_PIPELINE_ID" \ && printf "CI_JOB_ID: %s\n" "$CI_JOB_ID" @@ -24,8 +26,9 @@ ENV TZ=Asia/Shanghai \ GROUP_ID=${GROUP_ID} \ ARTIFACT_ID=${ARTIFACT_ID} \ VERSION=${VERSION} \ + NACOS_SENTINEL_JAVA_OPTS=${NACOS_SENTINEL_JAVA_OPTS} \ CI_SERVER_URL=${CI_SERVER_URL} \ CI_PIPELINE_ID=${CI_PIPELINE_ID} \ CI_JOB_ID=${CI_JOB_ID} -CMD java -jar /home/app.jar +CMD java $NACOS_SENTINEL_JAVA_OPTS -jar /home/app.jar diff --git a/README.md b/README.md index 126dc0f..35f1dc1 100644 --- a/README.md +++ b/README.md @@ -130,17 +130,20 @@ ## 使用说明 +- [docker 镜像](https://hub.docker.com/r/xuxiaoweicomcn/nacos-sentinel) + ### 环境变量 -| 环境变量名称 | 默认值 | 说明 | -|----------------------------------------|----------------|--------------------------------------------------------| -| NACOS_SENTINEL_SERVER_PORT | 8080 | 端口 | -| NACOS_SENTINEL_SPRING_APPLICATION_NAME | nacos-sentinel | 项目名称,日志文件名称 | -| NACOS_SENTINEL_DISCOVERY_SERVER_ADDR | 127.0.0.1:8848 | Nacos 注册中心地址 | -| NACOS_SENTINEL_DISCOVERY_NAMESPACE | public | Nacos 注册中心命名空间 | -| NACOS_SENTINEL_LOGS_FOLDER | /logs | 日志文件夹前缀 | -| NACOS_SENTINEL_LOGS_MAX_FILE_SIZE | 20MB | 日志文件压缩阈值大小,类型:`org.springframework.util.unit.DataSize` | -| NACOS_SENTINEL_LOGS_MAX_HISTORY | 365 | 日志保留日期,单位:天 | +| 环境变量名称 | 默认值 | 说明 | +|----------------------------------------|-------------------|-------------------------------------------------------------| +| NACOS_SENTINEL_SERVER_PORT | 8080 | 端口 | +| NACOS_SENTINEL_SPRING_APPLICATION_NAME | nacos-sentinel | 项目名称,日志文件名称 | +| NACOS_SENTINEL_DISCOVERY_SERVER_ADDR | 127.0.0.1:8848 | Nacos 注册中心地址 | +| NACOS_SENTINEL_DISCOVERY_NAMESPACE | public | Nacos 注册中心命名空间 | +| NACOS_SENTINEL_LOGS_FOLDER | /logs | 日志文件夹前缀 | +| NACOS_SENTINEL_LOGS_MAX_FILE_SIZE | 20MB | 日志文件压缩阈值大小,类型:`org.springframework.util.unit.DataSize` | +| NACOS_SENTINEL_LOGS_MAX_HISTORY | 365 | 日志保留日期,单位:天 | +| NACOS_SENTINEL_JAVA_OPTS | -Xms256m -Xmx512m | 仅 docker 镜像生效。JVM堆的初始内存大小为256兆字节(MB),JVM堆的最大内存大小为512兆字节(MB) | ## [代码格式规范 spring-javaformat](https://github.com/spring-io/spring-javaformat)