diff --git a/.gitignore b/.gitignore index 5bebe49f..e0d774db 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ functions/generated_apps backend/onprem/app_sdk/apps *test.py +shuffle-apps/* diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index 0c8d4a82..bd3ba433 100644 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -3499,6 +3499,8 @@ func handleAppHotloadRequest(resp http.ResponseWriter, request *http.Request) { return } + log.Printf("Starting app hotloading") + // Just need to be logged in // FIXME - should have some permissions? user, err := handleApiAuthentication(resp, request) @@ -3518,7 +3520,7 @@ func handleAppHotloadRequest(resp http.ResponseWriter, request *http.Request) { location := os.Getenv("APP_HOTLOAD_FOLDER") if len(location) == 0 { resp.WriteHeader(500) - resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "APP_HOTLOAD_FOLDER not specified in .env"}`, err))) + resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "APP_HOTLOAD_FOLDER not specified in .env"}`))) return } @@ -3526,7 +3528,7 @@ func handleAppHotloadRequest(resp http.ResponseWriter, request *http.Request) { err = handleAppHotload(location) if err != nil { resp.WriteHeader(500) - resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed loading apps: %s"}`, err))) + resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed loading apps: %s"}`))) return } diff --git a/docker-compose.yml b/docker-compose.yml index 57af874a..48e707af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: frontend: - build: ./frontend + #build: ./frontend image: frikky/shuffle:frontend container_name: shuffle-frontend hostname: shuffle-frontend @@ -30,6 +30,7 @@ services: - ORG_ID=${ORG_ID} - DATASTORE_EMULATOR_HOST=shuffle-database:8000 - APP_DOWNLOAD_LOCATION=${APP_DOWNLOAD_LOCATION} + - APP_HOTLOAD_FOLDER=/shuffle-apps restart: unless-stopped depends_on: - database