feat: implement os-based env variables instead of static code-based env variables

This commit is contained in:
2026-07-31 20:30:09 +01:00
parent 0accff3e19
commit a40dbe0f6e
3 changed files with 13 additions and 12 deletions
+6
View File
@@ -11,6 +11,12 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
environment:
# Fill these in with your own tokens
- GITEA_REGISTRY_RO_TOKEN=
- GITEA_RW_PACKAGE_TOKEN=
- GITEA_ORG=
- GITEA_USER=
networks: networks:
dcntrlized_net: dcntrlized_net:
+7 -6
View File
@@ -4,11 +4,11 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
"os"
"sort" "sort"
"strings" "strings"
"time" "time"
"git.dcntrlized.org/Dcntrlized/Maestro/lib/consts"
"git.dcntrlized.org/Dcntrlized/Maestro/lib/logger" "git.dcntrlized.org/Dcntrlized/Maestro/lib/logger"
"github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/authn"
@@ -42,7 +42,7 @@ type RawPackage struct {
func GetRegistry(w http.ResponseWriter, r *http.Request) { func GetRegistry(w http.ResponseWriter, r *http.Request) {
// 1. Query Gitea REST API using the exact Org name // 1. Query Gitea REST API using the exact Org name
apiURL := fmt.Sprintf("https://git.dcntrlized.org/api/v1/packages/%s?type=container", consts.GITEA_ORG) apiURL := fmt.Sprintf("https://git.dcntrlized.org/api/v1/packages/%s?type=container", os.Getenv("GITEA_ORG"))
req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, apiURL, nil) req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, apiURL, nil)
if err != nil { if err != nil {
@@ -51,7 +51,8 @@ func GetRegistry(w http.ResponseWriter, r *http.Request) {
return return
} }
req.Header.Set("Authorization", "token "+consts.GITEA_RW_PACKAGE_TOKEN) logger.Debug(fmt.Sprintf("%s", os.Getenv("GITEA_RW_PACKAGE_TOKEN")))
req.Header.Set("Authorization", "token "+os.Getenv("GITEA_RW_PACKAGE_TOKEN"))
client := &http.Client{Timeout: 10 * time.Second} client := &http.Client{Timeout: 10 * time.Second}
resp, err := client.Do(req) resp, err := client.Do(req)
@@ -116,11 +117,11 @@ func GetRegistry(w http.ResponseWriter, r *http.Request) {
} }
ociAuth := remote.WithAuth(&authn.Basic{ ociAuth := remote.WithAuth(&authn.Basic{
Username: consts.GITEA_USER, Username: os.Getenv("GITEA_USER"),
Password: consts.GITEA_RW_PACKAGE_TOKEN, Password: os.Getenv("GITEA_RO_TOKEN"),
}) })
ociOrg := strings.ToLower(consts.GITEA_ORG) ociOrg := strings.ToLower(os.Getenv("GITEA_ORG"))
var registryItems []RegistryContainer var registryItems []RegistryContainer
// 4. Fetch OCI metadata only for the highest version of each package // 4. Fetch OCI metadata only for the highest version of each package
-6
View File
@@ -1,6 +0,0 @@
package consts
const GITEA_RO_TOKEN = ""
const GITEA_RW_PACKAGE_TOKEN = ""
const GITEA_ORG = ""
const GITEA_USER = ""