Fixed merge issues
This commit is contained in:
+43
-49
@@ -1,23 +1,40 @@
|
||||
# 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)
|
||||
|
||||
## Docker
|
||||
The Docker setup is done with docker-compose and is a single command to get set up.
|
||||
This document outlines a an introduction environment which is not scalable. [Read here](https://shuffler.io/docs/configuration#production_readiness) for information on production readiness.
|
||||
|
||||
# Docker - *nix
|
||||
The Docker setup is done with docker-compose
|
||||
|
||||
**PS: if you're setting up Shuffle on Windows, go to the next step (Windows Docker setup)**
|
||||
|
||||
1. Make sure you have Docker and [docker-compose](https://docs.docker.com/compose/install/) installed.
|
||||
2. Adapt the .env file to your convenience.
|
||||
3. Run docker-compose.
|
||||
1. Make sure you have [Docker](https://docs.docker.com/get-docker/) and [docker-compose](https://docs.docker.com/compose/install/) installed.
|
||||
2. Download Shuffle
|
||||
```
|
||||
git clone https://github.com/frikky/Shuffle
|
||||
cd Shuffle
|
||||
```
|
||||
|
||||
3. Fix prerequisites for the Opensearch database (Elasticsearch):
|
||||
```
|
||||
sudo chown 1000:1000 -R shuffle-database # Required for Opensearch
|
||||
sudo sysctl -w vm.max_map_count=262144 # https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html
|
||||
|
||||
# To make the changes permanent, do:
|
||||
# 1. Open the file /etc/sysctl.conf
|
||||
# 2. Go to the bottom of the file
|
||||
# 3. Add this line:
|
||||
vm.max_map_count=262144
|
||||
```
|
||||
|
||||
4. Run docker-compose.
|
||||
```
|
||||
docker-compose up -d
|
||||
```
|
||||
|
||||
When you're done, skip to the "After installation" step below.
|
||||
|
||||
## Windows Docker setup
|
||||
## Windows with WSL
|
||||
This step is for setting up with Docker on windows from scratch.
|
||||
|
||||
1. Make sure you have [Docker](https://docs.docker.com/docker-for-windows/install/) and [docker-compose](https://docs.docker.com/compose/install/) installed. WSL2 may be required.
|
||||
@@ -27,7 +44,18 @@ This step is for setting up with Docker on windows from scratch.
|
||||
```
|
||||
OUTER_HOSTNAME=YOUR.IP.HERE
|
||||
```
|
||||
5. Run docker-compose
|
||||
|
||||
5. Configure max memory (WSL) by opening a new CMD/Powershell window. Required for Elasticsearch
|
||||
```
|
||||
wsl -d docker-desktop
|
||||
sysctl -w vm.max_map_count=262144
|
||||
echo "vm.max_map_count = 262144" > /etc/sysctl.d/99-docker-desktop.conf
|
||||
echo -e "\nvm.max_map_count = 262144\n" >> /etc/sysctl.d/00-alpine.conf
|
||||
|
||||
# https://stackoverflow.com/questions/42111566/elasticsearch-in-windows-docker-image-vm-max-map-count
|
||||
```
|
||||
|
||||
6. Run docker-compose
|
||||
```
|
||||
docker-compose up -d
|
||||
```
|
||||
@@ -35,53 +63,20 @@ docker-compose up -d
|
||||
### Configurations (proxies, default users etc.)
|
||||
https://shuffler.io/docs/configuration
|
||||
|
||||
### After installation
|
||||
1. After installation, go to http://localhost:3001/adminsetup (or your servername)
|
||||
|
||||
2. Now set up your admin account (username & password). Shuffle doesn't have a default username and password.
|
||||
3. Check out https://shuffler.io/docs/configuration as it has a lot of useful information to get started
|
||||
### After installation
|
||||
1. After installation, go to http://localhost:3001/adminsetup (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.
|
||||
3. Sign in with the same Username & Password! Go to /apps and see if you have any apps yet. If not - you may need to [configure proxies](https://shuffler.io/docs/configuration#production_readiness)
|
||||
4. Check out https://shuffler.io/docs/configuration as it has a lot of useful information to get started
|
||||
|
||||

|
||||
|
||||
### Useful info
|
||||
* Check out [getting started](https://shuffler.io/docs/getting_started)
|
||||
* The default state of Shuffle is NOT scalable. See [production setup](https://shuffler.io/docs/configuration#production_readiness) for more info
|
||||
* The server is available on http://localhost:3001 (or your servername)
|
||||
* Further configurations can be done in docker-compose.yml and .env.
|
||||
* Default database location is /etc/shuffle
|
||||
|
||||
### Execution problems
|
||||
If you have problems with your first execution (hello world), you might need to set the correct Docker API version. Here's how:
|
||||
|
||||
1. Find your API version by running "docker version"
|
||||
```
|
||||
$ docker version
|
||||
|
||||
Client:
|
||||
Version: 17.09.1-ce
|
||||
API version: 1.32 # <-- this one
|
||||
Go version: go1.8.3
|
||||
Git commit: 19e2cf6
|
||||
Built: Thu Dec 7 22:24:16 2017
|
||||
OS/Arch: linux/amd64
|
||||
|
||||
Server:
|
||||
Version: 17.09.1-ce
|
||||
API version: 1.32 (minimum version 1.12)
|
||||
Go version: go1.8.3
|
||||
Git commit: 19e2cf6
|
||||
Built: Thu Dec 7 22:22:56 2017
|
||||
OS/Arch: linux/amd64
|
||||
Experimental: false
|
||||
```
|
||||
|
||||
2. Open docker-compose.yml and change the line with "DOCKER_API_VERSION" to your version.
|
||||
3. Restart docker-compose
|
||||
```
|
||||
docker-compose down
|
||||
docker-compose up
|
||||
```
|
||||
|
||||
Related issue: #47
|
||||
* Default database location is in the same folder: ./shuffle-database
|
||||
|
||||
# Local development installation
|
||||
Local development is pretty straight forward with **ReactJS** and **Golang**. This part is intended to help you run the code for development purposes.
|
||||
@@ -100,7 +95,7 @@ npm start
|
||||
## Backend - Golang
|
||||
http://localhost:5001 - REST API - requires [>=go1.13](https://golang.org/dl/)
|
||||
```bash
|
||||
export DATASTORE_EMULATOR_HOST=0.0.0.0:8000
|
||||
export SHUFFLE_OPENSEARCH_URL="http://localhost:9200"
|
||||
cd backend/go-app
|
||||
go run *.go
|
||||
```
|
||||
@@ -121,7 +116,6 @@ cd functions/onprem/orborus
|
||||
go run orborus.go
|
||||
```
|
||||
|
||||
|
||||
Environments (modify for Windows):
|
||||
```
|
||||
export ORG_ID=Shuffle
|
||||
|
||||
Reference in New Issue
Block a user