From 7ff4fde257d43760b0df53334b4df63d16491452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 10 May 2019 22:32:10 +0200 Subject: [PATCH] docker: 'build-docker-image' accepts an optional #:entry-point. * guix/docker.scm (config): Add #:entry-point and honor it. (build-docker-image): Likewise. --- guix/docker.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/guix/docker.scm b/guix/docker.scm index c6e9c6fee5..7fe83d9797 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017, 2018 Ludovic Courtès +;;; Copyright © 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. @@ -73,7 +73,7 @@ (define (repositories path id) `((,(generate-tag path) . ((latest . ,id))))) ;; See https://github.com/opencontainers/image-spec/blob/master/config.md -(define (config layer time arch) +(define* (config layer time arch #:key entry-point) "Generate a minimal image configuration for the given LAYER file." ;; "architecture" must be values matching "platform.arch" in the ;; runtime-spec at @@ -81,7 +81,9 @@ (define (config layer time arch) `((architecture . ,arch) (comment . "Generated by GNU Guix") (created . ,time) - (config . #nil) + (config . ,(if entry-point + `((entrypoint . ,entry-point)) + #nil)) (container_config . #nil) (os . "linux") (rootfs . ((type . "layers") @@ -110,6 +112,7 @@ (define* (build-docker-image image paths prefix (transformations '()) (system (utsname:machine (uname))) database + entry-point compressor (creation-time (current-time time-utc))) "Write to IMAGE a Docker image archive containing the given PATHS. PREFIX @@ -118,6 +121,9 @@ (define* (build-docker-image image paths prefix When DATABASE is true, copy it to /var/guix/db in the image and create /var/guix/gcroots and friends. +When ENTRY-POINT is true, it must be a list of strings; it is stored as the +entry point in the Docker image JSON structure. + SYMLINKS must be a list of (SOURCE -> TARGET) tuples describing symlinks to be created in the image, where each TARGET is relative to PREFIX. TRANSFORMATIONS must be a list of (OLD -> NEW) tuples describing how to @@ -227,7 +233,8 @@ (define transformation-options (with-output-to-file "config.json" (lambda () (scm->json (config (string-append id "/layer.tar") - time arch)))) + time arch + #:entry-point entry-point)))) (with-output-to-file "manifest.json" (lambda () (scm->json (manifest prefix id))))