diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 11dd7a967b..8307bf5886 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -26,13 +26,13 @@ on: env: DOCKER_TAG: | - $(echo "px4io/px4-dev:${{ + "px4io/px4-dev:${{ github.event_name == 'pull_request' && github.sha || ( github.event_name == 'push' && 'latest' || github.event.release.name ) - }}" | tr -d '\n') + }}" jobs: build_docker: @@ -129,9 +129,10 @@ jobs: #--volume=/tmp:/tmp:rw \ #--volume=${GITHUB_ACTION_PATH}:${GITHUB_ACTION_PATH}:rw \ #px4io/px4-dev:${{ env.DOCKER_TAG }} /bin/bash -c "make ${{ matrix.target }}" + run: | docker run --rm -w "${{ env.GITHUB_ACTION_PATH }}" \ --env=LOCAL_USER_ID="$(id -u)" \ --volume=/tmp:/tmp:rw \ --volume=${{ env.GITHUB_ACTION_PATH }}:${{ env.GITHUB_ACTION_PATH }}:rw \ - ${{ env.DOCKER_TAG }} /bin/bash -c "make px4_fmu-v6x" + $(echo "$DOCKER_TAG" | tr -d '\n') /bin/bash -c "make px4_fmu-v6x"