feat: update to v0.1.0 (#3)

* feat: update bitcoin & container base * feat: update CI * fix: add path
cryptogarageinc · Sep 18, 2021 · 2154e18 · 2154e18
1 parent a44e0c3
commit 2154e18
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 21 deletions.
diff --git a/.github/workflows/create-docker-image.yml b/.github/workflows/create-docker-image.yml
@@ -7,30 +7,31 @@ on:
     - 'bitcoin-*'
 
 env:
-  DOCKER_BASE_NAME: docker.pkg.github.com/${{ github.repository }}/elements-testing
+  DOCKER_BASE_NAME: ghcr.io/${{ github.repository_owner }}/elements-testing
   REPOSITORY_PATH: ${{ github.repository }}
 
 jobs:
   upload-image:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        baseimage: ['node:14.15.0-buster-slim']
+        baseimage: ['python:3.9.7-slim-buster']
 
     steps:
     - uses: actions/checkout@v2
     - name: Get tag version
       id: get_version
       run: |
         echo ::set-output name=PKG_TAG::${DOCKER_BASE_NAME}:${GITHUB_REF/refs\/tags\//}
-        echo ::set-output name=REP_USER_NAME::${REPOSITORY_PATH/\/elements-testing-dockerfile\//}
+        echo ::set-output name=REP_USER_NAME::${REPOSITORY_PATH/\/elements-testing-dockerfile//}
 
     - name: Build docker image
       env:
         PKG_TAG: ${{steps.get_version.outputs.PKG_TAG}}
       run: |
         docker build . -t "${PKG_TAG}" --build-arg BASE_IMAGE="${{ matrix.baseimage }}"
-        docker run --rm ${PKG_TAG} --version
+
+#       docker run --rm ${PKG_TAG} --version
 
 #    - name: Scan docker image
 #      env:
@@ -41,9 +42,9 @@ jobs:
 
     - name: Push to Packages
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CR_TOKEN: ${{ secrets.CR_PAT }}
         PKG_TAG: ${{steps.get_version.outputs.PKG_TAG}}
-        REP_USER_NAME: ${{steps.get_version.outputs.REP_USER_NAME}}
+        REP_USER_NAME: ${{ secrets.CR_USER_NAME }}
       run: |
-        echo "${GITHUB_TOKEN}" | docker login docker.pkg.github.com -u ${REP_USER_NAME} --password-stdin
+        echo "$CR_TOKEN" | docker login ghcr.io -u "$REP_USER_NAME" --password-stdin
         docker push "${PKG_TAG}"
diff --git a/Dockerfile b/Dockerfile
@@ -1,34 +1,40 @@
-FROM node:14.16.1-buster-slim
+FROM python:3.9.7-slim-buster
 
 # install dependencies
 RUN apt update && apt install -y \
     gpg \
     wget \
     build-essential \
-    python3 \
-    python3-dev \
-    python3-pip \
+    nodejs \
+    npm \
     git \
+  && npm install -g n \
+  && n lts \
   && rm -rf /var/lib/apt/lists/*
 
+RUN python -V && node -v
+
 WORKDIR /tmp
-ENV GPG_KEY_SERVER hkp://keyserver.ubuntu.com:80
+ENV GPG_KEY_SERVER hkps://keyserver.ubuntu.com
 # setup bitcoin
-ARG BITCOIN_VERSION=0.21.1
+ARG BITCOIN_VERSION=22.0
 ENV BITCOIN_TARBALL bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz
 ENV BITCOIN_URL_BASE https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}
-ENV BITCOIN_PGP_KEY 01EA5486DE18A882D4C2684590C8019E36C2E964
+ENV BITCOIN_PGP_KEY 982A193E3CE0EED535E09023188CBB2648416AD5 0CCBAAFD76A2ECE2CCD3141DE2FFD5B1D88CA97D 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D 637DB1E23370F84AFF88CCE03152347D07DA627C CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 6E01EEC9656903B0542B8F1003DB6322267C373B D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 82921A4B88FD454B7EB8CE3C796C4109063D4EAF 9DEAE0DC7063249FB05474681E4AED62986CD25D 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 74E2DEF5D77260B98BC19438099BAD163C70FBFA 71A3B16735405025D447E8F274810B012346C9A6
+# 82921A4B88FD454B7EB8CE3C796C4109063D4EAF
 RUN wget -qO ${BITCOIN_TARBALL} ${BITCOIN_URL_BASE}/${BITCOIN_TARBALL} \
     && gpg --keyserver ${GPG_KEY_SERVER} --recv-keys ${BITCOIN_PGP_KEY} \
+    && gpg --keyserver hkps://keys.openpgp.org --recv-keys 82921A4B88FD454B7EB8CE3C796C4109063D4EAF \
+    && wget -qO SHA256SUMS ${BITCOIN_URL_BASE}/SHA256SUMS \
     && wget -qO SHA256SUMS.asc ${BITCOIN_URL_BASE}/SHA256SUMS.asc \
     && gpg --verify SHA256SUMS.asc \
-    && sha256sum --ignore-missing --check SHA256SUMS.asc \
+    && sha256sum --ignore-missing --check SHA256SUMS \
     && tar -xzvf ${BITCOIN_TARBALL} --directory=/opt/ \
     && ln -sfn /opt/bitcoin-${BITCOIN_VERSION}/bin/* /usr/bin \
     && rm -f ${BITCOIN_TARBALL} SHA256SUMS.asc
 
 # setup elements
-ARG ELEMENTS_VERSION=0.18.1.11
+ARG ELEMENTS_VERSION=0.18.1.12
 ENV ELEMENTS_TARBALL elements-${ELEMENTS_VERSION}-x86_64-linux-gnu.tar.gz
 ENV ELEMENTS_URL_BASE https://github.com/ElementsProject/elements/releases/download/elements-${ELEMENTS_VERSION}
 ENV ELEMENTS_PGP_KEY DE10E82629A8CAD55B700B972F2A88D7F8D68E87
@@ -42,10 +48,10 @@ RUN wget -qO ${ELEMENTS_TARBALL} ${ELEMENTS_URL_BASE}/${ELEMENTS_TARBALL} \
   && rm -f ${ELEMENTS_TARBALL} SHA256SUMS.asc
 
 # setup cmake
-ENV CMAKE_VERSION 3.17.2
-ENV CMAKE_TARBALL cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
+ENV CMAKE_VERSION 3.21.2
+ENV CMAKE_TARBALL cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
 ENV CMAKE_URL_BASE https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}
-ENV CMAKE_PGP_KEY C6C265324BBEBDC350B513D02D2CEF1034921684
+ENV CMAKE_PGP_KEY 2D2CEF1034921684
 RUN 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 \
@@ -54,8 +60,13 @@ RUN wget -qO ${CMAKE_TARBALL} ${CMAKE_URL_BASE}/${CMAKE_TARBALL} \
   && sha256sum --ignore-missing --check cmake-SHA-256.txt \
   && tar -xzvf ${CMAKE_TARBALL} --directory=/opt/ \
   && ln -sfn /opt/cmake-${CMAKE_VERSION}-Linux-x86_64/bin/* /usr/bin \
-  && rm -f ${CMAKE_TARBALL} cmake-SHA-256.txt cmake-SHA-256.txt.asc
+  && rm -f ${CMAKE_TARBALL} cmake-*SHA-256.txt*
+
+ENV PATH $PATH:/opt/cmake-3.21.2-linux-x86_64/bin:/opt/elements-0.18.1.12/bin:/opt/bitcoin-22.0/bin
 
 WORKDIR /root
 
+RUN bitcoin-cli --version && elements-cli --version \
+  && python -V && node -v && cmake --version && env
+
 # TODO: set ENTRYPOINT