The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/distrobuilder/pull/266
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) ===
When building the edge release, the same_as field is required for
downloading the source tarball and fixing the repo URLs.
This commit fixes the regex which is used to alter the apk repo file.
It now includes versions like 3.10 and above.
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
From dc452b5c31cbb875ac02e7acd62d4a9f833c3c06 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Mon, 25 Nov 2019 09:20:54 +0100
Subject: [PATCH] sources/alpine: Fix edge builds
When building the edge release, the same_as field is required for
downloading the source tarball and fixing the repo URLs.
This commit fixes the regex which is used to alter the apk repo file.
It now includes versions like 3.10 and above.
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
sources/alpine-http.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sources/alpine-http.go b/sources/alpine-http.go
index 71ea61a..b32ea1d 100644
--- a/sources/alpine-http.go
+++ b/sources/alpine-http.go
@@ -103,7 +103,7 @@ func (s *AlpineLinuxHTTP) Run(definition shared.Definition,
rootfsDir string) er
return err
}
- err = shared.RunCommand("sed", "-i", "-e",
"s/v[[:digit:]]\\.[[:digit:]]/edge/g", "/etc/apk/repositories")
+ err = shared.RunCommand("sed", "-i", "-e",
"s/v[[:digit:]]\\.[[:digit:]]+/edge/g", "/etc/apk/repositories")
if err != nil {
exitChroot()
return err
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
