marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into 1.4.0

Browse Source
This commit is contained in:
Frikky
2024-01-31 10:57:29 +01:00
committed by GitHub
parent f8bbfb0fdb 001fa3952d
commit 989dc2aaf4
12 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+1 -1
View File
@@ -61,7 +61,7 @@ IS_KUBERNETES=false # Used for controlling if the environment should run in
SHUFFLE_BASE_IMAGE_NAME=shuffle SHUFFLE_BASE_IMAGE_NAME=shuffle
SHUFFLE_BASE_IMAGE_REGISTRY=ghcr.io 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 # The eth0 interface inside a container corresponds
# to the virtual Ethernet interface that connects # to the virtual Ethernet interface that connects
.github/workflows/dockerbuild.yaml
+9 -9
View File
@@ -3,7 +3,7 @@ name: dockerbuild
on: on:
push: push:
branches: branches:
- 1.4.0 - main
paths: paths:
- "**" - "**"
- "!.github/**" - "!.github/**"
@@ -19,23 +19,23 @@ jobs:
include: include:
- app: frontend - app: frontend
path: frontend path: frontend
version: nightly version: 1.3.2
experimental: true experimental: true
- app: backend - app: backend
path: backend path: backend
version: nightly version: 1.3.2
experimental: true experimental: true
- app: app_sdk - app: app_sdk
path: backend/app_sdk path: backend/app_sdk
version: nightly version: 1.3.2
experimental: true experimental: true
- app: orborus - app: orborus
path: functions/onprem/orborus path: functions/onprem/orborus
version: nightly version: 1.3.2
experimental: true experimental: true
- app: worker - app: worker
path: functions/onprem/worker path: functions/onprem/worker
version: nightly version: 1.3.2
experimental: true experimental: true
steps: steps:
- name: Checkout - name: Checkout
@@ -77,11 +77,11 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache
tags: | tags: |
ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ matrix.version }} 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 }}:${{ 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 }}:${{ matrix.version }}
frikky/shuffle-${{ matrix.app }}:nightly frikky/shuffle-${{ matrix.app }}:latest
frikky/shuffle:${{ matrix.app }} frikky/shuffle:${{ matrix.app }}
- name: Image digest - name: Image digest
README.md
+1
View File
@@ -91,6 +91,7 @@ Contributing guidelines are outlined [here](https://github.com/frikky/Shuffle/bl
<img src="https://contrib.rocks/image?repo=frikky/shuffle-apps" /> <img src="https://contrib.rocks/image?repo=frikky/shuffle-apps" />
</a> </a>
## License ## License
All modular information related to Shuffle will be under MIT (anyone can use it for whatever purpose), with Shuffle itself using AGPLv3. All modular information related to Shuffle will be under MIT (anyone can use it for whatever purpose), with Shuffle itself using AGPLv3.
backend/app_sdk/app_base.py
+1
View File
@@ -145,6 +145,7 @@ def escape(a):
a = str(a) a = str(a)
return json_escape(a) return json_escape(a)
@shuffle_filters.register @shuffle_filters.register
def neat_json(a): def neat_json(a):
try: try:
docker-compose.yml
+5 -4
View File
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
frontend: frontend:
image: ghcr.io/shuffle/shuffle-frontend:nightly image: ghcr.io/shuffle/shuffle-frontend:latest
container_name: shuffle-frontend container_name: shuffle-frontend
hostname: shuffle-frontend hostname: shuffle-frontend
ports: ports:
@@ -15,7 +15,7 @@ services:
depends_on: depends_on:
- backend - backend
backend: backend:
image: ghcr.io/shuffle/shuffle-backend:nightly image: ghcr.io/shuffle/shuffle-backend:latest
container_name: shuffle-backend container_name: shuffle-backend
hostname: ${BACKEND_HOSTNAME} hostname: ${BACKEND_HOSTNAME}
# Here for debugging: # Here for debugging:
@@ -34,7 +34,7 @@ services:
- SHUFFLE_FILE_LOCATION=/shuffle-files - SHUFFLE_FILE_LOCATION=/shuffle-files
restart: unless-stopped restart: unless-stopped
orborus: orborus:
image: ghcr.io/shuffle/shuffle-orborus:nightly image: ghcr.io/shuffle/shuffle-orborus:latest
container_name: shuffle-orborus container_name: shuffle-orborus
hostname: shuffle-orborus hostname: shuffle-orborus
networks: networks:
@@ -43,7 +43,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
environment: environment:
- SHUFFLE_APP_SDK_TIMEOUT=300 - 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 #- DOCKER_HOST=tcp://docker-socket-proxy:2375
- ENVIRONMENT_NAME=${ENVIRONMENT_NAME} - ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
- BASE_URL=http://${OUTER_HOSTNAME}:5001 - BASE_URL=http://${OUTER_HOSTNAME}:5001
@@ -55,6 +55,7 @@ services:
- HTTPS_PROXY=${HTTPS_PROXY} - HTTPS_PROXY=${HTTPS_PROXY}
- SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY} - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
- SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY} - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
- SHUFFLE_STATS_DISABLED=true
restart: unless-stopped restart: unless-stopped
security_opt: security_opt:
- seccomp:unconfined - seccomp:unconfined
frontend/src/views/LoginPage.jsx
+1 -1
View File
@@ -333,7 +333,7 @@ const LoginDialog = (props) => {
<b>1.</b> Make sure shuffle-database folder has correct access, and that you have a minimum of <b>2Gb of RAM available</b>:{" "} <b>1.</b> Make sure shuffle-database folder has correct access, and that you have a minimum of <b>2Gb of RAM available</b>:{" "}
<br /> <br />
<br /> <br />
sudo chown 1000:1000 -R shuffle-database sudo chown -R 1000:1000 shuffle-database
</Typography> </Typography>
<Typography <Typography
variant="body2" variant="body2"
functions/kubernetes/kubernetes.md → functions/kubernetes/README.md
View File
functions/onprem/orborus/go.mod
+1 -1
View File
@@ -9,7 +9,7 @@ require (
github.com/mackerelio/go-osstat v0.2.3 github.com/mackerelio/go-osstat v0.2.3
github.com/satori/go.uuid v1.2.0 github.com/satori/go.uuid v1.2.0
github.com/shirou/gopsutil v3.21.11+incompatible github.com/shirou/gopsutil v3.21.11+incompatible
github.com/shuffle/shuffle-shared v0.5.44 github.com/shuffle/shuffle-shared v0.5.68
k8s.io/api v0.28.1 k8s.io/api v0.28.1
k8s.io/apimachinery v0.28.1 k8s.io/apimachinery v0.28.1
k8s.io/client-go v0.28.1 k8s.io/client-go v0.28.1
functions/onprem/orborus/go.sum
-2
View File
@@ -280,8 +280,6 @@ github.com/shuffle/shuffle-shared v0.4.96 h1:iaIB/HP9eKpw9DMMJZhSLDbKdHJt075kFYL
github.com/shuffle/shuffle-shared v0.4.96/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI= github.com/shuffle/shuffle-shared v0.4.96/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI=
github.com/shuffle/shuffle-shared v0.5.29 h1:n4vThl7v3mFVXbrIW71XREFdmZZo7mOBAWxnsdiNjDk= github.com/shuffle/shuffle-shared v0.5.29 h1:n4vThl7v3mFVXbrIW71XREFdmZZo7mOBAWxnsdiNjDk=
github.com/shuffle/shuffle-shared v0.5.29/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI= github.com/shuffle/shuffle-shared v0.5.29/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI=
github.com/shuffle/shuffle-shared v0.5.44 h1:6WiFPIsij+IWvXY7vzVX7cUicb+PYOzhTbWF/gDmYeU=
github.com/shuffle/shuffle-shared v0.5.44/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
functions/onprem/orborus/orborus.go
+2 -2
View File
@@ -1063,7 +1063,7 @@ func getOrborusStats(ctx context.Context) shuffle.OrborusStats {
// Use the docker API to get the CPU usage of the docker engine machine // Use the docker API to get the CPU usage of the docker engine machine
pers, err := dockercli.Info(ctx) pers, err := dockercli.Info(ctx)
if err != nil { if err != nil {
log.Printf("[ERROR] Failed getting docker info: %s", err) log.Printf("[ERROR] Failed getting docker info: %s. This is normal IF there are many containers running.", err)
return newStats return newStats
} else { } else {
newStats.TotalContainers = pers.Containers newStats.TotalContainers = pers.Containers
@@ -1415,7 +1415,7 @@ func main() {
// Should find data to send (memory etc.) // Should find data to send (memory etc.)
// Create timeout of max 4 seconds just in case // Create timeout of max 4 seconds just in case
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel() defer cancel()
// Marshal and set body // Marshal and set body
functions/onprem/worker/go.mod
+1 -1
View File
@@ -8,7 +8,7 @@ require (
github.com/docker/docker v23.0.3+incompatible github.com/docker/docker v23.0.3+incompatible
github.com/gorilla/mux v1.8.0 github.com/gorilla/mux v1.8.0
github.com/satori/go.uuid v1.2.0 github.com/satori/go.uuid v1.2.0
github.com/shuffle/shuffle-shared v0.5.63 github.com/shuffle/shuffle-shared v0.5.68
k8s.io/api v0.28.3 k8s.io/api v0.28.3
k8s.io/apimachinery v0.28.3 k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.28.3 k8s.io/client-go v0.28.3
functions/onprem/worker/go.sum
-11
View File
@@ -371,17 +371,6 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk= github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/shuffle/shuffle-shared v0.5.61 h1:Fkd7pvk8ypwaio1VvMOmJ6PQF9xCfNYx8RWjPnXjn5E=
github.com/shuffle/shuffle-shared v0.5.61/go.mod h1:oIZkx93Z7EvtiTXty7xO+ax63Fjz8MQvjXMxDN0Qws0=
github.com/shuffle/shuffle-shared v0.5.63 h1:Ukjj1ThyTvcoPCi0Hhxp+BbD8VfI1xr4Xyyhh3URb3Q=
github.com/shuffle/shuffle-shared v0.5.63/go.mod h1:oIZkx93Z7EvtiTXty7xO+ax63Fjz8MQvjXMxDN0Qws0=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ=
github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=