From 80d3229f3f104fbbc3c4bf3f7a4c56b196d40f1c Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Fri, 22 May 2020 18:40:34 +0200
Subject: [PATCH] Started reimplementing scheduler

---
 .env                   |  5 +++++
 backend/go-app/main.go | 25 ++++++++++++++++++++++---
 docker-compose.yml     |  1 +
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index c97e13f3..101e99be 100644
--- a/.env
+++ b/.env
@@ -2,6 +2,11 @@
 ORG_ID=Shuffle
 ENVIRONMENT_NAME=Shuffle
 
+# Different locations etc
+APP_DOWNLOAD_LOCATION=https://github.com/frikky/shuffle-apps
+APP_DOWNLOAD_AUTH_USERNAME=""
+APP_DOWNLOAD_AUTH_PASSWORD=""
+
 # Other configs
 BACKEND_HOSTNAME=shuffle-backend
 BACKEND_PORT=5010
diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index e20d4386..f0a3a77d 100644
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -51,6 +51,7 @@ import (
 	// Web
 	// "github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+	http2 "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
 	// Old items (cloud)
 	// "google.golang.org/appengine"
 	// "google.golang.org/appengine/memcache"
@@ -5658,9 +5659,27 @@ func runInit(ctx context.Context) {
 		log.Printf("Apps: loading TEST")
 		fs := memfs.New()
 		storer := memory.NewStorage()
-		r, err := git.Clone(storer, fs, &git.CloneOptions{
-			URL: "https://github.com/frikky/shuffle-apps",
-		})
+
+		url := os.Getenv("APP_DOWNLOAD_LOCATION")
+		if len(url) == 0 {
+			url = "https://github.com/frikky/shuffle-apps"
+		}
+
+		username := os.Getenv("APP_DOWNLOAD_AUTH_USERNAME")
+		password := os.Getenv("APP_DOWNLOAD_AUTH_PASSWORD")
+		cloneOptions := &git.CloneOptions{
+			URL: url,
+		}
+
+		if len(username) > 0 && len(password) > 0 {
+			cloneOptions.Auth = &http2.BasicAuth{
+				Username: username,
+				Password: password,
+			}
+		}
+		log.Printf("Getting apps from %s", url)
+
+		r, err := git.Clone(storer, fs, cloneOptions)
 
 		if err != nil {
 			log.Printf("Failed loading repo into memory: %s", err)
diff --git a/docker-compose.yml b/docker-compose.yml
index 17fec1a9..3fd3bc2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,6 +39,7 @@ services:
     environment: 
       - ORG_ID=${ORG_ID}
       - DATASTORE_EMULATOR_HOST=shuffle-database:8000
+      - APP_DOWNLOAD_LOCATION=${APP_DOWNLOAD_LOCATION}
     restart: unless-stopped
     depends_on:
       - database