更新打包信息

dongjian-center-admin-controller/buildPush-prod.sh

@@ -1,11 +0,0 @@
-aws configure set aws_access_key_id AKIAVRXFMB43TOELSROK
-aws configure set aws_secret_access_key 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
-aws configure set default.region ap-northeast-1
-aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 381659385655.dkr.ecr.ap-northeast-1.amazonaws.com
-
-docker build -t 381659385655.dkr.ecr.ap-northeast-1.amazonaws.com/tokyo-build-admin:latest\
-    --build-arg JAR_FILE=target/dongjian-center-admin-controller-0.0.1-SNAPSHOT.jar \
-    --build-arg LIB_DIR=target/lib \
-    --build-arg CONFIG_DIR=target/config \
-    .
-docker push 381659385655.dkr.ecr.ap-northeast-1.amazonaws.com/tokyo-build-admin:latest

dongjian-center-admin-controller/buildPush-staging.sh

@@ -1,11 +1,11 @@
-aws configure set aws_access_key_id AKIA5OFH5OOZPCXZIRUQ
-aws configure set aws_secret_access_key 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
+aws configure set aws_access_key_id AKIAQNYBBSGDVT3VF4ON
+aws configure set aws_secret_access_key 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
 aws configure set default.region ap-northeast-1
-aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 923770123186.dkr.ecr.ap-northeast-1.amazonaws.com
+aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com
 
-docker build -t 923770123186.dkr.ecr.ap-northeast-1.amazonaws.com/tokyo-build-admin:latest\
+docker build -t 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/spf-admin-stg:latest\
     --build-arg JAR_FILE=target/dongjian-center-admin-controller-0.0.1-SNAPSHOT.jar \
     --build-arg LIB_DIR=target/lib \
     --build-arg CONFIG_DIR=target/config \
     .
-docker push 923770123186.dkr.ecr.ap-northeast-1.amazonaws.com/tokyo-build-admin:latest
+docker push 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/spf-admin-stg:latest

dongjian-center-admin-controller/dockerfile

@@ -1,3 +1,74 @@
+# #FROM openjdk:8-jre-alpine
+# #FROM amazon-corretto-8
+# #FROM amazoncorretto:11
+#
+# # 使用Ubuntu 20.04 LTS作为基础镜像
+# # FROM ubuntu:20.04
+# FROM registry.ap-northeast-1.aliyuncs.com/southwave/ubuntu2004-template:latest
+#
+# # 设置系统的默认编码方式为 UTF-8
+# ENV LANG=en_US.UTF-8
+# ENV LC_CTYPE=zh_CN.UTF-8
+#
+# # 设置环境变量，避免交互式安装
+# ENV DEBIAN_FRONTEND=noninteractive
+#
+# # 更新APT软件包索引并安装必要的软件包
+# RUN apt-get update && \
+#     apt-get install -y \
+#     curl \
+#     unzip \
+#     vim \
+#     fontconfig \
+#     && apt-get clean \
+#     && rm -rf /var/lib/apt/lists/*
+#
+# # # 安装Terraform
+# # 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/ && \
+# #     rm /tmp/terraform.zip
+#
+# # 安装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 && \
+#     mkdir /usr/lib/jvm/ && \
+#     tar -xzvf /tmp/amazon-corretto-11.tar.gz -C /usr/lib/jvm/ && \
+#     rm /tmp/amazon-corretto-11.tar.gz
+#
+# # 设置JAVA_HOME环境变量
+# ENV JAVA_HOME=/usr/lib/jvm/amazon-corretto-11.0.22.7.1-linux-x64
+# ENV PATH=$JAVA_HOME/bin:$PATH
+#
+# ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
+#
+# # 打印Terraform版本
+# RUN terraform --version
+#
+# # 打印Java版本
+# RUN java -version
+#
+# WORKDIR /home/data-center-admin
+#
+# #EXPOSE 20008
+#
+# # 设置时区
+# #RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+#
+# ARG JAR_FILE
+# ARG LIB_DIR
+# ARG CONFIG_DIR
+# ARG AURORA_TERRAFORM
+# ARG JVM_OPTS
+#
+# COPY ${JAR_FILE} app.jar
+# COPY ${LIB_DIR} lib
+# COPY ${CONFIG_DIR} config
+# COPY ${AURORA_TERRAFORM} aurora_terraform
+#
+# #ENTRYPOINT ["java", "${JVM_OPTS}", "-jar","app.jar"]
+# ENTRYPOINT java ${JVM_OPTS} -jar app.jar
+#
+#
+
 #FROM openjdk:8-jre-alpine
 #FROM amazon-corretto-8
 #FROM amazoncorretto:11
@@ -13,30 +84,30 @@ ENV LC_CTYPE=zh_CN.UTF-8
 # 设置环境变量，避免交互式安装
 ENV DEBIAN_FRONTEND=noninteractive
 
-# 更新APT软件包索引并安装必要的软件包
-RUN apt-get update && \
-    apt-get install -y \
-    curl \
-    unzip \
-    vim \
-    fontconfig \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# 安装Terraform
-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/ && \
-    rm /tmp/terraform.zip
-
-# 安装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 && \
-    mkdir /usr/lib/jvm/ && \
-    tar -xzvf /tmp/amazon-corretto-11.tar.gz -C /usr/lib/jvm/ && \
-    rm /tmp/amazon-corretto-11.tar.gz
-
-# 设置JAVA_HOME环境变量
-ENV JAVA_HOME=/usr/lib/jvm/amazon-corretto-11.0.22.7.1-linux-x64
-ENV PATH=$JAVA_HOME/bin:$PATH
+# # 更新APT软件包索引并安装必要的软件包
+# RUN apt-get update && \
+#     apt-get install -y \
+#     curl \
+#     unzip \
+#     vim \
+#     fontconfig \
+#     && apt-get clean \
+#     && rm -rf /var/lib/apt/lists/*
+#
+# # 安装Terraform
+# 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/ && \
+#     rm /tmp/terraform.zip
+
+# # 安装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 && \
+#     mkdir /usr/lib/jvm/ && \
+#     tar -xzvf /tmp/amazon-corretto-11.tar.gz -C /usr/lib/jvm/ && \
+#     rm /tmp/amazon-corretto-11.tar.gz
+
+# # 设置JAVA_HOME环境变量
+# ENV JAVA_HOME=/usr/lib/jvm/amazon-corretto-11.0.22.7.1-linux-x64
+# ENV PATH=$JAVA_HOME/bin:$PATH
 
 ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
 
@@ -68,3 +139,4 @@ COPY ${AURORA_TERRAFORM} aurora_terraform
 ENTRYPOINT java ${JVM_OPTS} -jar app.jar
 
 
+