update files.

Author: freemankevin

.github/workflows/build.yml

@@ -1,35 +1,36 @@
 name: Build and Push Docker Image
-
 on:
   push:
     branches:
       - main
     paths:
       - 'Dockerfile'
       - '.github/workflows/build.yml'
-
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
+      
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+      
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            freelabspace/java-local:8
+            freelabspace/java-local:8
+            freelabspace/java-local:latest

Dockerfile

@@ -1,26 +1,52 @@
-FROM public.ecr.aws/amazoncorretto/amazoncorretto:8
+FROM --platform=$BUILDPLATFORM debian:12.12 AS builder
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
+ARG TARGETARCH
 
+ENV DEBIAN_FRONTEND=noninteractive \
+    TZ=Asia/Shanghai
+
+WORKDIR /tmp
+
+# 根据目标架构下载对应的JDK
+RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
+
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+      curl -L -o jdk.tar.gz "https://github.com/hmsjy2017/get-jdk/releases/download/v8u231/jdk-8u231-linux-arm64-vfp-hflt.tar.gz"; \
+    else \
+      curl -L -o jdk.tar.gz "https://github.com/hmsjy2017/get-jdk/releases/download/v8u231/jdk-8u231-linux-x64.tar.gz"; \
+    fi && \
+    tar -xzf jdk.tar.gz && \
+    mkdir -p /jdk8 && \
+    mv /tmp/jdk1.8.0_231/* /jdk8/
+
+# 最终镜像
+FROM debian:12.12
 LABEL maintainer="https://github.com/freemankevin/java-local"
 
 ENV DEBIAN_FRONTEND=noninteractive \
-    TZ=Asia/Shanghai
+    TZ=Asia/Shanghai \
+    JAVA_HOME=/usr/local/jdk8 \
+    PATH=/usr/local/jdk8/bin:$PATH
 
-RUN yum update -y && \
-    yum install -y \
+# 复制JDK从builder阶段
+COPY --from=builder /jdk8 /usr/local/jdk8
+
+# 安装依赖
+RUN apt-get update && apt-get install -y \
     tzdata \
     curl \
-    wget \
-    net-tools \
-    iputils \
-    telnet \
-    bind-utils \
+    iputils-ping \
+    dnsutils \
     libreoffice \
-    libreoffice-langpack-zh_CN \
-    google-noto-sans-cjk-fonts \
-    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
-    && echo $TZ > /etc/timezone \
-    && yum clean all && \
-    rm -rf /var/cache/yum/*
-
-# 确保 SSL 证书已更新
-RUN update-ca-trust
+    libreoffice-l10n-zh-cn \
+    libreoffice-help-zh-cn \
+    fonts-noto-cjk \
+    ca-certificates \
+    && ln -snf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo Asia/Shanghai > /etc/timezone \
+    && rm -rf /var/lib/apt/lists/* \
+    && update-ca-certificates
+
+# 验证Java安装
+RUN java -version && javac -version