Move to CDN for monobase matrix.json

Author: nevillelyh

pkg/dockerfile/env.go

@@ -9,8 +9,6 @@ import (
 )
 
 const CogletVersionEnvVarName = "R8_COGLET_VERSION"
-const MonobaseMatrixHostVarName = "R8_MONOBASE_MATRIX_HOST"
-const MonobaseMatrixSchemeVarName = "R8_MONOBASE_MATRIX_SCHEME"
 
 func envLineFromConfig(c *config.Config) (string, error) {
 	vars := c.ParsedEnvironment()
@@ -34,19 +32,3 @@ func CogletVersionFromEnvironment() string {
 	}
 	return host
 }
-
-func MonobaseMatrixHostFromEnvironment() string {
-	host := os.Getenv(MonobaseMatrixHostVarName)
-	if host == "" {
-		host = "raw.githubusercontent.com"
-	}
-	return host
-}
-
-func MonobaseMatrixSchemeFromEnvironment() string {
-	scheme := os.Getenv(MonobaseMatrixSchemeVarName)
-	if scheme == "" {
-		scheme = "https"
-	}
-	return scheme
-}

pkg/dockerfile/env_test.go

@@ -11,15 +11,3 @@ func TestCogletVersionFromEnvironment(t *testing.T) {
 	t.Setenv(CogletVersionEnvVarName, cogletVersion)
 	require.Equal(t, CogletVersionFromEnvironment(), cogletVersion)
 }
-
-func TestMonobaseMatrixHostFromEnvironment(t *testing.T) {
-	const monobaseMatrixHost = "localhost"
-	t.Setenv(MonobaseMatrixHostVarName, monobaseMatrixHost)
-	require.Equal(t, MonobaseMatrixHostFromEnvironment(), monobaseMatrixHost)
-}
-
-func TestMonobaseMatrixSchemeFromEnvironment(t *testing.T) {
-	const monobaseMatrixScheme = "http"
-	t.Setenv(MonobaseMatrixSchemeVarName, monobaseMatrixScheme)
-	require.Equal(t, MonobaseMatrixSchemeFromEnvironment(), monobaseMatrixScheme)
-}

pkg/dockerfile/monobase_matrix.go

@@ -21,7 +21,8 @@ type MonobaseMatrix struct {
 }
 
 func NewMonobaseMatrix(client *http.Client) (*MonobaseMatrix, error) {
-	resp, err := client.Get(MonobaseMatrixSchemeFromEnvironment() + "://" + MonobaseMatrixHostFromEnvironment() + "/replicate/monobase/refs/heads/main/matrix.json")
+	url := "https://monobase-packages.replicate.delivery/matrix.json"
+	resp, err := client.Get(url)
 	if err != nil {
 		return nil, err
 	}