Skip to content

establishing compatibility with Apple architecture - #560

Merged
mdroll merged 1 commit into
developfrom
feature/apple-adoptions
Sep 7, 2026
Merged

establishing compatibility with Apple architecture#560
mdroll merged 1 commit into
developfrom
feature/apple-adoptions

Conversation

@ThomasMichael1811

@ThomasMichael1811 ThomasMichael1811 commented Sep 5, 2026

Copy link
Copy Markdown
Contributor

This PR updates the default “petclinic” base image and test/build dependencies to improve compatibility when running the project on Apple Silicon (arm64), avoiding Alpine/legacy native library issues.

Changes:

Switch petclinic image references from eclipse-temurin:17-jre-alpine to eclipse-temurin:17-jre across example application YAMLs, tests, and dev registry scripts.
Exclude groovy-groovysh and jline from the test-scoped groovy-all dependency to prevent Apple Silicon failures caused by an incompatible bundled native Jansi library.
Minor formatting/indentation cleanup in ArgoCDTest.groovy.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The changes are narrowly scoped, consistent across configs/scripts/tests, and the Maven exclusions are targeted to the documented Apple Silicon failure mode.

Pull request overview

This PR updates the default “petclinic” base image and test/build dependencies to improve compatibility when running the project on Apple Silicon (arm64), avoiding Alpine/legacy native library issues.

Changes:

  • Switch petclinic image references from eclipse-temurin:17-jre-alpine to eclipse-temurin:17-jre across example application YAMLs, tests, and dev registry scripts.
  • Exclude groovy-groovysh and jline from the test-scoped groovy-all dependency to prevent Apple Silicon failures caused by an incompatible bundled native Jansi library.
  • Minor formatting/indentation cleanup in ArgoCDTest.groovy.
File summaries
File Description
src/test/groovy/com/cloudogu/gitops/tools/core/argocd/ArgoCDTest.groovy Updates the test config’s petclinic image reference and normalizes indentation in a constructor call.
src/main/resources/application-operator-full.yaml Updates example petclinic image to a non-Alpine Temurin JRE tag.
src/main/resources/application-operator-content-examples.yaml Updates example petclinic image to a non-Alpine Temurin JRE tag.
src/main/resources/application-keycloak.yaml Updates example petclinic image to a non-Alpine Temurin JRE tag.
src/main/resources/application-full.yaml Updates example petclinic image to a non-Alpine Temurin JRE tag.
src/main/resources/application-full-prefix.yaml Updates example petclinic image to a non-Alpine Temurin JRE tag.
src/main/resources/application-content-examples.yaml Updates example petclinic image to a non-Alpine Temurin JRE tag.
scripts/dev/prepare_two_registries.sh Updates the locally mirrored petclinic image tag used in the generated config snippet.
scripts/dev/mirror_images_to_registry.sh Updates the mirrored Temurin image tag and corresponding skopeo copy destinations.
pom.xml Adds test-scope exclusions to avoid Apple Silicon failures caused by groovy-groovysh/jline pulling in incompatible native libs.
Review details
  • Files reviewed: 10/10 changed files
  • Comments generated: 0
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@mdroll mdroll self-assigned this Sep 7, 2026
@mdroll
mdroll self-requested a review September 7, 2026 07:21
@mdroll mdroll removed their assignment Sep 7, 2026
@mdroll mdroll changed the title adoption to run on Apple Silicon establishing compatibility with Apple architecture Sep 7, 2026

@mdroll mdroll left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm:
Tested normal unit test run
Tested full profile run in cluster
Tested operator-full

@mdroll
mdroll merged commit 52dfe72 into develop Sep 7, 2026
3 checks passed
@mdroll
mdroll deleted the feature/apple-adoptions branch September 7, 2026 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants