Skip to content

Fix the bug that app built by default Dockerfile cannot fetch Envs #107

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

Merged
haoozhang merged 1 commit into from
Jan 20, 2025
Merged

Fix the bug that app built by default Dockerfile cannot fetch Envs #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 38 additions & 37 deletions cli/azd/pkg/project/framework_service_docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/azure/azure-dev/cli/azd/pkg/output"
"github.com/azure/azure-dev/cli/azd/pkg/tools"
"github.com/azure/azure-dev/cli/azd/pkg/tools/docker"
"github.com/azure/azure-dev/cli/azd/pkg/tools/maven"
"github.com/azure/azure-dev/cli/azd/pkg/tools/pack"
)

Expand Down Expand Up @@ -202,20 +203,20 @@ func (p *dockerProject) Build(
}

// if it's a java project without Dockerfile, we help to package jar and add a default Dockerfile for Docker build
//if serviceConfig.Language == ServiceLanguageJava && serviceConfig.Docker.Path == "" {
// mvnCli := maven.NewCli(exec.NewCommandRunner(nil))
// err := mvnCli.CleanPackage(ctx, serviceConfig.RelativePath, serviceConfig.Project.Path)
// if err != nil {
// return nil, err
// }
// defaultDockerfilePath, err := addDefaultDockerfileForJavaProject(serviceConfig.Name)
// if err != nil {
// return nil, err
// }
// serviceConfig.Docker = DockerProjectOptions{
// Path: defaultDockerfilePath,
// }
//}
if serviceConfig.Language == ServiceLanguageJava && serviceConfig.Docker.Path == "" {
mvnCli := maven.NewCli(exec.NewCommandRunner(nil))
err := mvnCli.CleanPackage(ctx, serviceConfig.RelativePath, serviceConfig.Project.Path)
if err != nil {
return nil, err
}
defaultDockerfilePath, err := addDefaultDockerfileForJavaProject(serviceConfig.Name)
if err != nil {
return nil, err
}
serviceConfig.Docker = DockerProjectOptions{
Path: defaultDockerfilePath,
}
}

dockerOptions := getDockerOptionsWithDefaults(serviceConfig.Docker)

Expand Down Expand Up @@ -638,26 +639,26 @@ func getDockerOptionsWithDefaults(options DockerProjectOptions) DockerProjectOpt
}

// todo: hardcode jdk-21 as base image here, may need more accurate java version detection.
//const DefaultDockerfileForJavaProject = `FROM openjdk:21-jdk-slim
//COPY ./target/*.jar /app.jar
//ENTRYPOINT ["sh", "-c", "java -jar /app.jar"]`

@haoozhang haoozhang Jan 17, 2025

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Here use sh -c before, which make the command run in the shell context, and the Envs cannot work as expected.
Now run the command directly and let Docker handle the command execution directly, ensuring the environment variables propagate correctly.

//
//func addDefaultDockerfileForJavaProject(svcName string) (string, error) {
// log.Printf("Dockerfile not found for java project %s, will provide a default one", svcName)
// dockerfileDir, err := os.MkdirTemp("", svcName)
// if err != nil {
// return "", fmt.Errorf("error creating temp Dockerfile directory: %w", err)
// }
//
// dockerfilePath := filepath.Join(dockerfileDir, "Dockerfile")
// file, err := os.Create(dockerfilePath)
// if err != nil {
// return "", fmt.Errorf("error creating Dockerfile at %s: %w", dockerfilePath, err)
// }
// defer file.Close()
//
// if _, err = file.WriteString(DefaultDockerfileForJavaProject); err != nil {
// return "", fmt.Errorf("error writing Dockerfile at %s: %w", dockerfilePath, err)
// }
// return dockerfilePath, nil
//}
const DefaultDockerfileForJavaProject = `FROM openjdk:21-jdk-slim
COPY ./target/*.jar /app.jar
ENTRYPOINT ["java", "-jar", "/app.jar"]`

func addDefaultDockerfileForJavaProject(svcName string) (string, error) {
log.Printf("Dockerfile not found for java project %s, will provide a default one", svcName)
dockerfileDir, err := os.MkdirTemp("", svcName)
if err != nil {
return "", fmt.Errorf("error creating temp Dockerfile directory: %w", err)
}

dockerfilePath := filepath.Join(dockerfileDir, "Dockerfile")
file, err := os.Create(dockerfilePath)
if err != nil {
return "", fmt.Errorf("error creating Dockerfile at %s: %w", dockerfilePath, err)
}
defer file.Close()

if _, err = file.WriteString(DefaultDockerfileForJavaProject); err != nil {
return "", fmt.Errorf("error writing Dockerfile at %s: %w", dockerfilePath, err)
}
return dockerfilePath, nil
}