diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index 3f63c3bf1..281a375c7 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -1,4 +1,5 @@ # An image derived from ledgerhq/speculos but also containing the bitcoin-core binaries +# compiled from the master branch FROM ghcr.io/ledgerhq/speculos:latest @@ -8,11 +9,10 @@ RUN apt update -y && apt install -y git curl # install autotools bitcoin-core build dependencies RUN apt install -y automake autotools-dev bsdmainutils build-essential ccache git libboost-dev libboost-filesystem-dev libboost-system-dev libboost-test-dev libevent-dev libminiupnpc-dev libnatpmp-dev libqt5gui5 libqt5core5a libqt5dbus5 libsqlite3-dev libtool libzmq3-dev pkg-config python3 qttools5-dev qttools5-dev-tools qtwayland5 systemtap-sdt-dev -# clone bitcoin-core from darosior and compile it +# clone bitcoin-core from github and compile it RUN cd / && \ - git clone https://github.com/darosior/bitcoin.git && \ + git clone https://github.com/bitcoin/bitcoin.git && \ cd bitcoin && \ - git checkout tapminiscript && \ ./autogen.sh && \ ./configure --enable-suppress-external-warnings && \ make -j "$(($(nproc)+1))" && \ @@ -27,4 +27,4 @@ COPY --from=0 /bitcoin/bin /bitcoin/bin RUN apt update -y && apt install -y libminiupnpc-dev libminiupnpc-dev libnatpmp-dev libevent-dev libzmq3-dev # Add bitcoin binaries to path -ENV PATH=/bitcoin/bin:$PATH \ No newline at end of file +ENV PATH=/bitcoin/bin:$PATH diff --git a/.github/workflows/builder-image-workflow.yml b/.github/workflows/builder-image-workflow.yml index d4c2d7487..76d3c54fa 100644 --- a/.github/workflows/builder-image-workflow.yml +++ b/.github/workflows/builder-image-workflow.yml @@ -26,7 +26,7 @@ jobs: uses: docker/build-push-action@v1 with: dockerfile: .github/workflows/Dockerfile - repository: ledgerhq/app-bitcoin-new/speculos-bitcoin-custom + repository: ledgerhq/app-bitcoin-new/speculos-bitcoin registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }}