Update for Ubuntu 24.04

Switch the Dockerfile to using
the ubuntu user/group which is
required for building after
davidfrantz/base_image#4
has been merged.

Also remove the WORKDIR since that
is the last thing set by the Dockerfile
for davidfrantz/base.

Include paths for some dependencies
have changed, so update the Makefile
with those paths as well.

Author: pjonsson

Dockerfile

@@ -39,7 +39,7 @@ ARG debug=disable
 # Copy src to SOURCE_DIR
 RUN mkdir -p $SOURCE_DIR
 WORKDIR $SOURCE_DIR
-COPY --chown=docker:docker . .
+COPY --chown=ubuntu:ubuntu . .
 
 # Build, install, check FORCE
 RUN echo "building FORCE" && \
@@ -56,10 +56,8 @@ RUN echo "building FORCE" && \
 
 FROM davidfrantz/base:latest as force
 
-COPY --chown=docker:docker --from=force_builder $HOME/bin $HOME/bin
-COPY --chown=docker:docker --from=force_builder $HOME/force-udf $HOME/udf
-
-WORKDIR /home/docker
+COPY --chown=ubuntu:ubuntu --from=force_builder $HOME/bin $HOME/bin
+COPY --chown=ubuntu:ubuntu --from=force_builder $HOME/force-udf $HOME/udf
 
 ENV R_HOME=/usr/lib/R
 ENV LD_LIBRARY_PATH=$R_HOME/lib

Makefile

@@ -40,11 +40,13 @@ CURL_INCLUDES = -I/usr/include/curl -I/usr/include/x86_64-linux-gnu/curl
 CURL_LIBS = -L/usr/lib/x86_64-linux-gnu -lcurl
 CURL_FLAGS = -Wl,-rpath=/usr/lib/x86_64-linux-gnu
 
-OPENCV_INCLUDES = -I/usr/local/include/opencv4
+OPENCV_INCLUDES = -I/usr/include/opencv4
 OPENCV_LIBS = -L/usr/local/lib -lopencv_core -lopencv_ml -lopencv_imgproc
 OPENCV_FLAGS = -Wl,-rpath=/usr/local/lib
 
-PYTHON_INCLUDES = $(shell python3-config --includes)
+NUMPY_INCLUDE_PATH := $(shell python3 -c "import numpy; print(numpy.get_include())")
+
+PYTHON_INCLUDES = $(shell python3-config --includes) -I$(NUMPY_INCLUDE_PATH)
 PYTHON_LIBS = $(shell (python3-config --ldflags --libs --embed || python3-config --ldflags --libs) | tr -d '\n')
 
 RSTATS_INCLUDES = $(shell R CMD config --cppflags)