[incubator-devlake] branch main updated: fix: can not copy some file due to the file path (#4517)

[zhangliang2022]

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

zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new ff103b6fe fix: can not copy some file due to the file path (#4517)
ff103b6fe is described below

commit ff103b6fedd8e39aba5e5ab93a5acff8677a565e
Author: abeizn <zikuan...@merico.dev>
AuthorDate: Fri Feb 24 20:23:26 2023 +0800

    fix: can not copy some file due to the file path (#4517)
    
    * fix: can not copy some file due to the file path
    
    * fix: workflow can not push image
    
    * fix: can not run tini in debian
---
 .github/workflows/build.yml |  2 ++
 backend/Dockerfile          | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2196a8269..f9ccc9dba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,6 +106,7 @@ jobs:
           push: false
           target: build
           tags: ${{ secrets.DOCKERHUB_OWNER }}/devlake:build-cache-${{ 
matrix.platform }}
+          file: ./backend/Dockerfile
           platforms: linux/${{ matrix.platform }}
           cache-from: ${{ secrets.DOCKERHUB_OWNER }}/devlake:amd64-builder
           cache-to: type=local,mode=min,dest=/tmp/devlake-build-cache-${{ 
matrix.platform }}
@@ -154,6 +155,7 @@ jobs:
           push: true
           tags: ${{ steps.get_push_tags.outputs.TAGS }}
           platforms: linux/amd64,linux/arm64
+          file: ./backend/Dockerfile
           cache-from: |
             ${{ secrets.DOCKERHUB_OWNER }}/devlake:amd64-builder
             ${{ secrets.DOCKERHUB_OWNER }}/devlake:base
diff --git a/backend/Dockerfile b/backend/Dockerfile
index aab567301..a33a2884a 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -134,7 +134,7 @@ EXPOSE 8080
 
 WORKDIR /app
 # Setup Python
-COPY python/requirements.txt /app/requirements.txt
+COPY backend/python/requirements.txt /app/requirements.txt
 RUN python3 -m pip install --no-cache --upgrade pip setuptools && \
     python3 -m pip install --no-cache dbt-mysql dbt-postgres && \
     python3 -m pip install --no-cache -r requirements.txt && \
@@ -152,15 +152,16 @@ COPY --from=build /usr/local/deps/target/lib/*.so* 
/app/libs
 RUN ldconfig -vn /app/libs
 
 # apps
-COPY --from=build /app/bin /app/bin
-COPY --from=build /app/resources/tap /app/resources/tap
+COPY --from=build /app/backend/bin /app/bin
+COPY --from=build /app/backend/resources/tap /app/resources/tap
 
 ENV PATH="/app/bin:${PATH}"
 
+#add tini, prevent zombie process 
 RUN apt-get update && \
-    apt-get install -y tini #add tini, prevent zombie process \
+    apt-get install -y tini 
 
-ENTRYPOINT ["/sbin/tini", "--"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
 
 CMD ["lake"]