From 7271e7100836f0d8e0d999db29b551dc69badfe4 Mon Sep 17 00:00:00 2001
From: Nikola Jokic <nikola-jokic@github.com>
Date: Mon, 24 Oct 2022 13:13:16 +0200
Subject: [PATCH] managed to execute docker hub push and execute that image

---
 packages/k8s/src/k8s/index.ts    | 12 +++++++++---
 packages/k8s/src/k8s/settings.ts | 10 ++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/k8s/src/k8s/index.ts b/packages/k8s/src/k8s/index.ts
index 27c4bc0..389d159 100644
--- a/packages/k8s/src/k8s/index.ts
+++ b/packages/k8s/src/k8s/index.ts
@@ -24,7 +24,8 @@ import {
   localRegistryPort,
   remoteRegistryHost,
   remoteRegistryHandle,
-  remoteRegistrySecretName
+  remoteRegistrySecretName,
+  isLocalRegistrySet
 } from './settings'
 
 export * from './settings'
@@ -486,14 +487,19 @@ export async function containerBuild(
   let kanikoRegistry = ''
   let pullRegistry = ''
   let secretName: string | undefined = undefined
-  if (localRegistryHost()) {
+  if (isLocalRegistrySet()) {
     const host = `${localRegistryHost()}.${namespace()}.svc.cluster.local`
     const port = localRegistryPort()
     const uri = `${generateBuildHandle()}/${generateBuildImage()}`
     kanikoRegistry = `${host}:${port}/${uri}`
     pullRegistry = `localhost:${localRegistryNodePort()}/${uri}`
   } else {
-    kanikoRegistry = `${remoteRegistryHost()}/${remoteRegistryHandle()}/${generateBuildImage()}`
+    const uri = `${remoteRegistryHandle()}/${generateBuildImage()}`
+    if (remoteRegistryHost()) {
+      kanikoRegistry = `${remoteRegistryHost()}/${uri}`
+    } else {
+      kanikoRegistry = uri
+    }
     pullRegistry = kanikoRegistry
     secretName = remoteRegistrySecretName()
   }
diff --git a/packages/k8s/src/k8s/settings.ts b/packages/k8s/src/k8s/settings.ts
index d6420db..537eff2 100644
--- a/packages/k8s/src/k8s/settings.ts
+++ b/packages/k8s/src/k8s/settings.ts
@@ -22,6 +22,11 @@ export function namespace(): string {
   return context.namespace
 }
 
+export function isLocalRegistrySet(): boolean {
+  const name = 'ACTIONS_RUNNER_CONTAINER_HOOKS_LOCAL_REGISTRY_HOST'
+  return !!process.env[name]
+}
+
 export function localRegistryHost(): string {
   const name = 'ACTIONS_RUNNER_CONTAINER_HOOKS_LOCAL_REGISTRY_HOST'
   if (process.env[name]) {
@@ -48,10 +53,7 @@ export function localRegistryNodePort(): number {
 
 export function remoteRegistryHost(): string {
   const name = 'ACTIONS_RUNNER_CONTAINER_HOOKS_REMOTE_REGISTRY_HOST'
-  if (process.env[name]) {
-    return process.env[name]
-  }
-  throw new Error(`environment variable ${name} is not set`)
+  return process.env[name] || ''
 }
 
 export function remoteRegistryHandle(): string {