Browse Source

修改docker配置

修改log4j版本
master
zhczyx@163.com 3 weeks ago
parent
commit
9cd338f95b
  1. 7
      dongjian-center-admin-controller/dockerfile
  2. 4
      pom.xml

7
dongjian-center-admin-controller/dockerfile

@ -75,7 +75,7 @@
# 使用Ubuntu 20.04 LTS作为基础镜像 # 使用Ubuntu 20.04 LTS作为基础镜像
# FROM ubuntu:20.04 # FROM ubuntu:20.04
FROM registry.ap-northeast-1.aliyuncs.com/southwave/ubuntu2004-template:latest FROM registry.ap-northeast-1.aliyuncs.com/southwave/ubuntu2004-template:1.4.0
# 设置系统的默认编码方式为 UTF-8 # 设置系统的默认编码方式为 UTF-8
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
@ -84,6 +84,7 @@ ENV LC_CTYPE=zh_CN.UTF-8
# 设置环境变量,避免交互式安装 # 设置环境变量,避免交互式安装
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# # 更新APT软件包索引并安装必要的软件包 # # 更新APT软件包索引并安装必要的软件包
# RUN apt-get update && \ # RUN apt-get update && \
# apt-get install -y \ # apt-get install -y \
@ -93,13 +94,13 @@ ENV DEBIAN_FRONTEND=noninteractive
# fontconfig \ # fontconfig \
# && apt-get clean \ # && apt-get clean \
# && rm -rf /var/lib/apt/lists/* # && rm -rf /var/lib/apt/lists/*
# # #
# # 安装Terraform # # 安装Terraform
# RUN curl -fsSLk https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_linux_amd64.zip -o /tmp/terraform.zip && \ # RUN curl -fsSLk https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_linux_amd64.zip -o /tmp/terraform.zip && \
# unzip /tmp/terraform.zip -d /usr/local/bin/ && \ # unzip /tmp/terraform.zip -d /usr/local/bin/ && \
# rm /tmp/terraform.zip # rm /tmp/terraform.zip
# # 安装Amazon Corretto 11 JDK # # # 安装Amazon Corretto 11 JDK
# RUN curl -fsSLk https://corretto.aws/downloads/resources/11.0.22.7.1/amazon-corretto-11.0.22.7.1-linux-x64.tar.gz -o /tmp/amazon-corretto-11.tar.gz && \ # RUN curl -fsSLk https://corretto.aws/downloads/resources/11.0.22.7.1/amazon-corretto-11.0.22.7.1-linux-x64.tar.gz -o /tmp/amazon-corretto-11.tar.gz && \
# mkdir /usr/lib/jvm/ && \ # mkdir /usr/lib/jvm/ && \
# tar -xzvf /tmp/amazon-corretto-11.tar.gz -C /usr/lib/jvm/ && \ # tar -xzvf /tmp/amazon-corretto-11.tar.gz -C /usr/lib/jvm/ && \

4
pom.xml

@ -191,12 +191,12 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>2.25.2</version> <version>2.25.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<version>2.25.2</version> <version>2.25.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

Loading…
Cancel
Save