erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-05 00:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

specgen: move log_path handling over to the server

Browse source 
log_path is currently set at the client side and is ignored by
the server in a remote session. This leads to either incorrect log_path
being considered by the server or not honored at all. Move the handling
from client to the server, in line with other flags such as log_driver.

Signed-off-by: Danish Prakash <contact@danishpraka.sh>
This commit is contained in:
Danish Prakash 2026-05-27 10:47:43 +05:30
parent 9e13b9ea52
commit bad0a715ee
No known key found for this signature in database
GPG key ID: 66820561C42B7C0C
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/specgen/generate/container.go
View file

@ -331,6 +331,9 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
if len(s.LogConfiguration.Driver) < 1 { if len(s.LogConfiguration.Driver) < 1 {
s.LogConfiguration.Driver = rtc.Containers.LogDriver s.LogConfiguration.Driver = rtc.Containers.LogDriver
} }
if len(s.LogConfiguration.Path) < 1 {
s.LogConfiguration.Path = rtc.Containers.LogPath
}
if len(rtc.Containers.LogTag) > 0 { if len(rtc.Containers.LogTag) > 0 {
if s.LogConfiguration.Options == nil { if s.LogConfiguration.Options == nil {
s.LogConfiguration.Options = make(map[string]string) s.LogConfiguration.Options = make(map[string]string)

4
pkg/specgen/generate/kube/kube.go
View file

@ -242,10 +242,6 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
s.ImageVolumes = opts.ImageVolumes s.ImageVolumes = opts.ImageVolumes
if rtc.Containers.LogPath != "" {
s.LogConfiguration.Path = rtc.Containers.LogPath
}
s.LogConfiguration.Options = make(map[string]string) s.LogConfiguration.Options = make(map[string]string)
s.LogConfiguration.Labels = make(map[string]string) s.LogConfiguration.Labels = make(map[string]string)
for _, o := range opts.LogOptions { for _, o := range opts.LogOptions {

4
pkg/specgenutil/specgen.go
View file

@ -845,10 +845,6 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions
return err return err
} }
if rtc.Containers.LogPath != "" {
s.LogConfiguration.Path = rtc.Containers.LogPath
}
logOpts := make(map[string]string) logOpts := make(map[string]string)
logLabels := make(map[string]string) logLabels := make(map[string]string)
for _, o := range c.LogOptions { for _, o := range c.LogOptions {

5
test/e2e/run_test.go
View file

@ -2435,6 +2435,11 @@ log_path = "%s"
if IsRemote() { if IsRemote() {
podmanTest.RestartRemoteService() podmanTest.RestartRemoteService()
// Server inherited CONTAINERS_CONF_OVERRIDE at restart; unset on
// the client so this forces the server to use its config and not rely on
// the client's. Without this the client would read log_path and
// pass it on to the client, masking server-side bugs.
os.Unsetenv("CONTAINERS_CONF_OVERRIDE")
} }
containerName := "test-conf-log-container" containerName := "test-conf-log-container"