From 0bd92d0fc76bf2105645ffcffc6d69fec205d79f Mon Sep 17 00:00:00 2001 From: frikky Date: Sun, 21 Feb 2021 19:01:06 +0100 Subject: [PATCH] Updated everything to 0.8.60 --- .env | 2 +- backend/app_sdk/build.sh | 2 +- backend/go-app/walkoff.go | 2 +- docker-compose.yml | 10 +++++----- functions/onprem/orborus/build.sh | 2 +- functions/onprem/orborus/orborus.go | 9 +++++---- functions/onprem/worker/build.sh | 2 +- functions/onprem/worker/worker.go | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.env b/.env index bd8738f6..3bb32c35 100644 --- a/.env +++ b/.env @@ -39,7 +39,7 @@ SHUFFLE_PASS_WORKER_PROXY=TRUE SHUFFLE_BASE_IMAGE_REGISTRY=ghcr.io SHUFFLE_BASE_IMAGE_NAME=frikky -SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-0.8.5" +SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-0.8.60" # Used for auto-cleanup of containers. REALLY important at scale. SHUFFLE_CONTAINER_AUTO_CLEANUP=false diff --git a/backend/app_sdk/build.sh b/backend/app_sdk/build.sh index 76c9cee3..25fa59d6 100644 --- a/backend/app_sdk/build.sh +++ b/backend/app_sdk/build.sh @@ -1,6 +1,6 @@ #!/bin/bash NAME=shuffle-app_sdk -VERSION=0.8.57 +VERSION=0.8.60 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force docker build . -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index f49cba9c..5fbdb3e6 100644 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -3508,7 +3508,7 @@ func handleExecution(id string, workflow Workflow, request *http.Request) (Workf } if !found { - log.Printf("SHOULD SET TRIGGER %s TO BE SKIPPED", trigger.ID) + //log.Printf("SHOULD SET TRIGGER %s TO BE SKIPPED", trigger.ID) curaction := Action{ AppName: trigger.AppName, diff --git a/docker-compose.yml b/docker-compose.yml index a3bc7321..67fe27a6 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.8.57 + image: ghcr.io/frikky/shuffle-frontend:0.8.60 container_name: shuffle-frontend hostname: shuffle-frontend ports: @@ -17,7 +17,7 @@ services: - backend backend: #build: ./backend - image: ghcr.io/frikky/shuffle-backend:0.8.56 + image: ghcr.io/frikky/shuffle-backend:0.8.60 container_name: shuffle-backend hostname: ${BACKEND_HOSTNAME} # Here for debugging: @@ -45,7 +45,7 @@ services: - database orborus: #build: ./functions/onprem/orborus - image: ghcr.io/frikky/shuffle-orborus:0.8.56 + image: ghcr.io/frikky/shuffle-orborus:0.8.60 container_name: shuffle-orborus hostname: shuffle-orborus networks: @@ -53,8 +53,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock environment: - - SHUFFLE_APP_SDK_VERSION=0.8.51 - - SHUFFLE_WORKER_VERSION=0.8.56 + - SHUFFLE_APP_SDK_VERSION=0.8.60 + - SHUFFLE_WORKER_VERSION=0.8.60 - ORG_ID=${ORG_ID} - ENVIRONMENT_NAME=${ENVIRONMENT_NAME} - BASE_URL=http://${OUTER_HOSTNAME}:${BACKEND_PORT} diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh index c03ea51f..a0fcec2c 100644 --- a/functions/onprem/orborus/build.sh +++ b/functions/onprem/orborus/build.sh @@ -1,5 +1,5 @@ NAME=shuffle-orborus -VERSION=0.8.56 +VERSION=0.8.60 echo "Running docker build with $NAME:$VERSION" #docker rmi frikky/shuffle:$NAME --force diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go index c98ae359..bf7f2919 100644 --- a/functions/onprem/orborus/orborus.go +++ b/functions/onprem/orborus/orborus.go @@ -253,11 +253,11 @@ func initializeImages() { ctx := context.Background() if appSdkVersion == "" { - appSdkVersion = "0.8.5" + appSdkVersion = "0.8.60" log.Printf("[WARNING] SHUFFLE_APP_SDK_VERSION not defined. Defaulting to %s", appSdkVersion) } if workerVersion == "" { - workerVersion = "0.8.57" + workerVersion = "0.8.60" log.Printf("[WARNING] SHUFFLE_WORKER_VERSION not defined. Defaulting to %s", workerVersion) } @@ -544,9 +544,10 @@ func main() { } } + // Doesn't work because of USER INPUT if found { - log.Printf("[INFO] Skipping duplicate %s", execution.ExecutionId) - continue + //log.Printf("[INFO] Skipping duplicate %s", execution.ExecutionId) + //continue } else { //log.Printf("[INFO] Adding to be ran %s", execution.ExecutionId) executionIds = append(executionIds, execution.ExecutionId) diff --git a/functions/onprem/worker/build.sh b/functions/onprem/worker/build.sh index 7f6f86c5..ba1b2e38 100644 --- a/functions/onprem/worker/build.sh +++ b/functions/onprem/worker/build.sh @@ -1,5 +1,5 @@ NAME=shuffle-worker -VERSION=0.8.57 +VERSION=0.8.60 echo "Running docker build with $NAME:$VERSION" #CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin . diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go index 2773c459..dcda8b3e 100644 --- a/functions/onprem/worker/worker.go +++ b/functions/onprem/worker/worker.go @@ -1624,7 +1624,7 @@ func handleExecutionResult(workflowExecution WorkflowExecution) { } if shutdownCheck { - log.Println("BREAKING BECAUSE RESULTS IS SAME LENGTH AS ACTIONS. SHOULD CHECK ALL RESULTS FOR WHETHER THEY'RE DONE") + log.Println("[INFO] BREAKING BECAUSE RESULTS IS SAME LENGTH AS ACTIONS. SHOULD CHECK ALL RESULTS FOR WHETHER THEY'RE DONE") validateFinished(workflowExecution) shutdown(workflowExecution.ExecutionId, workflowExecution.Workflow.ID) }