From d64fbe5fddbc349e642c40a26cd98f0996fc4ef7 Mon Sep 17 00:00:00 2001 From: Petr Ruzicka Date: Thu, 23 Nov 2017 17:11:50 +0100 Subject: [PATCH 1/2] Adding Dockerfile and fixing build_xmr-stak_docker script --- Dockerfile | 39 ++++++++ doc/usage.md | 16 ++++ .../build_xmr-stak_docker.sh | 92 ++++++++++--------- 3 files changed, 104 insertions(+), 43 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3a98c2a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,39 @@ +# Latest version of ubuntu +FROM ubuntu + +# Default git repository +ENV GIT_REPOSITORY https://github.com/fireice-uk/xmr-stak.git +ENV CUDA_URL https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run +ENV OPENCL_URL http://pages.cs.wisc.edu/~riccardo/assets/AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 + +ENV CMAKE_C_COMPILER gcc-5 +ENV CMAKE_CXX_COMPILER g++-5 +ENV XMRSTAK_CMAKE_FLAGS -DXMR-STAK_COMPILE=generic -DCUDA_ENABLE=ON -DOpenCL_ENABLE=OFF + +# Innstall packages +RUN apt-get update \ + && set -x \ + && apt-get install -qq --no-install-recommends -y ca-certificates cmake g++ gcc git libhwloc-dev libmicrohttpd-dev libssl-dev lsb-release wget \ + && wget -q $CUDA_URL \ + && chmod u+x /cuda_*_linux-run \ + && /cuda_*_linux-run --silent --toolkit \ + && wget -q $OPENCL_URL -O - | tar xjf - -C / \ + && /AMD-APP-SDK-*-linux64.sh --keep -- --silent --acceptEULA=yes \ + && . /etc/profile.d/AMDAPPSDK.sh \ + && git clone $GIT_REPOSITORY \ + && cd /xmr-stak \ + && cmake -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ${XMRSTAK_CMAKE_FLAGS} . \ + && make \ + && cd - \ + && mv /xmr-stak/bin/* /usr/local/bin/ \ + && /AMDAPPSDK*/uninstall.sh \ + && /usr/local/cuda/bin/uninstall_cuda_*.pl > /dev/null \ + && rm -rf /AMD-APP-SDK-*-linux64.sh /AMDAPPSDK* /cuda_*_linux-run /xmr-stak \ + && apt-get purge -y -qq cmake g++ gcc git libhwloc-dev libmicrohttpd-dev libssl-dev lsb-release wget \ + && apt-get clean -qq + +VOLUME /mnt + +WORKDIR /mnt + +ENTRYPOINT ["/usr/local/bin/xmr-stak"] diff --git a/doc/usage.md b/doc/usage.md index bb35769..9cbbdd4 100644 --- a/doc/usage.md +++ b/doc/usage.md @@ -49,6 +49,22 @@ The Following options temporary overwrites the config file settings: -p, --pass PASSWD pool password, in the most cases x or empty "" ``` +## Docker image usage + +You can run the Docker image the following way: + +``` +docker run --rm -it -u $(id -u):$(id -g) --name fireice-uk/xmr-stak -v "$PWD":/mnt xmr-stak +docker stop xmr-stak +docker run --rm -it -u $(id -u):$(id -g) --name fireice-uk/xmr-stak -v "$PWD":/mnt xmr-stak --config config.txt +``` + +Debug the docker image by getting inside: + +``` +docker run --entrypoint=/bin/bash --rm -it -u $(id -u):$(id -g) --name fireice-uk/xmr-stak -v "$PWD":/mnt xmr-stak +``` + ## HTML and JSON API report configuraton To configure the reports shown on the [README](README.md) side you need to edit the httpd_port variable. Then enable wifi on your phone and navigate to [miner ip address]:[httpd_port] in your phone browser. If you want to use the data in scripts, you can get the JSON version of the data at url [miner ip address]:[httpd_port]/api.json diff --git a/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh b/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh index e046cb0..540a3f6 100755 --- a/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh +++ b/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh @@ -5,61 +5,64 @@ if [[ $EUID -ne 0 ]]; then exit 1 fi -if [ -d xmr-stak-cpu ]; then - git -C xmr-stak-cpu clean -fd +if [ -d xmr-stak ]; then + git -C xmr-stak clean -fd else - git clone https://github.com/fireice-uk/xmr-stak-cpu.git + git clone https://github.com/fireice-uk/xmr-stak.git fi ######################## -# Fedora 26 +# Fedora 27 ######################## -docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu fedora:26 /bin/bash -c " +docker run --rm -it -v $PWD/xmr-stak:/xmr-stak fedora:27 /bin/bash -c " set -ex ; dnf install -y -q gcc gcc-c++ hwloc-devel libmicrohttpd-devel libstdc++-static make openssl-devel cmake ; -cd /xmr-stak-cpu ; -cmake -DCMAKE_LINK_STATIC=ON . ; -make install ; +cd /xmr-stak ; +cmake -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +make ; " -mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_fedora_26 -git -C xmr-stak-cpu clean -fd + +mv xmr-stak/bin/xmr-stak xmr-stak_fedora_27 +git -C xmr-stak clean -fd ######################## # Ubuntu (17.04) ######################## -docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:17.04 /bin/bash -c " +docker run --rm -it -v $PWD/xmr-stak:/xmr-stak ubuntu:17.10 /bin/bash -c " set -ex ; apt update -qq ; apt install -y -qq libmicrohttpd-dev libssl-dev cmake build-essential libhwloc-dev ; -cd /xmr-stak-cpu ; -cmake -DCMAKE_LINK_STATIC=ON . ; -make install ; +cd /xmr-stak ; +cmake -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +make ; " -mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_17.04 -git -C xmr-stak-cpu clean -fd + +mv xmr-stak/bin/xmr-stak xmr-stak_ubuntu_17.10 +git -C xmr-stak clean -fd ######################## # Ubuntu 16.04 ######################## -docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:16.04 /bin/bash -c " +docker run --rm -it -v $PWD/xmr-stak:/xmr-stak ubuntu:16.04 /bin/bash -c " set -ex ; apt update -qq ; apt install -y -qq libmicrohttpd-dev libssl-dev cmake build-essential libhwloc-dev ; -cd /xmr-stak-cpu ; -cmake -DCMAKE_LINK_STATIC=ON . ; -make install ; +cd /xmr-stak ; +cmake -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +make ; " -mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_16.04 -git -C xmr-stak-cpu clean -fd + +mv xmr-stak/bin/xmr-stak xmr-stak_ubuntu_16.04 +git -C xmr-stak clean -fd ######################## # Ubuntu 14.04 ######################## -docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:14.04 /bin/bash -c " +docker run --rm -it -v $PWD/xmr-stak:/xmr-stak ubuntu:14.04 /bin/bash -c " set -ex ; apt update -qq ; apt install -y -qq curl libmicrohttpd-dev libssl-dev libhwloc-dev software-properties-common ; @@ -67,48 +70,51 @@ add-apt-repository -y ppa:ubuntu-toolchain-r/test ; apt update -qq ; apt install -y -qq gcc-7 g++-7 make ; update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 --slave /usr/bin/g++ g++ /usr/bin/g++-7 ; -curl -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz | tar -xzf - -C /tmp/ ; -( cd /tmp/cmake-3.9.0/ && ./configure && make && sudo make install && cd - ) > /dev/null +curl -L https://cmake.org/files/LatestRelease/cmake-3.10.0.tar.gz | tar -xzf - -C /tmp/ ; +( cd /tmp/cmake-*/ && ./configure && make && sudo make install && cd - ) > /dev/null update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force ; -cd /xmr-stak-cpu ; -cmake -DCMAKE_LINK_STATIC=ON . ; -make install ; +cd /xmr-stak ; +cmake -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +make ; " -mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_14.04 -git -C xmr-stak-cpu clean -fd + +mv xmr-stak/bin/xmr-stak xmr-stak_ubuntu_14.04 +git -C xmr-stak clean -fd ######################## # CentOS 7 ######################## -docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu centos:7 /bin/bash -c " +docker run --rm -it -v $PWD/xmr-stak:/xmr-stak centos:7 /bin/bash -c " set -ex ; yum install -y -q centos-release-scl epel-release ; yum install -y -q cmake3 devtoolset-4-gcc* hwloc-devel libmicrohttpd-devel openssl-devel make ; scl enable devtoolset-4 - << EOF -cd /xmr-stak-cpu ; -cmake3 -DCMAKE_LINK_STATIC=ON . ; -make install ; +cd /xmr-stak ; +cmake3 -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +make ; EOF " -mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_centos_7 -git -C xmr-stak-cpu clean -fd + +mv xmr-stak/bin/xmr-stak xmr-stak_centos_7 +git -C xmr-stak clean -fd ######################## # CentOS 6.x ######################## -docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu centos:6 /bin/bash -c " +docker run --rm -it -v $PWD/xmr-stak:/xmr-stak centos:6 /bin/bash -c " set -ex ; yum install -y -q centos-release-scl epel-release ; yum install -y -q cmake3 devtoolset-4-gcc* hwloc-devel libmicrohttpd-devel openssl-devel make ; scl enable devtoolset-4 - << EOF -cd /xmr-stak-cpu ; -cmake3 -DCMAKE_LINK_STATIC=ON . ; -make install ; +cd /xmr-stak ; +cmake3 -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +make ; EOF " -mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_centos_6 -git -C xmr-stak-cpu clean -fd -rm -rf xmr-stak-cpu +mv xmr-stak/bin/xmr-stak xmr-stak_centos_6 +git -C xmr-stak clean -fd + +rm -rf xmr-stak From 13b07fff1849bd75310a362659110b2ff85318c2 Mon Sep 17 00:00:00 2001 From: Petr Ruzicka Date: Sat, 25 Nov 2017 20:39:34 +0100 Subject: [PATCH 2/2] CUDA added to build_xmr-stak_docker script --- Dockerfile | 23 ++--- .../build_xmr-stak_docker.sh | 85 +++++++++++-------- 2 files changed, 55 insertions(+), 53 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a98c2a..3e996ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,35 +1,22 @@ # Latest version of ubuntu -FROM ubuntu +FROM nvidia/cuda:9.0-base # Default git repository ENV GIT_REPOSITORY https://github.com/fireice-uk/xmr-stak.git -ENV CUDA_URL https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -ENV OPENCL_URL http://pages.cs.wisc.edu/~riccardo/assets/AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 - -ENV CMAKE_C_COMPILER gcc-5 -ENV CMAKE_CXX_COMPILER g++-5 ENV XMRSTAK_CMAKE_FLAGS -DXMR-STAK_COMPILE=generic -DCUDA_ENABLE=ON -DOpenCL_ENABLE=OFF # Innstall packages RUN apt-get update \ && set -x \ - && apt-get install -qq --no-install-recommends -y ca-certificates cmake g++ gcc git libhwloc-dev libmicrohttpd-dev libssl-dev lsb-release wget \ - && wget -q $CUDA_URL \ - && chmod u+x /cuda_*_linux-run \ - && /cuda_*_linux-run --silent --toolkit \ - && wget -q $OPENCL_URL -O - | tar xjf - -C / \ - && /AMD-APP-SDK-*-linux64.sh --keep -- --silent --acceptEULA=yes \ - && . /etc/profile.d/AMDAPPSDK.sh \ + && apt-get install -qq --no-install-recommends -y ca-certificates cmake cuda-core-9-0 git cuda-cudart-dev-9-0 libhwloc-dev libmicrohttpd-dev libssl-dev \ && git clone $GIT_REPOSITORY \ && cd /xmr-stak \ - && cmake -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ${XMRSTAK_CMAKE_FLAGS} . \ + && cmake ${XMRSTAK_CMAKE_FLAGS} . \ && make \ && cd - \ && mv /xmr-stak/bin/* /usr/local/bin/ \ - && /AMDAPPSDK*/uninstall.sh \ - && /usr/local/cuda/bin/uninstall_cuda_*.pl > /dev/null \ - && rm -rf /AMD-APP-SDK-*-linux64.sh /AMDAPPSDK* /cuda_*_linux-run /xmr-stak \ - && apt-get purge -y -qq cmake g++ gcc git libhwloc-dev libmicrohttpd-dev libssl-dev lsb-release wget \ + && rm -rf /xmr-stak \ + && apt-get purge -y -qq cmake cuda-core-9-0 git cuda-cudart-dev-9-0 libhwloc-dev libmicrohttpd-dev libssl-dev \ && apt-get clean -qq VOLUME /mnt diff --git a/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh b/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh index 540a3f6..bfee1b8 100755 --- a/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh +++ b/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh @@ -11,110 +11,125 @@ else git clone https://github.com/fireice-uk/xmr-stak.git fi +wget -c https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run +chmod a+x cuda_*_linux-run + ######################## # Fedora 27 ######################## -docker run --rm -it -v $PWD/xmr-stak:/xmr-stak fedora:27 /bin/bash -c " -set -ex ; -dnf install -y -q gcc gcc-c++ hwloc-devel libmicrohttpd-devel libstdc++-static make openssl-devel cmake ; -cd /xmr-stak ; +# CUDA is not going to work on Fedora 27 beacuse it's only support these distributions: http://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html +docker run --rm -it -v $PWD:/mnt fedora:27 /bin/bash -c " +set -x ; +dnf install -y -q cmake gcc-c++ hwloc-devel libmicrohttpd-devel libstdc++-static make openssl-devel; +cd /mnt/xmr-stak ; cmake -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; make ; " -mv xmr-stak/bin/xmr-stak xmr-stak_fedora_27 +test -d fedora_27 || mkdir fedora_27 +mv xmr-stak/bin/* fedora_27 git -C xmr-stak clean -fd ######################## # Ubuntu (17.04) ######################## -docker run --rm -it -v $PWD/xmr-stak:/xmr-stak ubuntu:17.10 /bin/bash -c " -set -ex ; +docker run --rm -it -v $PWD:/mnt ubuntu:17.04 /bin/bash -c " +set -x ; apt update -qq ; apt install -y -qq libmicrohttpd-dev libssl-dev cmake build-essential libhwloc-dev ; -cd /xmr-stak ; -cmake -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +cd /mnt/xmr-stak ; +/mnt/cuda_*_linux-run --silent --toolkit ; +cmake -DCUDA_ENABLE=ON -DOpenCL_ENABLE=OFF . ; make ; " -mv xmr-stak/bin/xmr-stak xmr-stak_ubuntu_17.10 +test -d ubuntu_17.10 || mkdir ubuntu_17.10 +mv xmr-stak/bin/* ubuntu_17.10 git -C xmr-stak clean -fd ######################## # Ubuntu 16.04 ######################## -docker run --rm -it -v $PWD/xmr-stak:/xmr-stak ubuntu:16.04 /bin/bash -c " -set -ex ; +docker run --rm -it -v $PWD:/mnt ubuntu:16.04 /bin/bash -c " +set -x ; apt update -qq ; -apt install -y -qq libmicrohttpd-dev libssl-dev cmake build-essential libhwloc-dev ; -cd /xmr-stak ; -cmake -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +apt install -y -qq cmake g++ libmicrohttpd-dev libssl-dev libhwloc-dev ; +cd /mnt/xmr-stak ; +/mnt/cuda_*_linux-run --silent --toolkit ; +cmake -DCUDA_ENABLE=ON -DOpenCL_ENABLE=OFF . ; make ; " -mv xmr-stak/bin/xmr-stak xmr-stak_ubuntu_16.04 +test -d ubuntu_16.04 || mkdir ubuntu_16.04 +mv xmr-stak/bin/* ubuntu_16.04 git -C xmr-stak clean -fd ######################## # Ubuntu 14.04 ######################## -docker run --rm -it -v $PWD/xmr-stak:/xmr-stak ubuntu:14.04 /bin/bash -c " -set -ex ; +docker run --rm -it -v $PWD:/mnt ubuntu:14.04 /bin/bash -c " +set -x ; apt update -qq ; apt install -y -qq curl libmicrohttpd-dev libssl-dev libhwloc-dev software-properties-common ; add-apt-repository -y ppa:ubuntu-toolchain-r/test ; apt update -qq ; -apt install -y -qq gcc-7 g++-7 make ; -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 --slave /usr/bin/g++ g++ /usr/bin/g++-7 ; +apt install -y -qq gcc-6 g++-6 make ; +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 1 --slave /usr/bin/g++ g++ /usr/bin/g++-6 ; curl -L https://cmake.org/files/LatestRelease/cmake-3.10.0.tar.gz | tar -xzf - -C /tmp/ ; ( cd /tmp/cmake-*/ && ./configure && make && sudo make install && cd - ) > /dev/null update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force ; -cd /xmr-stak ; -cmake -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; +cd /mnt/xmr-stak ; +/mnt/cuda_*_linux-run --silent --toolkit ; +cmake -DCUDA_ENABLE=ON -DOpenCL_ENABLE=OFF . ; make ; " -mv xmr-stak/bin/xmr-stak xmr-stak_ubuntu_14.04 +test -d ubuntu_14.04 || mkdir ubuntu_14.04 +mv xmr-stak/bin/* ubuntu_14.04 git -C xmr-stak clean -fd ######################## # CentOS 7 ######################## -docker run --rm -it -v $PWD/xmr-stak:/xmr-stak centos:7 /bin/bash -c " -set -ex ; +# CUDA is not going to work on CentOS/RHEL beacuse it's only support gcc-4 in these distributions: http://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html +docker run --rm -it -v $PWD:/mnt centos:7 /bin/bash -c " +set -x ; yum install -y -q centos-release-scl epel-release ; -yum install -y -q cmake3 devtoolset-4-gcc* hwloc-devel libmicrohttpd-devel openssl-devel make ; -scl enable devtoolset-4 - << EOF -cd /xmr-stak ; +yum install -y -q cmake3 devtoolset-7-gcc* hwloc-devel libmicrohttpd-devel make openssl-devel perl ; +scl enable devtoolset-7 - << EOF +cd /mnt/xmr-stak ; cmake3 -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; make ; EOF " -mv xmr-stak/bin/xmr-stak xmr-stak_centos_7 +test -d centos_7 || mkdir centos_7 +mv xmr-stak/bin/* centos_7 git -C xmr-stak clean -fd ######################## # CentOS 6.x ######################## -docker run --rm -it -v $PWD/xmr-stak:/xmr-stak centos:6 /bin/bash -c " -set -ex ; +# CUDA is not going to work on CentOS/RHEL beacuse it's only support gcc-4 in these distributions: http://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html +docker run --rm -it -v $PWD:/mnt centos:6 /bin/bash -c " +set -x ; yum install -y -q centos-release-scl epel-release ; -yum install -y -q cmake3 devtoolset-4-gcc* hwloc-devel libmicrohttpd-devel openssl-devel make ; -scl enable devtoolset-4 - << EOF -cd /xmr-stak ; +yum install -y -q cmake3 devtoolset-7-gcc* hwloc-devel libmicrohttpd-devel openssl-devel make ; +scl enable devtoolset-7 - << EOF +cd /mnt/xmr-stak ; cmake3 -DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF . ; make ; EOF " -mv xmr-stak/bin/xmr-stak xmr-stak_centos_6 +test -d centos_6 || mkdir centos_6 +mv xmr-stak/bin/* centos_6 git -C xmr-stak clean -fd rm -rf xmr-stak