Skip to content

Commit

Permalink
fix: use rapidjson from anaconda
Browse files Browse the repository at this point in the history
  • Loading branch information
Michsior14 committed Sep 23, 2024
1 parent fe27ab8 commit e7a31af
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
13 changes: 7 additions & 6 deletions tools/ubuntu-occt-asi-cgal-eigen-node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ ARG occt_version=7.8.1
ARG cgal_version=5.6.1
ARG eigen_version=3.4.0
ARG nvm_version=0.39.7
ARG rapidjson_version="1.1.0=hdb19cb5_1"
ARG rapidjson_version=1.1.0
ARG asi_version=fc7818a4
ARG asi_version_mode=commit

# Conditional setup of the asi version based on commit or release
FROM continuumio/miniconda3:latest as build-base
FROM continuumio/miniconda3 AS build-base

FROM build-base as build-release
FROM build-base AS build-release
ARG asi_version
ONBUILD ENV ASI_VERSION v${asi_version}

FROM build-base as build-commit
FROM build-base AS build-commit
ARG asi_version
ONBUILD ENV ASI_VERSION ${asi_version}

# Conda temporary image
FROM build-${asi_version_mode} as conda
FROM build-${asi_version_mode} AS conda
ARG cgal_version
ARG occt_version
ARG eigen_version
Expand All @@ -36,7 +36,8 @@ RUN apt-get update -q && \
&& rm -rf /var/lib/apt/lists/*

# Install conda packages
RUN conda install -y cgal-cpp=$cgal_version occt=$occt_version eigen=$eigen_version rapidjson=$rapidjson_version --channel conda-forge
RUN conda config --add channels conda-forge
RUN conda install -y cgal-cpp=$cgal_version occt=$occt_version eigen=$eigen_version anaconda::rapidjson=$rapidjson_version

RUN mkdir /sources
WORKDIR /sources
Expand Down
5 changes: 3 additions & 2 deletions tools/ubuntu-occt-cgal-eigen-node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ ARG eigen_version=3.4.0
ARG nvm_version=0.39.7

# Conda temporary image
FROM continuumio/miniconda3:latest as conda
FROM continuumio/miniconda3 AS conda
ARG cgal_version
ARG occt_version
ARG eigen_version

ENV PATH /opt/conda/bin:$PATH

# Install conda packages
RUN conda install -y cgal-cpp=$cgal_version occt=$occt_version eigen=$eigen_version --channel conda-forge
RUN conda config --add channels conda-forge
RUN conda install -y cgal-cpp=$cgal_version occt=$occt_version eigen=$eigen_version

# Target image
FROM "ubuntu:$ubuntu_version"
Expand Down

0 comments on commit e7a31af

Please sign in to comment.