From fa3881d1f1235ab555e0fb63f333cc85f30a7069 Mon Sep 17 00:00:00 2001
From: Harduino <mail@harduino.com>
Date: Thu, 17 Sep 2020 19:13:54 +0300
Subject: [PATCH] siemonster :: dynamic app_sdk & worker image urls

---
 .env                                |  4 ++++
 docker-compose.yml                  |  3 +++
 functions/onprem/orborus/orborus.go | 14 ++++++++++----
 functions/onprem/worker/Dockerfile  |  5 +++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index dbb4fc87..4fd9eced 100644
--- a/.env
+++ b/.env
@@ -34,3 +34,7 @@ DB_LOCATION=./shuffle-database
 SHUFFLE_HTTP_PROXY=
 SHUFFLE_HTTPS_PROXY=
 SHUFFLE_PASS_WORKER_PROXY=TRUE
+
+SHUFFLE_BASE_IMAGE_REGISTRY=docker.io
+SHUFFLE_BASE_IMAGE_NAME=frikky/shuffle
+SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-0.6.0"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 02efa84a..b90352a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,6 +60,9 @@ services:
       - HTTP_PROXY=${SHUFFLE_HTTP_PROXY}
       - HTTPS_PROXY=${SHUFFLE_HTTPS_PROXY}
       - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
+      - SHUFFLE_BASE_IMAGE_NAME=${SHUFFLE_BASE_IMAGE_NAME}
+      - SHUFFLE_BASE_IMAGE_REGISTRY=${SHUFFLE_BASE_IMAGE_REGISTRY}
+      - SHUFFLE_BASE_IMAGE_TAG_SUFFIX=${SHUFFLE_BASE_IMAGE_TAG_SUFFIX}
     restart: unless-stopped
   database:
     #build: ./backend/database
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index 3ce6ba52..250c4781 100644
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -35,7 +35,10 @@ var workerVersion = os.Getenv("SHUFFLE_WORKER_VERSION")
 
 //var baseimagename = "docker.pkg.github.com/frikky/shuffle"
 //var baseimagename = "ghcr.io/frikky"
-var baseimagename = "frikky/shuffle"
+// var baseimagename = "frikky/shuffle"
+var baseimagename = os.Getenv("SHUFFLE_BASE_IMAGE_NAME")
+var baseimageregistry = os.Getenv("SHUFFLE_BASE_IMAGE_REGISTRY")
+var baseimagetagsuffix = os.Getenv("SHUFFLE_BASE_IMAGE_TAG_SUFFIX")
 
 var orgId = os.Getenv("ORG_ID")
 var baseUrl = os.Getenv("BASE_URL")
@@ -214,8 +217,10 @@ func initializeImages() {
 
 	// check whether theyre the same first
 	images := []string{
-		fmt.Sprintf("docker.io/%s:app_sdk", baseimagename),
-		fmt.Sprintf("docker.io/%s:worker", baseimagename),
+		fmt.Sprintf("%s/%s:app_sdk%s", baseimageregistry, baseimagename, baseimagetagsuffix),
+		fmt.Sprintf("%s/%s:worker%s", baseimageregistry, baseimagename, baseimagetagsuffix),
+		// fmt.Sprintf("docker.io/%s:app_sdk", baseimagename),
+		// fmt.Sprintf("docker.io/%s:worker", baseimagename),
 
 		//fmt.Sprintf("%s/worker:%s", baseimagename, workerVersion),
 		//fmt.Sprintf("%s/app_sdk:%s", baseimagename, appSdkVersion),
@@ -270,7 +275,8 @@ func main() {
 	//workerVersion := "0.1.0"
 	//workerImage := fmt.Sprintf("docker.pkg.github.com/frikky/shuffle/%s:%s", workerName, workerVersion)
 	//workerImage := fmt.Sprintf("%s/worker:%s", baseimagename, workerVersion)
-	workerImage := fmt.Sprintf("docker.io/%s:worker", baseimagename)
+	// workerImage := fmt.Sprintf("docker.io/%s:worker", baseimagename)
+	workerImage := fmt.Sprintf("%s/%s:worker%s", baseimageregistry, baseimagename, baseimagetagsuffix)
 
 	log.Printf("[INFO] Finished configuring docker environment")
 
diff --git a/functions/onprem/worker/Dockerfile b/functions/onprem/worker/Dockerfile
index 685b426b..c381e73b 100644
--- a/functions/onprem/worker/Dockerfile
+++ b/functions/onprem/worker/Dockerfile
@@ -10,6 +10,11 @@ COPY worker.go /app/worker.go
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker .
 
 FROM alpine:3.12
+
+ENV SHUFFLE_BASE_IMAGE_REGISTRY=docker.io
+ENV SHUFFLE_BASE_IMAGE_NAME=frikky/shuffle
+ENV SHUFFLE_BASE_IMAGE_TAG_SUFFIX=0.6.0
+
 RUN apk add --no-cache bash
 COPY --from=builder /app/ /