diff --git a/.env b/.env
index e3221e33..4bd36483 100755
--- a/.env
+++ b/.env
@@ -61,7 +61,7 @@ IS_KUBERNETES=false # Used for controlling if the environment should run in
SHUFFLE_BASE_IMAGE_NAME=shuffle
SHUFFLE_BASE_IMAGE_REGISTRY=ghcr.io
-SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-1.1.0"
+SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-1.3.1"
# The eth0 interface inside a container corresponds
# to the virtual Ethernet interface that connects
diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index 8f139bba..e6e0600c 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -3,7 +3,7 @@ name: dockerbuild
on:
push:
branches:
- - 1.4.0
+ - main
paths:
- "**"
- "!.github/**"
@@ -19,23 +19,23 @@ jobs:
include:
- app: frontend
path: frontend
- version: nightly
+ version: 1.3.2
experimental: true
- app: backend
path: backend
- version: nightly
+ version: 1.3.2
experimental: true
- app: app_sdk
path: backend/app_sdk
- version: nightly
+ version: 1.3.2
experimental: true
- app: orborus
path: functions/onprem/orborus
- version: nightly
+ version: 1.3.2
experimental: true
- app: worker
path: functions/onprem/worker
- version: nightly
+ version: 1.3.2
experimental: true
steps:
- name: Checkout
@@ -77,11 +77,11 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache
tags: |
ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ matrix.version }}
- ghcr.io/shuffle/shuffle-${{ matrix.app }}:nightly
+ ghcr.io/shuffle/shuffle-${{ matrix.app }}:latest
${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:${{ matrix.version }}
- ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:nightly
+ ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:latest
frikky/shuffle-${{ matrix.app }}:${{ matrix.version }}
- frikky/shuffle-${{ matrix.app }}:nightly
+ frikky/shuffle-${{ matrix.app }}:latest
frikky/shuffle:${{ matrix.app }}
- name: Image digest
diff --git a/README.md b/README.md
index 188da59c..e8c2f9c1 100755
--- a/README.md
+++ b/README.md
@@ -91,6 +91,7 @@ Contributing guidelines are outlined [here](https://github.com/frikky/Shuffle/bl
+
## License
All modular information related to Shuffle will be under MIT (anyone can use it for whatever purpose), with Shuffle itself using AGPLv3.
diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index b1d7bac3..3937b052 100755
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -145,6 +145,7 @@ def escape(a):
a = str(a)
return json_escape(a)
+
@shuffle_filters.register
def neat_json(a):
try:
diff --git a/docker-compose.yml b/docker-compose.yml
index 727f3e65..63124856 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3'
services:
frontend:
- image: ghcr.io/shuffle/shuffle-frontend:nightly
+ image: ghcr.io/shuffle/shuffle-frontend:latest
container_name: shuffle-frontend
hostname: shuffle-frontend
ports:
@@ -15,7 +15,7 @@ services:
depends_on:
- backend
backend:
- image: ghcr.io/shuffle/shuffle-backend:nightly
+ image: ghcr.io/shuffle/shuffle-backend:latest
container_name: shuffle-backend
hostname: ${BACKEND_HOSTNAME}
# Here for debugging:
@@ -34,7 +34,7 @@ services:
- SHUFFLE_FILE_LOCATION=/shuffle-files
restart: unless-stopped
orborus:
- image: ghcr.io/shuffle/shuffle-orborus:nightly
+ image: ghcr.io/shuffle/shuffle-orborus:latest
container_name: shuffle-orborus
hostname: shuffle-orborus
networks:
@@ -43,7 +43,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock
environment:
- SHUFFLE_APP_SDK_TIMEOUT=300
- - SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=5 # The amount of concurrent executions Orborus can handle.
+ - SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=7 # The amount of concurrent executions Orborus can handle.
#- DOCKER_HOST=tcp://docker-socket-proxy:2375
- ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
- BASE_URL=http://${OUTER_HOSTNAME}:5001
@@ -55,6 +55,7 @@ services:
- HTTPS_PROXY=${HTTPS_PROXY}
- SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
- SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
+ - SHUFFLE_STATS_DISABLED=true
restart: unless-stopped
security_opt:
- seccomp:unconfined
diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx
index 33e9953b..d3c529b3 100755
--- a/frontend/src/views/LoginPage.jsx
+++ b/frontend/src/views/LoginPage.jsx
@@ -333,7 +333,7 @@ const LoginDialog = (props) => {
1. Make sure shuffle-database folder has correct access, and that you have a minimum of 2Gb of RAM available:{" "}
- sudo chown 1000:1000 -R shuffle-database
+ sudo chown -R 1000:1000 shuffle-database