Update multi-arch Dockerbuild

Signed-off-by: yutao04 <[email protected]>

Author: trickMin

.github/workflows/docker-build.yml

@@ -10,7 +10,7 @@ on:
       - 'v*'
 
 jobs:
-  build:
+  buildx:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -44,5 +44,7 @@ jobs:
         with:
           context: .
           file: ./hango-api-plane-server/Dockerfile
+          # 所需要的体系结构，可以在 Available platforms 步骤中获取所有的可用架构
+          platforms: linux/amd64,linux/arm64/v8
           push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.meta.outputs.tags }}

hango-api-plane-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM hangoio/tomcat-8.5:v1.1
+FROM tomcat:8.5-jdk8
 
 ENV TZ=Asia/Shanghai LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -7,8 +7,10 @@ COPY hango-api-plane-server/setenv.sh $CATALINA_HOME/bin/
 RUN rm -rf webapps/*
 COPY hango-api-plane-server/target/*.war webapps/
 RUN cd /usr/local/tomcat/webapps && \
-    mv *.war ROOT.war && \
-    unzip ROOT.war -d ./ROOT && \
-    rm -f ROOT.war
+    mkdir ROOT && \
+    mv *.war ROOT/ROOT.war && \
+    cd ROOT && \
+    jar -xvf ROOT.war && \
+    rm -rf *.war
 
 ENTRYPOINT ["catalina.sh", "run"]