Merge df031be628 into 1f7e635b04

By default this Dockerfile is suitable for using dockerhub auto build
feature to build new :latest when ever there's a new push to the
github master branch allowing for simple "official" image
distribution.

Adding build args allow specifying alternate repository (default:
https://github.com/xmrig/xmrig.git) or build reference (default:
master) example:

docker build --build-arg repo=https://github.com/<username>/xmrig.git \
             --build-arg ref=dev --tag xmrig:dev .

A multi stage build is used to keep run time image small.

CHANGELOG.md

@@ -1,6 +1,3 @@
-# v6.21.3
-- [#3462](https://github.com/xmrig/xmrig/pull/3462) RandomX: correct memcpy size for JIT initialization.
-
 # v6.21.2
 - The dependencies of all prebuilt releases have been updated. Support for old Ubuntu releases has been dropped.
 - [#2800](https://github.com/xmrig/xmrig/issues/2800) Fixed donation with GhostRider algorithm for builds without KawPow algorithm.

Dockerfile

@@ -0,0 +1,45 @@
+# Build in disposable container so run-time container is small
+FROM alpine:latest as build
+
+# Build from master by default but allow build time specification
+ARG ref=master
+ENV my_ref=$ref
+
+# Developers may wish to specify an alternate repository for source
+ARG repo=https://github.com/xmrig/xmrig.git
+ENV my_repo=$repo
+
+RUN set -ex && \
+        # testing required for hwloc
+	echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
+
+RUN set -ex && \
+	apk --no-cache --update add \
+	    coreutils file grep openssl tar binutils \
+	    cmake g++ git linux-headers libpthread-stubs make hwloc-dev@testing \
+	    libuv-dev openssl-dev
+
+WORKDIR /usr/local/src
+
+RUN set -ex && \
+    	git clone $my_repo xmrig && \
+	cd xmrig && git checkout $my_ref && \
+	cmake -B build && \
+	cd build && \
+	make 
+
+# runtime container
+FROM alpine:latest
+
+RUN set -ex && \
+        # testing required for hwloc
+	echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
+
+RUN set -ex && \
+	apk --no-cache --update add \
+	# required libraries packages
+		openssl libuv hwloc@testing
+
+COPY --from=build /usr/local/src/xmrig/build/xmrig /bin/
+
+ENTRYPOINT ["/bin/xmrig"]

src/crypto/randomx/jit_compiler_a64.cpp

@@ -1078,6 +1078,6 @@ void JitCompilerA64::h_NOP(Instruction& instr, uint32_t& codePos)
 {
 }
 
-InstructionGeneratorA64 JitCompilerA64::engine[256] = {};
+InstructionGeneratorA64 JitCompilerA64::engine[257] = {};
 
 }

src/crypto/randomx/jit_compiler_a64.hpp

@@ -74,7 +74,7 @@ namespace randomx {
 		void enableWriting() const;
 		void enableExecution() const;
 
-		static InstructionGeneratorA64 engine[256];
+		static InstructionGeneratorA64 engine[257];
 
 	private:
 		const bool hugePages;

src/crypto/randomx/jit_compiler_x86.cpp

@@ -1443,6 +1443,6 @@ namespace randomx {
 		emitByte(0x90, code, codePos);
 	}
 
-	alignas(64) InstructionGeneratorX86 JitCompilerX86::engine[256] = {};
+	alignas(64) InstructionGeneratorX86 JitCompilerX86::engine[257] = {};
 
 }

src/crypto/randomx/jit_compiler_x86.hpp

@@ -81,7 +81,7 @@ namespace randomx {
 		void enableWriting() const;
 		void enableExecution() const;
 
-		alignas(64) static InstructionGeneratorX86 engine[256];
+		alignas(64) static InstructionGeneratorX86 engine[257];
 
 	private:
 		int registerUsage[RegistersCount] = {};

src/crypto/randomx/randomx.cpp

@@ -260,7 +260,7 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx
 
 #define JIT_HANDLE(x, prev) do { \
 		const InstructionGeneratorX86_2 p = &randomx::JitCompilerX86::h_##x; \
-		memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(randomx::JitCompilerX86::engine[k])); \
+		memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(p)); \
 	} while (0)
 
 #elif (XMRIG_ARM == 8)

src/version.h

@@ -22,7 +22,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.21.3"
+#define APP_VERSION   "6.21.3-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com"