-
Notifications
You must be signed in to change notification settings - Fork 213
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
Arm64 images #1418
Merged
Merged
Arm64 images #1418
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
ebe8d54
add arm64 image builds using docker buildx
adejanovski 66e3138
fix
adejanovski b27a769
fix tag computation
adejanovski 98034f6
fix image base and use separate tags
adejanovski e87e210
refactor the Dockerfile to accommodate docker buildx
adejanovski ea4b65c
Build the shaded jar before building the docker image
adejanovski 7711f22
add debugging action
adejanovski c525dfe
Clean up the PR
adejanovski 8a45a15
Fix docker test script
adejanovski ccd7400
Address review comments
adejanovski File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -364,15 +364,15 @@ jobs: | |
run: | | ||
pip install pyyaml | ||
pip install ccm | ||
|
||
- name: Setup CCM Cluster | ||
run: ./.github/scripts/configure-ccm.sh | ||
env: | ||
TEST_TYPE: ${{ matrix.test-type }} | ||
CASSANDRA_VERSION: ${{ matrix.cassandra-version }} | ||
STORAGE_TYPE: ${{ matrix.storage-type }} | ||
JDK_VERSION: ${{ matrix.jdk-version }} | ||
|
||
- name: Run Tests | ||
run: ./.github/scripts/run-tests.sh || ./.github/scripts/run-tests.sh | ||
env: | ||
|
@@ -383,10 +383,10 @@ jobs: | |
GRIM_MAX: ${{ matrix.grim-max }} | ||
GRIM_MIN: ${{ matrix.grim-min }} | ||
JDK_VERSION: ${{ matrix.jdk-version }} | ||
|
||
- uses: codecov/codecov-action@v1 | ||
|
||
|
||
its-flapping: | ||
needs: [docker-tests, its-ccm-local, its-ccm-cass] | ||
name: Flapping reapers | ||
|
@@ -411,23 +411,23 @@ jobs: | |
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
|
||
- name: Setup | ||
uses: ./.github/actions/setup | ||
|
||
- name: Install CCM | ||
run: | | ||
pip install pyyaml | ||
pip install ccm | ||
|
||
- name: Setup CCM Cluster | ||
run: ./.github/scripts/configure-ccm.sh | ||
env: | ||
TEST_TYPE: ${{ matrix.test-type }} | ||
CASSANDRA_VERSION: ${{ matrix.cassandra-version }} | ||
STORAGE_TYPE: ${{ matrix.storage-type }} | ||
JDK_VERSION: ${{ matrix.jdk-version }} | ||
|
||
- name: Run Tests | ||
run: | | ||
./.github/scripts/run-tests.sh || ./.github/scripts/run-tests.sh || ./.github/scripts/run-tests.sh | ||
|
@@ -439,7 +439,7 @@ jobs: | |
GRIM_MAX: ${{ matrix.grim-max }} | ||
GRIM_MIN: ${{ matrix.grim-min }} | ||
JDK_VERSION: ${{ matrix.jdk-version }} | ||
|
||
- uses: codecov/codecov-action@v1 | ||
|
||
release: | ||
|
@@ -457,7 +457,7 @@ jobs: | |
- name: Compute version number | ||
run: | | ||
VERSION=$(printf 'VER\t${project.version}' | mvn help:evaluate | grep '^VER' | cut -f2) | ||
if [ "${GITHUB_REF}" = "refs/heads/master" ] | ||
if [ "${GITHUB_REF}" = "refs/heads/arm64-images" ] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. question: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good catch, let me change it before merging |
||
then | ||
# We're building a beta version | ||
VERSION=$(printf 'VER\t${project.version}' | mvn help:evaluate | grep '^VER' | cut -f2) | ||
|
@@ -472,12 +472,35 @@ jobs: | |
run: | | ||
MAVEN_OPTS="-Xmx384m" mvn -B install -DskipTests | ||
|
||
- name: Set up QEMU | ||
uses: docker/setup-qemu-action@v2 | ||
with: | ||
platforms: 'arm64,arm' | ||
- name: Set up Docker Buildx | ||
uses: docker/setup-buildx-action@v2 | ||
- name: Login to DockerHub | ||
uses: docker/login-action@v2 | ||
with: | ||
username: ${{ secrets.DOCKERHUB_USER }} | ||
password: ${{ secrets.DOCKERHUB_PASSWORD }} | ||
- name: Build packages | ||
env: | ||
DOCKER_USER: ${{ secrets.DOCKERHUB_USER }} | ||
DOCKER_PASS: ${{ secrets.DOCKERHUB_PASSWORD }} | ||
run: ./.github/scripts/before_deploy.sh | ||
|
||
- name: tags | ||
run: | | ||
echo "Tags: ${{ env.DOCKER_TAG1 }} and ${{ env.DOCKER_TAG2 }}" | ||
- name: Build image and push | ||
id: docker_build | ||
uses: docker/build-push-action@v4 | ||
with: | ||
file: src/server/src/main/docker/Dockerfile | ||
context: . | ||
build-args: | | ||
SHADED_JAR=${{ env.SHADED_JAR }} | ||
push: true | ||
tags: ${{ env.DOCKER_TAG1 }},${{ env.DOCKER_TAG2 }} | ||
platforms: linux/amd64,linux/arm64 | ||
cache-from: type=local,src=/tmp/.buildx-cache | ||
cache-to: type=local,dest=/tmp/.buildx-cache | ||
- name: Locate deb and rpm packages for upload | ||
run: | | ||
REPO=reaper-deb | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:
would be nice to not have these single space character additions as changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
definitely, sorry about that