[ARVADOS] updated: 2.1.0-2021-g78b4cdb54
Git user
git at public.arvados.org
Tue Mar 15 19:38:34 UTC 2022
Summary of changes:
cmd/arvados-package/build.go | 4 ++--
cmd/arvados-package/cmd.go | 14 +++++++++-----
cmd/arvados-package/install.go | 2 +-
lib/install/deps.go | 2 +-
4 files changed, 13 insertions(+), 9 deletions(-)
via 78b4cdb54bd58df85d61d72e639a728ec38bb377 (commit)
via 956556437d94de46f99aeb08aa126b00c3e94a8c (commit)
via f3be6e11230a19a1bec5df91b1a10a89a2f199c1 (commit)
from 8257b9e9049a2592c9858941775a11b5a98ec1f7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 78b4cdb54bd58df85d61d72e639a728ec38bb377
Author: Tom Clegg <tom at curii.com>
Date: Tue Mar 15 14:30:16 2022 -0400
18700: Update usage/help messages.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/cmd/arvados-package/cmd.go b/cmd/arvados-package/cmd.go
index 6e3de08e9..db3d63f27 100644
--- a/cmd/arvados-package/cmd.go
+++ b/cmd/arvados-package/cmd.go
@@ -77,13 +77,13 @@ func parseFlags(prog string, args []string, stderr io.Writer) (_ opts, ok bool,
}
flags := flag.NewFlagSet("", flag.ContinueOnError)
flags.StringVar(&opts.PackageVersion, "package-version", opts.PackageVersion, "package version to build/test, like \"1.2.3\"")
- flags.StringVar(&opts.SourceDir, "source", opts.SourceDir, "arvados source tree location")
- flags.StringVar(&opts.PackageDir, "package-dir", opts.PackageDir, "destination directory for new package (default is cwd)")
- flags.StringVar(&opts.PackageChown, "package-chown", opts.PackageChown, "desired uid:gid for new package (default is current user:group)")
+ flags.StringVar(&opts.SourceDir, "source", opts.SourceDir, "arvados source tree `directory`")
+ flags.StringVar(&opts.PackageDir, "package-dir", opts.PackageDir, "destination `directory` for new package (default is cwd)")
+ flags.StringVar(&opts.PackageChown, "package-chown", opts.PackageChown, "desired `uid:gid` for new package (default is current user:group)")
flags.StringVar(&opts.TargetOS, "target-os", opts.TargetOS, "target operating system vendor:version")
flags.StringVar(&opts.Maintainer, "package-maintainer", opts.Maintainer, "maintainer to be listed in package metadata")
flags.StringVar(&opts.Vendor, "package-vendor", opts.Vendor, "vendor to be listed in package metadata")
- flags.StringVar(&opts.Live, "live", opts.Live, "run controller at https://`example.com`, use host's /var/lib/acme/live certificates, wait for ^C before shutting down")
+ flags.StringVar(&opts.Live, "live", opts.Live, "(for testinstall) advertise external URLs like https://`example.com`:44xx, use the host's /var/lib/acme/live certificates, listen on the host's external interfaces, and wait for ^C before shutting down")
flags.BoolVar(&opts.RebuildImage, "rebuild-image", opts.RebuildImage, "rebuild docker image(s) instead of using existing")
flags.Usage = func() {
fmt.Fprint(flags.Output(), `Usage: arvados-package <subcommand> [options]
@@ -94,7 +94,11 @@ Subcommands:
out version of the arvados source tree
testinstall
use a docker container to install a package and confirm
- the resulting installation is functional
+ the resulting installation is functional; optionally,
+ expose the test cluster's services using the host's
+ interfaces and ACME certificates, and leave it up to
+ facilitate interactive testing (see -live option
+ below)
version
show program version
diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index 324f3b4d2..217391465 100644
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -93,7 +93,7 @@ rm /etc/apt/sources.list.d/arvados-local.list
"--env=domain="+opts.Live,
"--env=bootargs=",
"--publish=:4430-4450:4430-4450",
- "--volume=/var/lib/acme:/var/lib/acme:ro")
+ "--volume=/var/lib/acme/live/"+opts.Live+":/var/lib/acme/live/"+opts.Live+":ro")
} else {
cmd.Args = append(cmd.Args,
"--env=domain=localhost",
commit 956556437d94de46f99aeb08aa126b00c3e94a8c
Author: Tom Clegg <tom at curii.com>
Date: Tue Mar 15 11:24:52 2022 -0400
18700: Default to version-at-commit.sh instead of git-describe.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index 8268ea9ba..27531d3bc 100644
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -24,13 +24,13 @@ import (
func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writer) error {
if opts.PackageVersion == "" {
var buf bytes.Buffer
- cmd := exec.CommandContext(ctx, "git", "describe", "--tag", "--dirty")
+ cmd := exec.CommandContext(ctx, "bash", "./build/version-at-commit.sh", "HEAD")
cmd.Stdout = &buf
cmd.Stderr = stderr
cmd.Dir = opts.SourceDir
err := cmd.Run()
if err != nil {
- return fmt.Errorf("git describe: %w", err)
+ return fmt.Errorf("%v: %w", cmd.Args, err)
}
opts.PackageVersion = strings.TrimSpace(buf.String())
ctxlog.FromContext(ctx).Infof("version not specified; using %s", opts.PackageVersion)
commit f3be6e11230a19a1bec5df91b1a10a89a2f199c1
Author: Tom Clegg <tom at curii.com>
Date: Mon Mar 14 17:06:45 2022 -0400
18700: Make smaller go binaries for packaging.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/install/deps.go b/lib/install/deps.go
index 6090a51a7..70774b313 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -590,7 +590,7 @@ rsync -a --delete-after build/ /var/lib/arvados/workbench2/
"services/ws",
} {
fmt.Fprintf(stderr, "building %s...\n", srcdir)
- cmd := exec.Command("go", "install", "-ldflags", "-X git.arvados.org/arvados.git/lib/cmd.version="+inst.PackageVersion+" -X main.version="+inst.PackageVersion)
+ cmd := exec.Command("go", "install", "-ldflags", "-X git.arvados.org/arvados.git/lib/cmd.version="+inst.PackageVersion+" -X main.version="+inst.PackageVersion+" -s -w")
cmd.Env = append(cmd.Env, os.Environ()...)
cmd.Env = append(cmd.Env, "GOBIN=/var/lib/arvados/bin")
cmd.Dir = filepath.Join(inst.SourcePath, srcdir)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list