diff --git a/.github/workflows/create-docker-image.yml b/.github/workflows/create-docker-image.yml index 5720312..efe62c2 100644 --- a/.github/workflows/create-docker-image.yml +++ b/.github/workflows/create-docker-image.yml @@ -5,6 +5,8 @@ on: tags: - 'v*' - 'bitcoin-*' + pull_request: + types: [opened, reopened, synchronize] env: IMAGE_BASE_NAME: "ghcr.io/${{ github.repository_owner }}/elements-testing" diff --git a/Dockerfile b/Dockerfile index e226bcf..e4567ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,11 +38,12 @@ ENV BITCOIN_URL_BASE https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION} ENV BITCOIN_PGP_KEY 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D 637DB1E23370F84AFF88CCE03152347D07DA627C CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 F4FC70F07310028424EFC20A8E4256593F177720 D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 287AE4CA1187C68C08B49CB2D11BD4F33F1DB499 F9A8737BF4FF5C89C903DF31DD78544CF91B1514 9DEAE0DC7063249FB05474681E4AED62986CD25D E463A93F5F3117EEDE6C7316BD02942421F4889F 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 4DAF18FE948E7A965B30F9457E296D555E7F63A7 28E72909F1717FE9607754F8A7BEB2621678D37D 74E2DEF5D77260B98BC19438099BAD163C70FBFA RUN ARCH=`uname -m` \ && echo "ARCH=$ARCH" \ - && if test "$ARCH" == "aarch64" || test "$ARCH" == "arm64"; then \ + && if test "$ARCH" = "aarch64" || test "$ARCH" = "arm64"; then \ BITCOIN_TARBALL=bitcoin-${BITCOIN_VERSION}-aarch64-linux-gnu.tar.gz ;\ else \ BITCOIN_TARBALL=bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz ;\ fi \ + && echo "BITCOIN_TARBALL=$BITCOIN_TARBALL" \ && wget -qO ${BITCOIN_TARBALL} ${BITCOIN_URL_BASE}/${BITCOIN_TARBALL} \ && wget -qO SHA256SUMS ${BITCOIN_URL_BASE}/SHA256SUMS \ && wget -qO SHA256SUMS.asc ${BITCOIN_URL_BASE}/SHA256SUMS.asc \ @@ -71,11 +72,12 @@ ENV ELEMENTS_URL_BASE https://github.com/ElementsProject/elements/releases/downl ENV ELEMENTS_PGP_KEY DE10E82629A8CAD55B700B972F2A88D7F8D68E87 BD0F3062F87842410B06A0432F656B0610604482 RUN ARCH=`uname -m` \ && echo "ARCH=$ARCH" \ - && if test "$ARCH" == "aarch64" || test "$ARCH" == "arm64"; then \ + && if test "$ARCH" = "aarch64" || test "$ARCH" = "arm64"; then \ ELEMENTS_TARBALL=elements-${ELEMENTS_VERSION}-aarch64-linux-gnu.tar.gz ;\ else \ ELEMENTS_TARBALL=elements-${ELEMENTS_VERSION}-x86_64-linux-gnu.tar.gz ;\ fi \ + && echo "ELEMENTS_TARBALL=$ELEMENTS_TARBALL" \ && wget -qO ${ELEMENTS_TARBALL} ${ELEMENTS_URL_BASE}/${ELEMENTS_TARBALL} \ && gpg -v --keyserver ${GPG_KEY_SERVER} --recv-keys ${ELEMENTS_PGP_KEY} \ && wget -qO SHA256SUMS.asc ${ELEMENTS_URL_BASE}/SHA256SUMS.asc \ @@ -95,13 +97,14 @@ ENV CMAKE_URL_BASE https://github.com/Kitware/CMake/releases/download/v${CMAKE_V ENV CMAKE_PGP_KEY 2D2CEF1034921684 RUN ARCH=`uname -m` \ && echo "ARCH=$ARCH" \ - && if test "$ARCH" == "aarch64" || test "$ARCH" == "arm64"; then \ + && if test "$ARCH" = "aarch64" || test "$ARCH" = "arm64"; then \ CMAKE_TARBALL=cmake-${CMAKE_VERSION}-linux-aarch64.tar.gz ;\ CMAKE_DIR_NAME=cmake-${CMAKE_VERSION}-linux-aarch64 ;\ else \ CMAKE_TARBALL=cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz ;\ CMAKE_DIR_NAME=cmake-${CMAKE_VERSION}-linux-x86_64 ;\ fi \ + && echo "CMAKE_TARBALL=$CMAKE_TARBALL" \ && wget -qO ${CMAKE_TARBALL} ${CMAKE_URL_BASE}/${CMAKE_TARBALL} \ && gpg --keyserver ${GPG_KEY_SERVER} --recv-keys ${CMAKE_PGP_KEY} \ && wget -qO cmake-SHA-256.txt ${CMAKE_URL_BASE}/cmake-${CMAKE_VERSION}-SHA-256.txt \ diff --git a/amd64.dockerfile b/amd64.dockerfile index dcc2d83..8b53ce3 100644 --- a/amd64.dockerfile +++ b/amd64.dockerfile @@ -37,6 +37,7 @@ ARG BITCOIN_VERSION=24.0.1 ENV BITCOIN_URL_BASE https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION} ENV BITCOIN_PGP_KEY 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D 637DB1E23370F84AFF88CCE03152347D07DA627C CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 F4FC70F07310028424EFC20A8E4256593F177720 D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 287AE4CA1187C68C08B49CB2D11BD4F33F1DB499 F9A8737BF4FF5C89C903DF31DD78544CF91B1514 9DEAE0DC7063249FB05474681E4AED62986CD25D E463A93F5F3117EEDE6C7316BD02942421F4889F 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 4DAF18FE948E7A965B30F9457E296D555E7F63A7 28E72909F1717FE9607754F8A7BEB2621678D37D 74E2DEF5D77260B98BC19438099BAD163C70FBFA RUN BITCOIN_TARBALL=bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz \ + && echo "BITCOIN_TARBALL=$BITCOIN_TARBALL" \ && wget -qO ${BITCOIN_TARBALL} ${BITCOIN_URL_BASE}/${BITCOIN_TARBALL} \ && wget -qO SHA256SUMS ${BITCOIN_URL_BASE}/SHA256SUMS \ && wget -qO SHA256SUMS.asc ${BITCOIN_URL_BASE}/SHA256SUMS.asc \ @@ -64,6 +65,7 @@ ARG ELEMENTS_VERSION=22.1 ENV ELEMENTS_URL_BASE https://github.com/ElementsProject/elements/releases/download/elements-${ELEMENTS_VERSION} ENV ELEMENTS_PGP_KEY DE10E82629A8CAD55B700B972F2A88D7F8D68E87 BD0F3062F87842410B06A0432F656B0610604482 RUN ELEMENTS_TARBALL=elements-${ELEMENTS_VERSION}-x86_64-linux-gnu.tar.gz \ + && echo "ELEMENTS_TARBALL=$ELEMENTS_TARBALL" \ && wget -qO ${ELEMENTS_TARBALL} ${ELEMENTS_URL_BASE}/${ELEMENTS_TARBALL} \ && gpg -v --keyserver ${GPG_KEY_SERVER} --recv-keys ${ELEMENTS_PGP_KEY} \ && wget -qO SHA256SUMS.asc ${ELEMENTS_URL_BASE}/SHA256SUMS.asc \ @@ -82,6 +84,7 @@ ENV CMAKE_VERSION 3.25.2 ENV CMAKE_URL_BASE https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} ENV CMAKE_PGP_KEY 2D2CEF1034921684 RUN CMAKE_TARBALL=cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz \ + && echo "CMAKE_TARBALL=$CMAKE_TARBALL" \ && wget -qO ${CMAKE_TARBALL} ${CMAKE_URL_BASE}/${CMAKE_TARBALL} \ && gpg --keyserver ${GPG_KEY_SERVER} --recv-keys ${CMAKE_PGP_KEY} \ && wget -qO cmake-SHA-256.txt ${CMAKE_URL_BASE}/cmake-${CMAKE_VERSION}-SHA-256.txt \ diff --git a/arm64.dockerfile b/arm64.dockerfile index 740ae28..6c275d9 100644 --- a/arm64.dockerfile +++ b/arm64.dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get -y clean \ && rm -rf /var/lib/apt/lists/* -RUN export PATH=/var/.npm/bin:$PATH \ +RUN export PATH="/var/.npm/bin:$PATH" \ && npm install -g n \ && n lts @@ -37,6 +37,7 @@ ARG BITCOIN_VERSION=24.0.1 ENV BITCOIN_URL_BASE https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION} ENV BITCOIN_PGP_KEY 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D 637DB1E23370F84AFF88CCE03152347D07DA627C CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 F4FC70F07310028424EFC20A8E4256593F177720 D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 287AE4CA1187C68C08B49CB2D11BD4F33F1DB499 F9A8737BF4FF5C89C903DF31DD78544CF91B1514 9DEAE0DC7063249FB05474681E4AED62986CD25D E463A93F5F3117EEDE6C7316BD02942421F4889F 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 4DAF18FE948E7A965B30F9457E296D555E7F63A7 28E72909F1717FE9607754F8A7BEB2621678D37D 74E2DEF5D77260B98BC19438099BAD163C70FBFA RUN BITCOIN_TARBALL=bitcoin-${BITCOIN_VERSION}-aarch64-linux-gnu.tar.gz \ + && echo "BITCOIN_TARBALL=$BITCOIN_TARBALL" \ && wget -qO ${BITCOIN_TARBALL} ${BITCOIN_URL_BASE}/${BITCOIN_TARBALL} \ && wget -qO SHA256SUMS ${BITCOIN_URL_BASE}/SHA256SUMS \ && wget -qO SHA256SUMS.asc ${BITCOIN_URL_BASE}/SHA256SUMS.asc \ @@ -64,6 +65,7 @@ ARG ELEMENTS_VERSION=22.1 ENV ELEMENTS_URL_BASE https://github.com/ElementsProject/elements/releases/download/elements-${ELEMENTS_VERSION} ENV ELEMENTS_PGP_KEY DE10E82629A8CAD55B700B972F2A88D7F8D68E87 BD0F3062F87842410B06A0432F656B0610604482 RUN ELEMENTS_TARBALL=elements-${ELEMENTS_VERSION}-aarch64-linux-gnu.tar.gz \ + && echo "ELEMENTS_TARBALL=$ELEMENTS_TARBALL" \ && wget -qO ${ELEMENTS_TARBALL} ${ELEMENTS_URL_BASE}/${ELEMENTS_TARBALL} \ && gpg -v --keyserver ${GPG_KEY_SERVER} --recv-keys ${ELEMENTS_PGP_KEY} \ && wget -qO SHA256SUMS.asc ${ELEMENTS_URL_BASE}/SHA256SUMS.asc \ @@ -82,6 +84,7 @@ ENV CMAKE_VERSION 3.25.2 ENV CMAKE_URL_BASE https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} ENV CMAKE_PGP_KEY 2D2CEF1034921684 RUN CMAKE_DIR_NAME=cmake-${CMAKE_VERSION}-linux-aarch64 \ + && echo "CMAKE_TARBALL=$CMAKE_TARBALL" \ && wget -qO ${CMAKE_TARBALL} ${CMAKE_URL_BASE}/${CMAKE_TARBALL} \ && gpg --keyserver ${GPG_KEY_SERVER} --recv-keys ${CMAKE_PGP_KEY} \ && wget -qO cmake-SHA-256.txt ${CMAKE_URL_BASE}/cmake-${CMAKE_VERSION}-SHA-256.txt \