From 9f7f1b9830fc419bb4689e3cc8d0b1136c70a05c Mon Sep 17 00:00:00 2001 From: Harduino Date: Thu, 25 Feb 2021 14:11:41 +0300 Subject: [PATCH] implement environment variable SHUFFLE_APP_FORCE_UPDATE --- .env | 1 + backend/go-app/main.go | 10 +++++++++- docker-compose.yml | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 3bb32c35..4ffc4215 100644 --- a/.env +++ b/.env @@ -12,6 +12,7 @@ SHUFFLE_APP_DOWNLOAD_LOCATION=https://github.com/frikky/shuffle-apps SHUFFLE_DOWNLOAD_AUTH_USERNAME= SHUFFLE_DOWNLOAD_AUTH_PASSWORD= SHUFFLE_DOWNLOAD_AUTH_BRANCH= +SHUFFLE_APP_FORCE_UPDATE=false # User config for first load. Username & PW: min length 3 SHUFFLE_DEFAULT_USERNAME= diff --git a/backend/go-app/main.go b/backend/go-app/main.go index 3031b0b5..7cd4e069 100644 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -7448,6 +7448,14 @@ func runInit(ctx context.Context) { } } + // form force-flag to download workflow apps + forceUpdateEnv := os.Getenv("SHUFFLE_APP_FORCE_UPDATE") + forceUpdate := false + if len(forceUpdateEnv) > 0 && forceUpdateEnv == "true" { + log.Printf("Forcing to rebuild apps") + forceUpdate = true + } + // Getting apps to see if we should initialize a test log.Printf("Getting remote workflow apps") workflowapps, err := getAllWorkflowApps(ctx, 500) @@ -7513,7 +7521,7 @@ func runInit(ctx context.Context) { //iterateAppGithubFolders(fs, dir, "", "testing") // FIXME: Get all the apps? - iterateAppGithubFolders(fs, dir, "", "", false) + iterateAppGithubFolders(fs, dir, "", "", forceUpdate) // Hotloads locally location := os.Getenv("SHUFFLE_APP_HOTLOAD_FOLDER") diff --git a/docker-compose.yml b/docker-compose.yml index 67fe27a6..3afc58e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,6 +38,7 @@ services: - SHUFFLE_DEFAULT_USERNAME=${SHUFFLE_DEFAULT_USERNAME} - SHUFFLE_DEFAULT_PASSWORD=${SHUFFLE_DEFAULT_PASSWORD} - SHUFFLE_DEFAULT_APIKEY=${SHUFFLE_DEFAULT_APIKEY} + - SHUFFLE_APP_FORCE_UPDATE=${SHUFFLE_APP_FORCE_UPDATE} - HTTP_PROXY=${SHUFFLE_HTTP_PROXY} - HTTPS_PROXY=${SHUFFLE_HTTPS_PROXY} restart: unless-stopped