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.

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

Docker image for ARM build #24

Merged
merged 7 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions .github/workflows/docker-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,34 @@ on:
- '.github/workflows/docker-build-image.yml'

jobs:
build:
docker:
runs-on: ubuntu-latest
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Set up Docker
uses: crazy-max/ghaction-setup-docker@v3
with:
daemon-config: |
{
"debug": true,
"features": {
"containerd-snapshotter": true
}
}

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ vars.DOCKERHUB_LOGIN }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: actions/checkout@v4
- name: Build and push the Docker image for KNP build
uses: docker/build-push-action@v6
with:
platforms: linux/amd64,linux/arm64
context: "{{defaultContext}}:docker/build-image"
load: true
push: true
tags: ${{ vars.DOCKERHUB_LOGIN }}/knp-build-image:latest
timeout-minutes: 180
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ add_third_party("gh:BlueBrain/[email protected]"
add_third_party("gh:p-ranav/[email protected]"
OPTIONS
"CSV2_BUILD_TESTS OFF"
"CSV2_TEST OFF"
"CSV2_SAMPLES OFF")

add_third_party("gh:intel/pcm"
Expand Down
6 changes: 3 additions & 3 deletions docker/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ RUN \
&& chmod +x ${DESTINATION} \
&& ln -sf ${DESTINATION} /usr/bin/docker-compose

RUN \
wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb && dpkg -i libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb && rm libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb \
&& sed -i 's/openssl_conf = openssl_init/#openssl_conf = openssl_init/g' /etc/ssl/openssl.cnf
#RUN \
# wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb && dpkg -i libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb && rm libssl1.1_1.1.1f-1ubuntu2.23_amd64.deb \
# && sed -i 's/openssl_conf = openssl_init/#openssl_conf = openssl_init/g' /etc/ssl/openssl.cnf

# COPY "${OCLINT_FILE}" .
RUN \
Expand Down
2 changes: 1 addition & 1 deletion knp/base-framework/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ knp_add_library("${PROJECT_NAME}-core"
${${PROJECT_NAME}_headers}
ALIAS KNP::BaseFramework::Core
LINK_PRIVATE
spdlog::spdlog Boost::headers Boost::filesystem #[[RapidJSON]] HighFive ${HDF5_LIB} csv2
spdlog::spdlog Boost::headers Boost::filesystem HighFive ${HDF5_LIB} csv2 # RapidJSON
# Hack to build with CLang.
${ADD_LIBS}
LINK_PUBLIC
Expand Down
Loading