projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dev privileges, db
[arvados.git]
/
services
/
boot
/
os_package.go
diff --git
a/services/boot/os_package.go
b/services/boot/os_package.go
index fc82687162e28e43090b7363a74f0b5f3ef1d58f..dc5cd185ee83dd2e58d8635ec97c1a37b2bbb0c4 100644
(file)
--- a/
services/boot/os_package.go
+++ b/
services/boot/os_package.go
@@
-4,7
+4,6
@@
import (
"context"
"fmt"
"os"
"context"
"fmt"
"os"
- "os/exec"
"strings"
"sync"
)
"strings"
"sync"
)
@@
-13,6
+12,9
@@
var (
installCerts = &osPackage{
Debian: "ca-certificates",
}
installCerts = &osPackage{
Debian: "ca-certificates",
}
+ installNginx = &osPackage{
+ Debian: "nginx",
+ }
installRunit = &osPackage{
Debian: "runit",
}
installRunit = &osPackage{
Debian: "runit",
}
@@
-53,9
+55,7
@@
func (pkg *osPackage) Boot(ctx context.Context) error {
}
func (*osPackage) aptGet(args ...string) error {
}
func (*osPackage) aptGet(args ...string) error {
- cmd := exec.Command("apt-get", args...)
- cmd.Stdout = os.Stderr
- cmd.Stderr = os.Stderr
+ cmd := command("apt-get", args...)
for _, kv := range os.Environ() {
if !strings.HasPrefix(kv, "DEBIAN_FRONTEND=") {
cmd.Env = append(cmd.Env, kv)
for _, kv := range os.Environ() {
if !strings.HasPrefix(kv, "DEBIAN_FRONTEND=") {
cmd.Env = append(cmd.Env, kv)