(amoro) branch master updated: [Hotfix] Fix docker file and GitHub workflows (#2791)

[jinsongzhou]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new d91dbaabe [Hotfix] Fix docker file and GitHub workflows (#2791)
d91dbaabe is described below

commit d91dbaabeac8fde2aa703d087bfe997e5076fab8
Author: ZhouJinsong <zhoujinsong0...@163.com>
AuthorDate: Sun Apr 28 14:29:15 2024 +0800

    [Hotfix] Fix docker file and GitHub workflows (#2791)
    
    fix docker files
---
 .github/workflows/docker-images.yml | 8 ++++----
 docker/amoro/Dockerfile             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-images.yml 
b/.github/workflows/docker-images.yml
index c1ff8dea0..827fda3d8 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -37,7 +37,7 @@ jobs:
   docker-amoro:
     name: Push Amoro Docker Image to Docker Hub
     runs-on: ubuntu-latest
-    if: ${{ startsWith(github.repository, 'NetEase/') }}
+    if: ${{ startsWith(github.repository, 'apache/') }}
     strategy:
       matrix:
         hadoop: [ "v3" ]
@@ -99,7 +99,7 @@ jobs:
   docker-optimizer-flink:
     name: Push Amoro Optimizer-Flink Docker Image to Docker Hub
     runs-on: ubuntu-latest
-    if: ${{ startsWith(github.repository, 'NetEase/') }}
+    if: ${{ startsWith(github.repository, 'apache/') }}
     strategy:
       matrix:
         flink: [ "1.14.6", "1.18.1" ]
@@ -179,7 +179,7 @@ jobs:
   docker-optimizer-spark:
     name: Push Amoro Optimizer-Spark Docker Image to Docker Hub
     runs-on: ubuntu-latest
-    if: ${{ startsWith(github.repository, 'NetEase/') }}
+    if: ${{ startsWith(github.repository, 'apache/') }}
     strategy:
       matrix:
         spark: [ "3.3.3" ]
@@ -253,7 +253,7 @@ jobs:
     name: Push Amoro Quick-Demo Docker Image to Docker Hub
     runs-on: ubuntu-latest
     needs: docker-amoro
-    if: ${{ startsWith(github.repository, 'NetEase/') && 
startsWith(github.ref, 'refs/tags/' )}}
+    if: ${{ startsWith(github.repository, 'apache/') && startsWith(github.ref, 
'refs/tags/' )}}
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 8
diff --git a/docker/amoro/Dockerfile b/docker/amoro/Dockerfile
index e25ae9f8f..d74f0e32c 100644
--- a/docker/amoro/Dockerfile
+++ b/docker/amoro/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
     && apt-get install -y unzip
 
 RUN AMORO_VERSION=`cat pom.xml | grep 'amoro-parent' -C 3 | grep -Eo 
'<version>.*</version>' | awk -F'[><]' '{print $3}'` \
-    && cp ams/dist/target/*.zip /usr/local \
+    && cp amoro-ams/dist/target/*.zip /usr/local \
     && unzip /usr/local/amoro-${AMORO_VERSION}-bin.zip -d /usr/local \
     && rm /usr/local/amoro-${AMORO_VERSION}/plugin/optimizer/flink -rf \
     && rm /usr/local/amoro-${AMORO_VERSION}/plugin/optimizer/spark -rf \