[bug#67574] oci-container-service: hotfix

[bug#67574] oci-container-service: hotfix

[paul via Guix-patches via]

Hello Ludo’ ,

I just managed to read my Guix email after some  time. I just guix 
pulled and realized there's a bug at [0]. The fix is trivial and I'm 
sending it as a patch. I'm also working on a test suite to prevent this 
to happen in the future.


Thanks for all your work,

giacomo



[0]: 
https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/services/docker.scm#n377

[bug#67574] [PATCH] services: Fix oci-container-service-type container user.

[Giacomo Leidi via Guix-patches via]

The oci-container-configuration supports two user fields: one is the
user, from the host system, under whose authority the OCI-backed
Shepherd service is run; the other is an optional user/UID that can be
passed to the docker run invokation to override the user defined in the
OCI image.

The user from the host system is incorrectly passed to docker run
command, this patches reverts the incorrect behavior and passes the
correct container-user field value.

* gnu/services/docker.scm (oci-container-configuration): Fix the user
passed to the docker run invokation.
---
 gnu/services/docker.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index ebea0a473a..72ef7d74db 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -374,7 +374,7 @@ (define oci-container-configuration->options
           (network
            (oci-container-configuration-network config))
           (user
-           (oci-container-configuration-user config))
+           (oci-container-configuration-container-user config))
           (workdir
            (oci-container-configuration-workdir config)))
       (apply append

base-commit: 842a11f1caa1bb929c427722ad9d7b7c1ff65727
-- 
2.41.0

bug#67574: oci-container-service: hotfix

[Ludovic Courtès]

Giacomo Leidi <goodoldpaul@autistici.org> skribis:

> The oci-container-configuration supports two user fields: one is the
> user, from the host system, under whose authority the OCI-backed
> Shepherd service is run; the other is an optional user/UID that can be
> passed to the docker run invokation to override the user defined in the
> OCI image.
>
> The user from the host system is incorrectly passed to docker run
> command, this patches reverts the incorrect behavior and passes the
> correct container-user field value.
>
> * gnu/services/docker.scm (oci-container-configuration): Fix the user
> passed to the docker run invokation.

Applied, thanks!