From f3fcf9efab1e3b01ba28c9926a961ce735cbeeaf Mon Sep 17 00:00:00 2001 From: Branton Davis Date: Mon, 27 Sep 2021 20:14:51 -0500 Subject: [PATCH] Intel GPU support and always running as odm user. --- Dockerfile.gpu | 6 +++++- Dockerfile.gpu.intel | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.gpu.intel diff --git a/Dockerfile.gpu b/Dockerfile.gpu index 9c79247..a739569 100644 --- a/Dockerfile.gpu +++ b/Dockerfile.gpu @@ -15,8 +15,12 @@ RUN apt-get install -y nodejs unzip p7zip-full && npm install -g nodemon && \ RUN mkdir /var/www WORKDIR "/var/www" -COPY . /var/www +COPY --chown=odm:odm . /var/www RUN npm install && mkdir -p tmp +RUN chown -R /var/www + +USER odm + ENTRYPOINT ["/usr/bin/node", "/var/www/index.js"] diff --git a/Dockerfile.gpu.intel b/Dockerfile.gpu.intel new file mode 100644 index 0000000..fba7b39 --- /dev/null +++ b/Dockerfile.gpu.intel @@ -0,0 +1,34 @@ +FROM opendronemap/nodeodm:gpu + +ARG RENDER_GROUP_ID=0 + +USER root + +RUN apt-get remove --purge -y intel-opencl-icd && \ + apt-get autoremove -y + +RUN mkdir /tmp/opencl +WORKDIR /tmp/opencl +RUN apt-get update && \ + apt-get install -y --no-install-recommends ocl-icd-libopencl1 curl && \ + rm -rf /var/lib/apt/lists/* && \ + curl -L "https://github.com/intel/compute-runtime/releases/download/19.41.14441/intel-gmmlib_19.3.2_amd64.deb" --output "intel-gmmlib_19.3.2_amd64.deb" && \ + curl -L "https://github.com/intel/compute-runtime/releases/download/19.41.14441/intel-igc-core_1.0.2597_amd64.deb" --output "intel-igc-core_1.0.2597_amd64.deb" && \ + curl -L "https://github.com/intel/compute-runtime/releases/download/19.41.14441/intel-igc-opencl_1.0.2597_amd64.deb" --output "intel-igc-opencl_1.0.2597_amd64.deb" && \ + curl -L "https://github.com/intel/compute-runtime/releases/download/19.41.14441/intel-opencl_19.41.14441_amd64.deb" --output "intel-opencl_19.41.14441_amd64.deb" && \ + curl -L "https://github.com/intel/compute-runtime/releases/download/19.41.14441/intel-ocloc_19.41.14441_amd64.deb" --output "intel-ocloc_19.04.12237_amd64.deb" && \ + dpkg -i /tmp/opencl/*.deb && \ + ldconfig && \ + rm -Rf /tmp/opencl +WORKDIR /var/www + +RUN apt-get update && \ + apt-get install -y --no-install-recommends clinfo + +RUN usermod -aG video,users odm +RUN usermod -aG video,users,odm root +RUN if [ "${RENDER_GROUP_ID}" -ne 0 ]; then groupadd -g "${RENDER_GROUP_ID}" render; fi + +USER odm + +ENTRYPOINT ["/usr/bin/node", "/var/www/index.js"]