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

Jump to bottom

Correct CMAKE_BUILD_TYPE in end user Docker images #2894

Merged
merged 3 commits into from
Nov 18, 2023
Merged

Correct CMAKE_BUILD_TYPE in end user Docker images #2894

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
3103738
Fix end user build type
jorgensd Nov 17, 2023
95583cb
Remove CXX_FLAGS
jorgensd Nov 17, 2023
dd88367
Remove build flags
jorgensd Nov 17, 2023
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
12 changes: 4 additions & 8 deletions .github/workflows/docker-end-user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ jobs:
uses: docker/build-push-action@v5
with:
build-args: |
DOLFINX_CMAKE_BUILD_TYPE=RelWithDebug
DOLFINX_CMAKE_CXX_FLAGS=-O2
DOLFINX_CMAKE_BUILD_TYPE=RelWithDebInfo
BASEIMAGE=${{ env.BASEIMAGE }}
context: .
file: dolfinx/${{ env.DOCKERFILE }}
Expand All @@ -146,8 +145,7 @@ jobs:
uses: docker/build-push-action@v5
with:
build-args: |
DOLFINX_CMAKE_BUILD_TYPE=RelWithDebug
DOLFINX_CMAKE_CXX_FLAGS=-O2
DOLFINX_CMAKE_BUILD_TYPE=RelWithDebInfo
BASEIMAGE=${{ env.BASEIMAGE }}
context: .
file: dolfinx/${{ env.DOCKERFILE }}
Expand All @@ -157,8 +155,7 @@ jobs:
uses: docker/build-push-action@v5
with:
build-args: |
DOLFINX_CMAKE_BUILD_TYPE=RelWithDebug
DOLFINX_CMAKE_CXX_FLAGS=-O2
DOLFINX_CMAKE_BUILD_TYPE=RelWithDebInfo
BASEIMAGE=${{ env.BASEIMAGE }}
context: .
file: dolfinx/${{ env.DOCKERFILE }}
Expand All @@ -170,8 +167,7 @@ jobs:
uses: docker/build-push-action@v5
with:
build-args: |
DOLFINX_CMAKE_BUILD_TYPE=RelWithDebug
DOLFINX_CMAKE_CXX_FLAGS=-O2
DOLFINX_CMAKE_BUILD_TYPE=RelWithDebInfo
BASEIMAGE=${{ env.BASEIMAGE }}
context: .
file: dolfinx/${{ env.DOCKERFILE }}
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.end-user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ ONBUILD RUN cd dolfinx && \
PETSC_ARCH=linux-gnu-real64-32 cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr/local/dolfinx-real -DCMAKE_BUILD_TYPE=${DOLFINX_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${DOLFINX_CMAKE_CXX_FLAGS} ../cpp && \
ninja install && \
cd ../python && \
PETSC_ARCH=linux-gnu-real64-32 pip3 install -v --config-settings=cmake.define.-DCMAKE_CXX_FLAGS="${DOLFINX_CMAKE_CXX_FLAGS}" \
PETSC_ARCH=linux-gnu-real64-32 pip3 install -v \
--config-settings=cmake.build-type="${DOLFINX_CMAKE_BUILD_TYPE}" --no-build-isolation --check-build-dependencies \
--target /usr/local/dolfinx-real/lib/python${PYTHON_VERSION}/dist-packages --no-dependencies --no-cache-dir . && \
git clean -fdx && \
Expand All @@ -101,7 +101,7 @@ ONBUILD RUN cd dolfinx && \
ninja install && \
. /usr/local/dolfinx-complex/lib/dolfinx/dolfinx.conf && \
cd ../python && \
PETSC_ARCH=linux-gnu-complex128-32 pip3 install -v --config-settings=cmake.define.-DCMAKE_CXX_FLAGS="${DOLFINX_CMAKE_CXX_FLAGS}" \
PETSC_ARCH=linux-gnu-complex128-32 pip3 install -v \
--config-settings=cmake.build-type="${DOLFINX_CMAKE_BUILD_TYPE}" --no-build-isolation --check-build-dependencies \
--target /usr/local/dolfinx-complex/lib/python${PYTHON_VERSION}/dist-packages --no-dependencies --no-cache-dir .

Expand Down
Loading