Skip to content

Commit cfe8aa0

Browse files
authored
Remove use of discourse/base:aarch64 in launcher2 (#851)
Since fc61b8a, we started shipping manifests for the `discourse/base` images so we don't have to specifically pull the tag for arm64.
1 parent 9cd8186 commit cfe8aa0

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

launcher_go/v2/config/config.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66
"os"
77
"regexp"
8-
"runtime"
98
"slices"
109
"strings"
1110

@@ -16,13 +15,7 @@ import (
1615
)
1716

1817
const defaultBootCommand = "/sbin/boot"
19-
20-
func DefaultBaseImage() string {
21-
if runtime.GOARCH == "arm64" {
22-
return "discourse/base:aarch64"
23-
}
24-
return "discourse/base:2.0.20231121-0024"
25-
}
18+
const defaultBaseImage = "discourse/base:2.0.20231121-0024"
2619

2720
type Config struct {
2821
Name string `yaml:-`
@@ -76,7 +69,7 @@ func LoadConfig(dir string, configName string, includeTemplates bool, templatesD
7669
config := &Config{
7770
Name: configName,
7871
Boot_Command: defaultBootCommand,
79-
Base_Image: DefaultBaseImage(),
72+
Base_Image: defaultBaseImage,
8073
}
8174

8275
matched, _ := regexp.MatchString("[[:upper:]/ !@#$%^&*()+~`=]", configName)

0 commit comments

Comments
 (0)