Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Ubuntu 24.04 #336

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Update for Ubuntu 24.04 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
730198a
Update for Ubuntu 24.04
pjonsson Dec 2, 2024
4efc683
Dockerfile: set FROM to base:ubuntu24
pjonsson Dec 23, 2024
0aed0fe
Dockerfile: workaround CI test failure
pjonsson Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

# base installation to speed up build process
# https://github.com/davidfrantz/base_image
FROM davidfrantz/base:latest as force_builder
FROM davidfrantz/base:ubuntu24 AS force_builder

# Environment variables
ENV SOURCE_DIR $HOME/src/force
Expand All @@ -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" && \
Expand All @@ -54,12 +54,13 @@ RUN echo "building FORCE" && \
# clone FORCE UDF
git clone https://github.com/davidfrantz/force-udf.git

FROM davidfrantz/base:latest as force
FROM davidfrantz/base:ubuntu24 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
# FIXME: workaround to make CI tests (that run as uid < 1000) pass.
RUN chmod 777 /home/ubuntu

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
Expand Down
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading