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

Add tip about ARM64 when generating Docker Compose files #21247

Merged
merged 7 commits into from
Feb 28, 2023
Merged

Add tip about ARM64 when generating Docker Compose files #21247

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a384e9c
Add tip about ARM64 when generating Docker Compose files
mraible Feb 27, 2023
ca7aa67
Add additional arguments needed for ARM64
mraible Feb 28, 2023
ee0b39d
Polishing
mraible Feb 28, 2023
f2ed3da
Update snapshots
mraible Feb 28, 2023
6f43a8d
Use string template
mraible Feb 28, 2023
2d53c24
Merge branch 'main' into docker-arm64-tip
mraible Feb 28, 2023
d5482cb
Restore snapshots from main
mraible Feb 28, 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
4 changes: 2 additions & 2 deletions generators/base-docker/docker-base.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ export function checkImages() {
const appConfig = this.appConfigs[index];
if (appConfig.buildTool === MAVEN) {
imagePath = this.destinationPath(`${this.directoryPath + appsFolder}/target/jib-cache`);
runCommand = './mvnw -ntp -Pprod verify jib:dockerBuild';
runCommand = `./mvnw -ntp -Pprod verify jib:dockerBuild${process.arch === 'arm64' ? ' -Djib-maven-plugin.architecture=arm64' : ''}`;
} else {
imagePath = this.destinationPath(`${this.directoryPath + appsFolder}/build/jib-cache`);
runCommand = './gradlew bootJar -Pprod jibDockerBuild';
runCommand = `./gradlew bootJar -Pprod jibDockerBuild${process.arch === 'arm64' ? ' -PjibArchitecture=arm64' : ''}`;
}
if (!existsSync(imagePath)) {
this.hasWarning = true;
Expand Down