Skip to content

Commit

Permalink
Build ARM platform docker images (vesoft-inc#3240)
Browse files Browse the repository at this point in the history
* Build docker image for arm64 platform

* Fix shell check error in GitHub action runner

* build arm platform image nightly

* Cleanup v2-nightly image
  • Loading branch information
yixinglu committed Nov 2, 2021
1 parent 3ba41bd commit 99ff501
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 14 deletions.
25 changes: 14 additions & 11 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,20 @@ jobs:
- tools
steps:
- uses: actions/checkout@v2
- name: Build and push Docker images
uses: docker/build-push-action@v1
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: vesoft/nebula-${{ matrix.service }}
path: .
dockerfile: docker/Dockerfile.${{ matrix.service }}
tags: nightly,v2-nightly
cache_froms: vesoft/nebula-dev:centos7
add_git_labels: true
- uses: docker/build-push-action@v2
with:
context: .
file: ./docker/Dockerfile.${{ matrix.service }}
platforms: linux/amd64,linux/arm64
tags: |
vesoft/nebula-${{ matrix.service }}:nightly
push: true

coverage:
name: coverage
Expand All @@ -84,7 +87,6 @@ jobs:
- ubuntu2004
compiler:
- gcc-9.2

container:
image: vesoft/nebula-dev:${{ matrix.os }}
env:
Expand Down Expand Up @@ -113,11 +115,12 @@ jobs:
-DENABLE_TESTING=on \
-DENABLE_COVERAGE=on \
-B build
echo "::set-output name=j::10"
echo "::set-output name=t::10"
echo "::set-output name=j::8"
echo "::set-output name=t::6"
- name: Make
run: |
ccache -z
cmake --build build/ -j ${{ steps.cmake.outputs.j }} --target nebula-metad nebula-storaged nebula-graphd
cmake --build build/ -j ${{ steps.cmake.outputs.t }}
ccache -s
- name: CTest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ jobs:
tag="vesoft/nebula-${{ matrix.service }}:latest"
fi
echo "::set-output name=tag::$tag"
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
- uses: docker/login-action@v1
with:
Expand All @@ -87,6 +88,7 @@ jobs:
with:
context: .
file: ./docker/Dockerfile.${{ matrix.service }}
platforms: linux/amd64,linux/arm64
tags: |
vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.tag }}
vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.majorver }}
Expand Down
2 changes: 1 addition & 1 deletion third-party/install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Always use bash
shell=$(basename $(readlink /proc/$$/exe))
if [ ! x$shell = x"bash" ]
if [ ! x$shell = x"bash" ] && [[ x$shell != x"qemu-aarch64"* ]]
then
bash $0 $@
exit $?
Expand Down
2 changes: 1 addition & 1 deletion third-party/install-gcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Always use bash
shell=$(basename $(readlink /proc/$$/exe))
if [ ! x$shell = x"bash" ]
if [ ! x$shell = x"bash" ] && [[ x$shell != x"qemu-aarch64"* ]]
then
bash $0 $@
exit $?
Expand Down
2 changes: 1 addition & 1 deletion third-party/install-third-party.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# Always use bash
shell=$(basename $(readlink /proc/$$/exe))
if [ ! x$shell = x"bash" ]
if [ ! x$shell = x"bash" ] && [[ x$shell != x"qemu-aarch64"* ]]
then
bash $0 $@
exit $?
Expand Down

0 comments on commit 99ff501

Please sign in to comment.