Merge pull request #39 from hundehausen/patch-2

Update p2pool v3.3

.github/workflows/trivy-analysis.yml

@@ -13,10 +13,10 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: "ubuntu-18.04"
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build an image from Dockerfile
         run: |
@@ -32,6 +32,6 @@ jobs:
           severity: 'CRITICAL,HIGH'
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: 'trivy-results.sarif'

.github/workflows/update-base-image.yml

@@ -3,39 +3,51 @@ on:
   schedule:
     - cron: "0 12 * * 1" # Run every Monday at noon.
   workflow_dispatch:
+
 jobs:
   rebuild-container:
     name: "Rebuild Container with the latest base image"
     runs-on: ubuntu-latest
     steps:
+      - 
+        name: Prepare outputs
+        id: prep
+        run: |
+          echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+      - 
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2.1.0
+        with:
+          platforms: linux/arm64
       - 
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v2.5.0
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.10.0 
+        uses: docker/login-action@v2.1.0 
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1.10.0 
+        uses: docker/login-action@v2.1.0 
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: "Checkout repository"
-        uses: "actions/checkout@v2.3.4"
+        uses: "actions/checkout@v3"
       - 
         name: "Get p2pool Release Tag"
         id: get_tag
         run: echo "::set-output name=tag::$(awk -F "=" '/P2POOL_BRANCH=/ {print $2}' Dockerfile)"
       - 
-        name: Build and push to Docker Hub and Github Packages Docker Registry
+        name: Build and push to Docker Hub and GitHub Packages Docker Registry
         id: docker_build
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v4.0.0
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ github.repository_owner }}/p2pool:latest
             ghcr.io/${{ github.repository_owner }}/p2pool:${{ steps.get_tag.outputs.tag }}
@@ -45,12 +57,3 @@ jobs:
             org.opencontainers.image.source=${{ github.event.repository.html_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
             org.opencontainers.image.revision=${{ github.sha }}
-      - 
-        name: Scan new image and output results
-        uses: Azure/container-scan@v0
-        with:
-          image-name: ${{ secrets.DOCKER_USERNAME }}/p2pool:${{ steps.get_tag.outputs.tag }}
-          severity-threshold: HIGH
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/update-image-on-push.yml

@@ -2,6 +2,8 @@ name: "Update image and push to Github Packages and Docker Hub when Dockerfile i
 # Run this workflow every time a new commit pushed to your repository
 on:
   push:
+    branches:
+    - main
     paths:
     - 'Dockerfile'
 jobs:
@@ -9,34 +11,45 @@ jobs:
     name: "Rebuild Container with the latest base image"
     runs-on: ubuntu-latest
     steps:
+      - 
+        name: Prepare outputs
+        id: prep
+        run: |
+          echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+      - 
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2.1.0
+        with:
+          platforms: linux/arm64
       - 
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v2.5.0
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.10.0 
+        uses: docker/login-action@v2.1.0 
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1.10.0 
+        uses: docker/login-action@v2.1.0 
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: "Checkout repository"
-        uses: "actions/checkout@v2.3.4"
+        uses: "actions/checkout@v3"
       - 
         name: "Get p2pool Release Tag"
         id: get_tag
         run: echo "::set-output name=tag::$(awk -F "=" '/P2POOL_BRANCH=/ {print $2}' Dockerfile)"
       - 
-        name: Build and push to Docker Hub and Github Packages Docker Registry
+        name: Build and push to Docker Hub and GitHub Packages Docker Registry
-        id: docker_build
+        uses: docker/build-push-action@v4.0.0
-        uses: docker/build-push-action@v2.7.0
+        id: docker_build_push
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ github.repository_owner }}/p2pool:latest
             ghcr.io/${{ github.repository_owner }}/p2pool:${{ steps.get_tag.outputs.tag }}
@@ -46,12 +59,5 @@ jobs:
             org.opencontainers.image.source=${{ github.event.repository.html_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
             org.opencontainers.image.revision=${{ github.sha }}
-      - 
+          cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/simple-monerod:latest
-        name: Scan new image and output results
+          cache-to: type=inline
-        uses: Azure/container-scan@v0
-        with:
-          image-name: ${{ secrets.DOCKER_USERNAME }}/p2pool:${{ steps.get_tag.outputs.tag }}
-          severity-threshold: HIGH
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -1,7 +1,7 @@
-ARG P2POOL_BRANCH=v1.3.1
+ARG P2POOL_BRANCH=v3.3
 
-# Select Ubuntu 20.04LTS for the build image base
+# Select latest Ubuntu LTS for the build image base
-FROM ubuntu:20.04 as build
+FROM ubuntu:latest as build
 LABEL author="sethforprivacy@protonmail.com" \
       maintainer="sethforprivacy@protonmail.com"
 
@@ -10,7 +10,7 @@ RUN apt-get update \
     && apt-get upgrade -y \
     && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends git \
     build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev \
-    libgss-dev ca-certificates\
+    libgss-dev libcurl4-openssl-dev libidn2-0-dev ca-certificates \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -30,13 +30,14 @@ RUN git clone --recursive --branch ${P2POOL_BRANCH} https://github.com/SChernykh
 ARG NPROC
 RUN test -z "$NPROC" && nproc > /nproc || echo -n "$NPROC" > /nproc && mkdir build && cd build && cmake .. && make -j"$(cat /nproc)"
 
-# Select Ubuntu 20.04LTS for the image base
+# Select latest Ubuntu LTS for the image base
-FROM ubuntu:20.04
+FROM ubuntu:latest
 
 # Install remaining dependencies
 RUN apt-get update \
     && apt-get upgrade -y \
-    && apt-get install --no-install-recommends -y libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev \
+    && apt-get install --no-install-recommends -y libuv1-dev libzmq3-dev libsodium-dev \
+    libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

examples/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.5'
 services:
   monerod:
-    image: sethsimmons/simple-monerod:p2pool-api-v0.17
+    image: sethsimmons/simple-monerod:latest
     restart: unless-stopped
     container_name: monerod
     volumes:
@@ -34,7 +34,7 @@ services:
       - 37889:37889
     command: >-
       --wallet "468ydghFfthE3UTc53eF5MP9UyrMcUiAHP5kizVYJsej5XGaXBoAAEzUHCcUF7t3E3RrYAX8Rs1ujhBdcvMpZSbH8qkb55R"
-      --stratum "0.0.0.0:3333" --p2p "0.0.0.0:37889"
+      --stratum "0.0.0.0:3333" --p2p "0.0.0.0:37889" --rpc-port "18089"
       --addpeers "65.21.227.114:37889,node.sethforprivacy.com:37889" --host "monerod"
 
   tor: