Merge pull request #65 from containerish/fix-oci-conformance-github-a…

…ction

Fix: Failing github action for OCI Conformanve

.github/workflows/conformance.yml

@@ -20,6 +20,8 @@ jobs:
           echo "OCI_ROOT_URL=http://$IP:5000" >> $GITHUB_ENV
           DISTRIBUTION_REF="local-distribution:v$(date +%Y%m%d%H%M%S)"
           docker build -f ./Dockerfile -t "${DISTRIBUTION_REF}" .
+          sed -in "s/OPEN_REGISTRY_ENVIRONMENT=local/OPEN_REGISTRY_ENVIRONMENT=ci/g" env-vars.example
+          echo CI_SYS_ADDR=$IP:5000 >> env-vars.example
           docker run --rm -p 5000:5000 --env-file ./env-vars.example -e REGISTRY_STORAGE_DELETE_ENABLED=true -d "${DISTRIBUTION_REF}"
           sleep 5
           curl -XPOST -d ${{ secrets.OPENREGISTRY_SIGNUP_PAYLOAD }} "http://${IP}:5000/auth/signup"

config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"strings"
 
@@ -102,8 +103,15 @@ func (r *RegistryConfig) Endpoint() string {
 		return fmt.Sprintf("http://%s:%d", r.Host, r.Port)
 	case Prod, Stage:
 		return fmt.Sprintf("https://%s", r.DNSAddress)
+	case CI:
+		ciSysAddr := os.Getenv("CI_SYS_ADDR")
+		if ciSysAddr == "" {
+			log.Fatalln("missing required environment variable: CI_SYS_ADDR")
+		}
+
+		return fmt.Sprintf("http://%s", ciSysAddr)
 	default:
-		return fmt.Sprintf("http://%s:%d", r.Host, r.Port)
+		return fmt.Sprintf("https://%s:%d", r.Host, r.Port)
 	}
 }
 
@@ -112,4 +120,5 @@ const (
 	Stage = "stage"
 	Dev   = "development"
 	Local = "local"
+	CI    = "ci"
 )