The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/distrobuilder/pull/382
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
This permits to creation LXD image from a docker image pulled by a private docker registry with a username and a password.
Require master upstream of the docker-companion project.
From 128bdfbbb7f5cf557dec76ed35e25ff4f86c2829 Mon Sep 17 00:00:00 2001
From: Daniele Rondina <gea...@sabayonlinux.org>
Date: Wed, 9 Dec 2020 19:51:02 +0100
Subject: [PATCH] sources/docker: Permit to use private docker registry with
credentials
Signed-off-by: Daniele Rondina <gea...@sabayonlinux.org>
---
sources/docker.go | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sources/docker.go b/sources/docker.go
index da120a4..860cb59 100644
--- a/sources/docker.go
+++ b/sources/docker.go
@@ -26,7 +26,9 @@ func (d *DockerHTTP) Run(definition shared.Definition,
rootfsDir string) error {
// If DOCKER_REGISTRY_BASE is not set it's used default
https://registry-1.docker.io
return dcapi.DownloadAndUnpackImage(definition.Source.URL,
absRootfsDir, &dcapi.DownloadOpts{
- RegistryBase: os.Getenv("DOCKER_REGISTRY_BASE"),
- KeepLayers: false,
+ RegistryBase: os.Getenv("DOCKER_REGISTRY_BASE"),
+ RegistryUsername: os.Getenv("DOCKER_REGISTRY_BASE_USER"),
+ RegistryPassword: os.Getenv("DOCKER_REGISTRY_BASE_PASS"),
+ KeepLayers: false,
})
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
