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

Fix submodule initialization for CIMpp in Dockerfiles. #331

Merged
merged 2 commits into from
Jan 24, 2025
Merged

Fix submodule initialization for CIMpp in Dockerfiles. #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66f7998
Fix submodule initialization for CIMpp in Dockerfiles.
pipeacosta Jan 21, 2025
1b946a4
Update the URL to the CIMpp repo in Dockerfiles.
pipeacosta Jan 23, 2025
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
3 changes: 2 additions & 1 deletion packaging/Docker/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ RUN pip3 install -r requirements.txt

# Install CIMpp from source
RUN cd /tmp && \
git clone --recurse-submodules https://github.com/cim-iec/libcimpp.git && \
git clone https://github.com/sogno-platform/libcimpp.git && \
mkdir -p libcimpp/build && cd libcimpp/build && \
git checkout ${CIMPP_COMMIT} && \
git submodule update --init && \
cmake ${CMAKE_OPTS} ..\
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 \
Expand Down
3 changes: 2 additions & 1 deletion packaging/Docker/Dockerfile.dev-debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ RUN pip3 install -r requirements.txt

## Install CIMpp from source
RUN cd /tmp && \
git clone --recurse-submodules https://github.com/cim-iec/libcimpp.git && \
git clone https://github.com/sogno-platform/libcimpp.git && \
mkdir -p libcimpp/build && cd libcimpp/build && \
git checkout ${CIMPP_COMMIT} && \
git submodule update --init && \
cmake ${CMAKE_OPTS} .. \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_LIBDIR=/usr/local/lib \
Expand Down
3 changes: 2 additions & 1 deletion packaging/Docker/Dockerfile.dev-rocky
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ RUN pip3 install gprof2dot

# Install CIMpp from source
RUN cd /tmp && \
git clone --recurse-submodules https://github.com/cim-iec/libcimpp.git && \
git clone https://github.com/sogno-platform/libcimpp.git && \
mkdir -p libcimpp/build && cd libcimpp/build && \
git checkout ${CIMPP_COMMIT} && \
git submodule update --init && \
cmake ${CMAKE_OPTS} ..\
-DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 \
-DUSE_CIM_VERSION=${CIM_VERSION} \
Expand Down
3 changes: 2 additions & 1 deletion packaging/Docker/Dockerfile.manylinux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ RUN pip3 install -r requirements-manylinux.txt

# Install CIMpp from source
RUN cd /tmp && \
git clone --recurse-submodules https://github.com/cim-iec/libcimpp.git && \
git clone https://github.com/sogno-platform/libcimpp.git && \
mkdir -p libcimpp/build && cd libcimpp/build && \
git checkout ${CIMPP_COMMIT} && \
git submodule update --init && \
cmake ${CMAKE_OPTS} .. \
-DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 \
-DUSE_CIM_VERSION=${CIM_VERSION} \
Expand Down
Loading