From 561f367c97d42d7d9ea21be61e4eba1fbca7dd2a Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Sun, 6 Sep 2020 05:18:54 +0200
Subject: [PATCH 1/2] Rolled back from GHCR for now

---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index dce4ba78..02efa84a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   frontend:
     #build: ./frontend
-    image: ghcr.io/frikky/shuffle-frontend:0.7.1
+    image: frikky/shuffle:frontend
     container_name: shuffle-frontend
     hostname: shuffle-frontend
     ports:
@@ -17,7 +17,7 @@ services:
       - backend
   backend:
     #build: ./backend
-    image: ghcr.io/frikky/shuffle-backend:0.7.1
+    image: frikky/shuffle:backend
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
     # Here for debugging:
@@ -43,7 +43,7 @@ services:
       - database
   orborus:
     #build: ./functions/onprem/orborus
-    image: ghcr.io/frikky/orborus:0.6.2
+    image: frikky/shuffle:orborus
     container_name: shuffle-orborus
     hostname: shuffle-orborus
     networks:
@@ -63,7 +63,7 @@ services:
     restart: unless-stopped
   database:
     #build: ./backend/database
-    image: ghcr.io/frikky/shuffle-database:1.0.0
+    image: frikky/shuffle:database
     container_name: shuffle-database
     hostname: shuffle-database
     ports:

From ca7e0c227d5f382aa318be1f6cd2aa6e6a81c9e9 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Sun, 6 Sep 2020 05:32:26 +0200
Subject: [PATCH 2/2] Rolled back ghcr things

---
 functions/onprem/orborus/build.sh   |  4 ++--
 functions/onprem/orborus/orborus.go | 16 +++++++++-------
 functions/onprem/worker/build.sh    |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh
index cbea526b..9c139d11 100644
--- a/functions/onprem/orborus/build.sh
+++ b/functions/onprem/orborus/build.sh
@@ -6,6 +6,6 @@ echo "Running docker build with $NAME:$VERSION"
 docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION
 
 #docker push frikky/$NAME:$VERSION
-#docker push frikky/shuffle:$NAME
+docker push frikky/shuffle:$NAME
 # docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
-docker push ghcr.io/frikky/$NAME:$VERSION
+#docker push ghcr.io/frikky/$NAME:$VERSION
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index 8e48ce62..3ce6ba52 100644
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -34,7 +34,8 @@ var appSdkVersion = os.Getenv("SHUFFLE_APP_SDK_VERSION")
 var workerVersion = os.Getenv("SHUFFLE_WORKER_VERSION")
 
 //var baseimagename = "docker.pkg.github.com/frikky/shuffle"
-var baseimagename = "ghcr.io/frikky"
+//var baseimagename = "ghcr.io/frikky"
+var baseimagename = "frikky/shuffle"
 
 var orgId = os.Getenv("ORG_ID")
 var baseUrl = os.Getenv("BASE_URL")
@@ -213,12 +214,12 @@ 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("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),
-		fmt.Sprintf("frikky/shuffle:app_sdk"),
+		//fmt.Sprintf("%s/worker:%s", baseimagename, workerVersion),
+		//fmt.Sprintf("%s/app_sdk:%s", baseimagename, appSdkVersion),
+		//fmt.Sprintf("frikky/shuffle:app_sdk"),
 	}
 
 	pullOptions := types.ImagePullOptions{}
@@ -268,7 +269,8 @@ func main() {
 	//workerName := "worker"
 	//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("%s/worker:%s", baseimagename, workerVersion)
+	workerImage := fmt.Sprintf("docker.io/%s:worker", baseimagename)
 
 	log.Printf("[INFO] Finished configuring docker environment")
 
diff --git a/functions/onprem/worker/build.sh b/functions/onprem/worker/build.sh
index c90ce32c..84ffea4a 100644
--- a/functions/onprem/worker/build.sh
+++ b/functions/onprem/worker/build.sh
@@ -7,6 +7,6 @@ docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$
 
 # Push both for now..
 #docker push frikky/$NAME:$VERSION 
-#docker push frikky/shuffle:$NAME
+docker push frikky/shuffle:$NAME
 #docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
-docker push ghcr.io/frikky/$NAME:$VERSION
+#docker push ghcr.io/frikky/$NAME:$VERSION