Merge pull request #161 from sethforprivacy/fix-legacy-dockerfile-syntax

Fix legacy Dockerfile syntax flagged by BuildKit

.github/renovate.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended",
+    "docker:enableMajor",
+    "mergeConfidence:all-badges",
+    ":disableRateLimiting",
+    ":semanticCommits"
+  ],
+  "rebaseWhen": "conflicted",
+  "customManagers": [
+    {
+      "customType": "regex",
+      "managerFilePatterns": [
+        "/(^|/)Dockerfile$/"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\sARG .*?_VERSION=(?<currentValue>.*)(\\sARG .*?_CHECKSUM=(?<currentDigest>.*))?\\s",
+        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\sARG .*?_BRANCH=(?<currentValue>.*)(\\sARG .*?_COMMIT_HASH=(?<currentDigest>.*))?\\s"
+      ],
+      "versioningTemplate": "{{#if versioning}}{{versioning}}{{/if}}"
+    }
+  ]
+}

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

@@ -40,7 +40,7 @@ jobs:
         uses: docker/setup-buildx-action@v4.1.0
       -
         name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       -
         name: Test build of image
         id: build

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

@@ -50,7 +50,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       -
         name: Build and and push by digest
         uses: docker/build-push-action@v7.2.0
@@ -98,7 +98,7 @@ jobs:
         uses: docker/setup-buildx-action@v4.1.0
 
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       
       - name: Get p2pool release tag
         run: echo P2POOL_TAG="$(awk -F '=' '/P2POOL_BRANCH=/ {print $2}' Dockerfile)" >> $GITHUB_ENV

Dockerfile

@@ -1,7 +1,8 @@
-ARG P2POOL_BRANCH=v4.15.1
+# renovate: datasource=github-releases depName=SChernykh/p2pool
+ARG P2POOL_BRANCH=v4.17
 
-# Select latest Ubuntu LTS for the build image base
+# Pin to the latest Ubuntu LTS for the build image base (kept current by Renovate)
-FROM ubuntu:latest as build
+FROM ubuntu:26.04 AS build
 LABEL author="sethforprivacy@protonmail.com" \
       maintainer="sethforprivacy@protonmail.com"
 
@@ -16,28 +17,30 @@ RUN apt-get update \
 
 ENV CFLAGS='-fPIC'
 ENV CXXFLAGS='-fPIC'
-ENV USE_SINGLE_BUILDDIR 1
+ENV USE_SINGLE_BUILDDIR=1
-ENV BOOST_DEBUG         1
+ENV BOOST_DEBUG=1
 
 # Switch to p2pool source directory
 WORKDIR /p2pool
 
 # Git pull p2pool source at specified tag/branch
 ARG P2POOL_BRANCH
-RUN git clone --recursive --branch ${P2POOL_BRANCH} https://github.com/SChernykh/p2pool .
+RUN git clone --recursive --depth 1 --shallow-submodules --branch ${P2POOL_BRANCH} https://github.com/SChernykh/p2pool .
 
 # Make static p2pool binary
 ARG NPROC
 RUN test -z "$NPROC" && nproc > /nproc || echo -n "$NPROC" > /nproc && mkdir build && cd build && cmake .. && make -j"$(cat /nproc)"
 
-# Select latest Ubuntu LTS for the image base
+# Pin to the latest Ubuntu LTS for the image base (kept current by Renovate)
-FROM ubuntu:latest
+FROM ubuntu:26.04
 
-# Install remaining dependencies
+# Install only the runtime shared libraries that the p2pool binary links against
+# (runtime equivalents of the build-stage -dev packages, verified via ldd on the
+# built binary against the pinned Ubuntu 24.04 base)
 RUN apt-get update \
     && apt-get upgrade -y \
-    && apt-get install --no-install-recommends -y libuv1-dev libzmq3-dev libsodium-dev \
+    && apt-get install --no-install-recommends -y libuv1t64 libzmq5 libsodium23 \
-    libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev \
+    libpgm-5.3-0t64 libnorm1t64 libgssapi-krb5-2 libcurl4t64 libidn2-0 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Seth Simmons (@sethsimmons)
+Copyright (c) 2021 Seth For Privacy (@sethforprivacy)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,8 +3,8 @@ A simple and straightforward Dockerized [p2pool](https://github.com/SChernykh/p2
 
 ## Actions
 
-[![Daily Update Rebuild](https://github.com/sethsimmons/p2pool-docker//actions/workflows/update-daily.yml/badge.svg)](https://github.com/sethsimmons/p2pool-docker/actions/workflows/update-daily.yml)  
+[![Daily Update Rebuild](https://github.com/sethforprivacy/p2pool-docker//actions/workflows/update-daily.yml/badge.svg)](https://github.com/sethforprivacy/p2pool-docker/actions/workflows/update-daily.yml)  
-[![Weekly Update Rebuild](https://github.com/sethsimmons/p2pool-docker//actions/workflows/update-base-image.yml/badge.svg)](https://github.com/sethsimmons/p2pool-docker/actions/workflows/update-base-image.yml)  
+[![Weekly Update Rebuild](https://github.com/sethforprivacy/p2pool-docker//actions/workflows/update-base-image.yml/badge.svg)](https://github.com/sethforprivacy/p2pool-docker/actions/workflows/update-base-image.yml)  
 
 # Docker Hub
 This repo is used to build the images available here on GHCR.