From 1a6f55390237de9841ac08206e3abc1884fb4479 Mon Sep 17 00:00:00 2001 From: Victor Talpaert Date: Fri, 10 Apr 2026 15:14:07 +0200 Subject: [PATCH] fix bad file extraction from docker --- .github/workflows/release.yml | 14 ++++++-------- README.md | 4 +++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08bace4..8b86f10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,14 +39,12 @@ jobs: - name: Extract binaries (${{ matrix.name }}) run: | - docker run --rm esp-scope-${{ matrix.name }} \ - cat /workspace/build/merged-firmware.bin > esp-scope-${{ matrix.name }}-merged.bin - docker run --rm esp-scope-${{ matrix.name }} \ - cat /workspace/build/bootloader/bootloader.bin > esp-scope-${{ matrix.name }}-bootloader.bin - docker run --rm esp-scope-${{ matrix.name }} \ - cat /workspace/build/partition_table/partition-table.bin > esp-scope-${{ matrix.name }}-partition-table.bin - docker run --rm esp-scope-${{ matrix.name }} \ - cat /workspace/build/esp-scope.bin > esp-scope-${{ matrix.name }}-app.bin + cid=$(docker create esp-scope-${{ matrix.name }}) + docker cp "$cid:/workspace/build/merged-firmware.bin" esp-scope-${{ matrix.name }}-merged.bin + docker cp "$cid:/workspace/build/bootloader/bootloader.bin" esp-scope-${{ matrix.name }}-bootloader.bin + docker cp "$cid:/workspace/build/partition_table/partition-table.bin" esp-scope-${{ matrix.name }}-partition-table.bin + docker cp "$cid:/workspace/build/esp-scope.bin" esp-scope-${{ matrix.name }}-app.bin + docker rm "$cid" - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/README.md b/README.md index 00e70f3..44c13d9 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,9 @@ If you don't have ESP-IDF installed locally, you can build the firmware using th 2. Copy the merged firmware binary out of the image: ```bash - docker run --rm esp-scope-firmware cat /workspace/build/merged-firmware.bin > esp-scope-esp32-merged.bin + cid=$(docker create esp-scope-firmware) + docker cp "$cid:/workspace/build/merged-firmware.bin" esp-scope-esp32-merged.bin + docker rm "$cid" ``` 3. Flash from within Docker (Linux only, requires access to the host USB device):