From 0a3ee4c0daf7a23c220723f1b17951872bf3bad2 Mon Sep 17 00:00:00 2001 From: Frikky Date: Sun, 19 Nov 2023 04:18:58 +0100 Subject: [PATCH 1/8] Update install-guide.md --- .github/install-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/install-guide.md b/.github/install-guide.md index 1ca90c4f..bcc1ded3 100755 --- a/.github/install-guide.md +++ b/.github/install-guide.md @@ -1,5 +1,5 @@ # Installation guide -Installation of Shuffle is currently only available in docker. Looking for how to update Shuffle? Check the [updating guide](https://shuffler.io/docs/configuration#updating_shuffle) +Installation of Shuffle is currently available for docker and kubernetes. Looking for how to update Shuffle? Check the [updating guide](https://shuffler.io/docs/configuration#updating_shuffle) This document outlines an introduction environment which is not scalable. [Read here](https://shuffler.io/docs/configuration#production_readiness) for information on production readiness. This also includes system requirements and configurations for Swarm or Kubernetes. From 662b2ea1e27d1497247a3c537129fb2c72e34f4c Mon Sep 17 00:00:00 2001 From: Frikky Date: Sun, 19 Nov 2023 18:15:30 +0100 Subject: [PATCH 2/8] Update install-guide.md --- .github/install-guide.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/install-guide.md b/.github/install-guide.md index bcc1ded3..1a340b36 100755 --- a/.github/install-guide.md +++ b/.github/install-guide.md @@ -55,9 +55,11 @@ OUTER_HOSTNAME=YOUR.IP.HERE docker-compose up -d ``` -### Configurations (proxies, default users etc.) +### Configurations (high availability, scale, proxies, default users etc.) https://shuffler.io/docs/configuration +![architecture](https://github.com/frikky/Shuffle/raw/main/frontend/src/assets/img/shuffle_architecture.png) + ### After installation 1. After installation, go to http://localhost:3001 (or your servername - https is on port 3443) 2. Now set up your admin account (username & password). Shuffle doesn't have a default username and password. From 1b0b2e9dc540c39f0285bfc1499a47ceef89fdf7 Mon Sep 17 00:00:00 2001 From: Aditya <60684641+0x0elliot@users.noreply.github.com> Date: Tue, 21 Nov 2023 19:50:18 +0530 Subject: [PATCH 3/8] chore: bumping shuffle-shared to v0.4.88 --- backend/go-app/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index a69a127b..46cf8516 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -18,7 +18,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/h2non/filetype v1.1.3 github.com/satori/go.uuid v1.2.0 - github.com/shuffle/shuffle-shared v0.4.79 + github.com/shuffle/shuffle-shared v0.4.88 golang.org/x/crypto v0.9.0 google.golang.org/api v0.125.0 google.golang.org/grpc v1.55.0 From c396a7049266672012a74af604957fb3f2fdb270 Mon Sep 17 00:00:00 2001 From: Frikky Date: Wed, 22 Nov 2023 01:52:16 +0100 Subject: [PATCH 4/8] Update install-guide.md --- .github/install-guide.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/install-guide.md b/.github/install-guide.md index 1a340b36..f033838a 100755 --- a/.github/install-guide.md +++ b/.github/install-guide.md @@ -1,4 +1,11 @@ -# Installation guide +

+ +[![Shuffle Logo](https://github.com/Shuffle/Shuffle/blob/main/frontend/public/images/Shuffle_logo_new.png)](https://shuffler.io) + +Shuffle Installation + +

+ Installation of Shuffle is currently available for docker and kubernetes. Looking for how to update Shuffle? Check the [updating guide](https://shuffler.io/docs/configuration#updating_shuffle) This document outlines an introduction environment which is not scalable. [Read here](https://shuffler.io/docs/configuration#production_readiness) for information on production readiness. This also includes system requirements and configurations for Swarm or Kubernetes. From 0b79df2a52c425bfe346db134df42721b7ad46e7 Mon Sep 17 00:00:00 2001 From: Frikky Date: Thu, 30 Nov 2023 00:34:17 +0100 Subject: [PATCH 5/8] Update docker-compose.yml --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 8bde6ff6..c9054c8a 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,6 +42,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock environment: + - SHUFFLE_APP_SDK_TIMEOUT=300 # New SDK default timeout #- DOCKER_HOST=tcp://docker-socket-proxy:2375 - ENVIRONMENT_NAME=${ENVIRONMENT_NAME} - BASE_URL=http://${OUTER_HOSTNAME}:5001 From 5953c5c9db870c3c47b46642151e703f4e318824 Mon Sep 17 00:00:00 2001 From: Frikky Date: Sun, 3 Dec 2023 12:09:01 +0100 Subject: [PATCH 6/8] Modified memcached utilization in docker compose --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index c9054c8a..26b75318 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,6 +90,10 @@ services: # image: docker.io/bitnami/memcached:1 # container_name: shuffle-cache # hostname: shuffle-cache + # mem_limit: 1024m + # environment: + # - MEMCACHED_MEMORY=1024 + # - MEMCACHED_MAX_CONNECTIONS=2500 # ports: # - 11211:11211 From 1cef0db1f1abddbf5c6172925a68ee0ffca8859b Mon Sep 17 00:00:00 2001 From: Frikky Date: Sun, 3 Dec 2023 12:16:21 +0100 Subject: [PATCH 7/8] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 26b75318..80b2b60f 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -87,7 +87,7 @@ services: restart: unless-stopped #memcached: - # image: docker.io/bitnami/memcached:1 + # image: memcached:latest # container_name: shuffle-cache # hostname: shuffle-cache # mem_limit: 1024m From e493d0830311e9990abe0996c6d9c441d9e2dea7 Mon Sep 17 00:00:00 2001 From: Frikky Date: Thu, 7 Dec 2023 22:37:35 +0100 Subject: [PATCH 8/8] Moved to 1.3.1 --- .github/workflows/dockerbuild.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index 4fd63f53..b3c546f1 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -19,23 +19,23 @@ jobs: include: - app: frontend path: frontend - version: 1.3.0 + version: 1.3.1 experimental: true - app: backend path: backend - version: 1.3.0 + version: 1.3.1 experimental: true - app: app_sdk path: backend/app_sdk - version: 1.3.0 + version: 1.3.1 experimental: true - app: orborus path: functions/onprem/orborus - version: 1.3.0 + version: 1.3.1 experimental: true - app: worker path: functions/onprem/worker - version: 1.3.0 + version: 1.3.1 experimental: true steps: - name: Checkout