diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fffa41f9..22f8a4d1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -72,10 +72,16 @@ jobs: ##------------ special task for apphub begin----------------------# - name: Trigger media.yml workflow uses: mathze/workflow-dispatch-action@v1.1.0 + id: startAndWaitWorkflow with: workflow-name: media.yml token: ${{github.token}} - if: env.APP == 'apphub' + run-id: dummy + if: env.APP == 'apphub' + + - name: Reuse workflow run id + run: "echo ${{ steps.startAndWaitWorkflow.outputs.run-id }}" + if: env.APP == 'apphub' - name: Download media.zip from artifacts uses: Legit-Labs/action-download-artifact@v2 diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index ef5aa6f9..3df80d90 100644 --- a/docker/apphub/Dockerfile +++ b/docker/apphub/Dockerfile @@ -1,4 +1,7 @@ -# modify time: 202312081856, you can modify here to trigger Docker Build action +# This file can running at actions +# If you build this image on local, need download media.zip from websoft9_artifact to docker/apphub directory + +# modify time: 202312081911, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye @@ -12,6 +15,7 @@ ENV websoft9_artifact="https://w9artifact.blob.core.windows.net/release/websoft9 ENV library_repo="https://github.com/Websoft9/docker-library" ENV source_github_pages="https://websoft9.github.io/websoft9" + COPY media.zip /websoft9 RUN apt update && apt install -y --no-install-recommends curl git jq cron iproute2 supervisor rsync wget unzip zip && \