Remove use of `discourse/base:aarch64` in launcher2 (#851)

Since fc61b8a850, we started shipping
manifests for the `discourse/base` images so we don't have to
specifically pull the tag for arm64.
This commit is contained in:
Alan Guo Xiang Tan 2024-08-30 10:03:17 +08:00 committed by GitHub
parent 9cd8186278
commit cfe8aa0df0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 9 deletions

View File

@ -5,7 +5,6 @@ import (
"fmt"
"os"
"regexp"
"runtime"
"slices"
"strings"
@ -16,13 +15,7 @@ import (
)
const defaultBootCommand = "/sbin/boot"
func DefaultBaseImage() string {
if runtime.GOARCH == "arm64" {
return "discourse/base:aarch64"
}
return "discourse/base:2.0.20231121-0024"
}
const defaultBaseImage = "discourse/base:2.0.20231121-0024"
type Config struct {
Name string `yaml:-`
@ -76,7 +69,7 @@ func LoadConfig(dir string, configName string, includeTemplates bool, templatesD
config := &Config{
Name: configName,
Boot_Command: defaultBootCommand,
Base_Image: DefaultBaseImage(),
Base_Image: defaultBaseImage,
}
matched, _ := regexp.MatchString("[[:upper:]/ !@#$%^&*()+~`=]", configName)