[registry-facade] Support IPFS_HOST env var

Author: csweichel

components/registry-facade/pkg/registry/blob.go

@@ -153,7 +153,8 @@ func (bh *blobHandler) getBlob(w http.ResponseWriter, r *http.Request) {
 			// to be in the blobstore when in reality it isn't.
 			_, _, rc, err := src.GetBlob(context.Background(), bh.Spec, bh.Digest)
 			if err != nil {
-				log.WithError(err).WithField("digest", bh.Digest).Warn("cannot push to IPFS")
+				log.WithError(err).WithField("digest", bh.Digest).Warn("cannot push to IPFS - unable to get blob")
+				return
 			}
 			if rc == nil {
 				log.WithField("digest", bh.Digest).Warn("cannot push to IPFS - blob is nil")

components/registry-facade/pkg/registry/ipfs.go

@@ -42,6 +42,10 @@ type IPFSStore struct {
 }
 
 func (store *IPFSStore) Get(ctx context.Context, dgst digest.Digest) (ipfsURL string, err error) {
+	if store == nil || store.IPFS == nil || store.Redis == nil {
+		return "", nil
+	}
+
 	res, err := store.Redis.Get(ctx, dgst.String()).Result()
 	if err != nil {
 		return "", err
@@ -51,6 +55,10 @@ func (store *IPFSStore) Get(ctx context.Context, dgst digest.Digest) (ipfsURL st
 }
 
 func (store *IPFSStore) Has(ctx context.Context, dgst digest.Digest) (ok bool, err error) {
+	if store == nil || store.IPFS == nil || store.Redis == nil {
+		return false, nil
+	}
+
 	res := store.Redis.Exists(ctx, dgst.String())
 	if err := res.Err(); err != nil {
 		return false, err
@@ -60,12 +68,16 @@ func (store *IPFSStore) Has(ctx context.Context, dgst digest.Digest) (ok bool, e
 }
 
 func (store *IPFSStore) Store(ctx context.Context, dgst digest.Digest, content io.Reader) (err error) {
+	if store == nil || store.IPFS == nil || store.Redis == nil {
+		return nil
+	}
+
 	p, err := store.IPFS.Unixfs().Add(ctx, files.NewReaderFile(content), options.Unixfs.Pin(true), options.Unixfs.CidVersion(1))
 	if err != nil {
 		return err
 	}
 
-	res := store.Redis.Set(ctx, dgst.String(), p.Cid().String(), 36*time.Hour)
+	res := store.Redis.Set(ctx, dgst.String(), p.Cid().String(), 0)
 	if err := res.Err(); err != nil {
 		return err
 	}

components/registry-facade/pkg/registry/registry.go

@@ -192,11 +192,16 @@ func NewRegistry(cfg config.Config, newResolver ResolverProvider, reg prometheus
 
 	var ipfs *IPFSStore
 	if cfg.IPFSCache != nil && cfg.IPFSCache.Enabled {
-		addr, err := ma.NewMultiaddr(strings.TrimSpace(string(cfg.IPFSCache.IPFSAddr)))
+		addr := cfg.IPFSCache.IPFSAddr
+		if ipfsHost := os.Getenv("IPFS_HOST"); ipfsHost != "" {
+			addr = strings.ReplaceAll(addr, "$IPFS_HOST", ipfsHost)
+		}
+
+		maddr, err := ma.NewMultiaddr(strings.TrimSpace(addr))
 		if err != nil {
 			return nil, xerrors.Errorf("cannot connect to IPFS: %w", err)
 		}
-		core, err := httpapi.NewApi(addr)
+		core, err := httpapi.NewApi(maddr)
 		if err != nil {
 			return nil, xerrors.Errorf("cannot connect to IPFS: %w", err)
 		}