Minor fixes to new build processes

.github/push_nightly.sh

@@ -1,14 +1,47 @@
 # This can be done in the dockerpush workflow itself
 # Done manually for now since GHCR isn't being pushed to easily with the current Github action CI. Nightly = Latest IF we run hotfixes on latest
 
-docker pull frikky/shuffle-backend:nightly
+### Pull latest from ghcr CI/CD
-docker pull frikky/shuffle-frontend:nightly
+docker pull ghcr.io/shuffle/shuffle-app_sdk:nightly
+docker pull ghcr.io/shuffle/shuffle-worker:nightly
+docker pull ghcr.io/shuffle/shuffle-orborus:nightly
+docker pull ghcr.io/shuffle/shuffle-frontend:nightly
+docker pull ghcr.io/shuffle/shuffle-backend:nightly
 
-docker tag frikky/shuffle-backend:nightly ghcr.io/frikky/shuffle-backend:nightly
+### LATEST releases:
-docker tag frikky/shuffle-frontend:nightly ghcr.io/frikky/shuffle-frontend:nightly
+#docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/shuffle/shuffle-app_sdk:latest
+#docker tag ghcr.io/shuffle/shuffle-worker:nightly  ghcr.io/shuffle/shuffle-worker:latest
+#docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/shuffle/shuffle-orborus:latest
+#docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/shuffle/shuffle-frontend:latest
+#docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/shuffle/shuffle-backend:latest
+#
+#docker push ghcr.io/shuffle/shuffle-app_sdk:latest
+#docker push ghcr.io/shuffle/shuffle-worker:latest
+#docker push ghcr.io/shuffle/shuffle-orborus:latest
+#docker push ghcr.io/shuffle/shuffle-frontend:latest
+#docker push ghcr.io/shuffle/shuffle-backend:latest
 
-docker push ghcr.io/frikky/shuffle-backend:nightly
-docker push ghcr.io/frikky/shuffle-frontend:nightly
 
-#docker push ghcr.io/frikky/shuffle-backend:latest
+### 1.1.0 releases:
-#docker push ghcr.io/frikky/shuffle-frontend:latest
+#docker tag ghcr.io/shuffle/shuffle-app_sdk:nightly ghcr.io/shuffle/shuffle-app_sdk:1.1.0
+#docker tag ghcr.io/shuffle/shuffle-worker:nightly  ghcr.io/shuffle/shuffle-worker:1.1.0
+#docker tag ghcr.io/shuffle/shuffle-orborus:nightly ghcr.io/shuffle/shuffle-orborus:1.1.0
+#docker tag ghcr.io/shuffle/shuffle-frontend:nightly ghcr.io/shuffle/shuffle-frontend:1.1.0
+#docker tag ghcr.io/shuffle/shuffle-backend:nightly ghcr.io/shuffle/shuffle-backend:1.1.0
+#
+#docker push ghcr.io/shuffle/shuffle-app_sdk:1.1.0
+#docker push ghcr.io/shuffle/shuffle-worker:1.1.0
+#docker push ghcr.io/shuffle/shuffle-orborus:1.1.0
+#docker push ghcr.io/shuffle/shuffle-frontend:1.1.0
+#docker push ghcr.io/shuffle/shuffle-backend:1.1.0
+
+
+
+### Manage worker-scale upload (Requires auth)
+# This is supposed to be unavailable, and only be downloadable by customers 
+docker pull ghcr.io/shuffle/shuffle-worker-scale:latest
+docker save ghcr.io/shuffle/shuffle-worker-scale:latest -o shuffle-worker.zip
+echo "1. Upload shuffle-worker.zip to the shuffler.io public repo. If in Github Dev env, download the file, and upload manually."
+echo "2. Have customers download it with: $ wget URL"
+echo "3. Have customers use with with: docker load shuffle-worker.zip"
+

backend/tests/hooks.sh

@@ -15,9 +15,9 @@
 #curl -X POST "https://europe-west1-shuffle-241517.cloudfunctions.net/webhook_982995716e67c3a549092d3a3a7921cd" -H "Content-Type:application/json" -H "Authorization: Bearer 144308d0-6aab-4d4f-8bb2-75189281ee26" --data '{"name":"Keyboard Cat"}' -v
 
 ## GET HOOK
-#curl http://localhost:5001/api/v1/hooks/b4ba07c9-45d4-41f2-b260-83c8e99eba0c -H "Authorization: Bearer 144308d0-6aab-4d4f-8bb2-75189281ee26"
+#curl http://localhost:5001/api/v1/hooks/b4ba07c9-45d4-41f2-b260-83c8e99eba0c -H "Authorization: Bearer "
 
-#curl https://shuffler.io/api/v1/hooks/b4ba07c9-45d4-41f2-b260-83c8e99eba0c -H "Authorization: Bearer 144308d0-6aab-4d4f-8bb2-75189281ee26"
+#curl https://shuffler.io/api/v1/hooks/b4ba07c9-45d4-41f2-b260-83c8e99eba0c -H "Authorization: Bearer "
 
 
 #curl -X POST "https://europe-west1-shuffle-241517.cloudfunctions.net/webhook_3ceff795-ce9a-43a2-a2f5-d4401a6e772d" -H "Authorization: Bearer 144308d0-6aab-4d4f-8bb2-75189281ee26" --data 'wut' 

docker-compose.yml

@@ -36,9 +36,6 @@ services:
       - SHUFFLE_APP_HOTLOAD_FOLDER=/shuffle-apps
       - SHUFFLE_FILE_LOCATION=/shuffle-files
     restart: unless-stopped
-    #depends_on:
-      #- opensearch #Not necessary because dependancy is handled within the backend itself instead
-      #- database
   orborus:
     image: ghcr.io/shuffle/shuffle-orborus:nightly
     container_name: shuffle-orborus
@@ -60,25 +57,22 @@ services:
       - HTTPS_PROXY=${HTTPS_PROXY}
       - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
       - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
-      - SHUFFLE_SWARM_NETWORK_NAME=shuffle_swarm_executions
-      - SHUFFLE_SCALE_REPLICAS=1
-      - SHUFFLE_SWARM_CONFIG=runn
     restart: unless-stopped
     security_opt:
       - seccomp:unconfined
   opensearch:
-    image: opensearchproject/opensearch:2
+    image: opensearchproject/opensearch:2.3.0
     hostname: shuffle-opensearch
     container_name: shuffle-opensearch
     environment:
       - bootstrap.memory_lock=true
       - "OPENSEARCH_JAVA_OPTS=-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
+      - cluster.initial_master_nodes=shuffle-opensearch
       - cluster.routing.allocation.disk.threshold_enabled=false
       - cluster.name=shuffle-cluster
       - node.name=shuffle-opensearch
-      - discovery.seed_hosts=shuffle-opensearch
-      - cluster.initial_master_nodes=shuffle-opensearch
       - node.store.allow_mmap=false
+      - discovery.seed_hosts=shuffle-opensearch
     ulimits:
       memlock:
         soft: -1