Several enhancements
This commit is contained in:
parent
66c5891051
commit
a2806bed13
11
README.md
11
README.md
@ -118,15 +118,6 @@ cd ~/src/bbb-common-message
|
|||||||
./deploy.sh
|
./deploy.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Deploy on UBUNTU (for local development)
|
|
||||||
*Script to deploy `common-message`, `common-web` and Akka `sbt update`*
|
|
||||||
|
|
||||||
**Execute on Ubuntu terminal (not within Docker)**
|
|
||||||
1. Save in ~/{container_name}/: [sbt_update_libs.sh](assets/sbt_update_libs.sh?raw=1)
|
|
||||||
2. Go into the folder `cd ~/{container_name}`
|
|
||||||
3. Set exec permissions `chmod +x sbt_update_libs.sh`
|
|
||||||
4. Exec `./sbt_update_libs.sh` or `./sbt_update_libs.sh akka` (to update only common-msg and akka)
|
|
||||||
|
|
||||||
---
|
---
|
||||||
## BBB-Web (API)
|
## BBB-Web (API)
|
||||||
|
|
||||||
@ -155,7 +146,7 @@ cd ~/src/akka-bbb-apps/
|
|||||||
```
|
```
|
||||||
|
|
||||||
#### Running Akka on **IntelliJ IDEA**
|
#### Running Akka on **IntelliJ IDEA**
|
||||||
- [Requires Common-Message - Deploy on UBUNTU (for local development)](#deploy-on-ubuntu-for-local-development)
|
- [Requires Common-Message](#common-message-required-for-bbb-web-and-akka)
|
||||||
- Open bbb-docker-dev SSH connection appending `-with-ports` to the command *(it will create tunnel for Redis port 6379)*
|
- Open bbb-docker-dev SSH connection appending `-with-ports` to the command *(it will create tunnel for Redis port 6379)*
|
||||||
```bash
|
```bash
|
||||||
ssh {container_name}-with-ports
|
ssh {container_name}-with-ports
|
||||||
|
@ -1,52 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
scriptDir=$(dirname -- "$(readlink -f -- "$BASH_SOURCE")")
|
|
||||||
|
|
||||||
if [ ! -d $scriptDir/bigbluebutton ]; then
|
|
||||||
echo "Place sbt_update_libs.sh in the same directory as 'bigbluebutton'"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $(whoami) == 'bigbluebutton' ]; then
|
|
||||||
echo "Run sbt_update_libs.sh outside of the container"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
bbbRealease=$(head -n 1 $scriptDir/bigbluebutton/bigbluebutton-config/bigbluebutton-release)
|
|
||||||
|
|
||||||
if [[ $bbbRealease == BIGBLUEBUTTON_RELEASE\=2.5* ]] ; then
|
|
||||||
echo "BBB 2.5 found"
|
|
||||||
javaPath=$(ls -d /home/$(whoami)/.jdks/corretto-11.* | head -1)
|
|
||||||
elif [[ $bbbRealease == BIGBLUEBUTTON_RELEASE\=2.4* ]] ; then
|
|
||||||
echo "BBB 2.4 found"
|
|
||||||
javaPath=$(ls -d /home/$(whoami)/.jdks/corretto-1.8* | head -1)
|
|
||||||
elif [[ $bbbRealease == BIGBLUEBUTTON_RELEASE\=2.3* ]] ; then
|
|
||||||
echo "BBB 2.3 found"
|
|
||||||
javaPath=$(ls -d /home/$(whoami)/.jdks/corretto-1.8* | head -1)
|
|
||||||
else
|
|
||||||
echo "BBB version is not compatible"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! $javaPath ] ; then
|
|
||||||
echo "Java $javaPath not found"
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
echo "$javaPath found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
export JAVA_HOME=$javaPath
|
|
||||||
export PATH="$JAVA_HOME/bin:$PATH"
|
|
||||||
|
|
||||||
buildOnly="${1:-all}"
|
|
||||||
|
|
||||||
|
|
||||||
cd $scriptDir/bigbluebutton/bbb-common-message;
|
|
||||||
./deploy.sh;
|
|
||||||
|
|
||||||
if [ buildOnly != "akka" ] ; then
|
|
||||||
cd $scriptDir/bigbluebutton/bbb-common-web;
|
|
||||||
./deploy.sh;
|
|
||||||
fi;
|
|
||||||
|
|
||||||
cd $scriptDir/bigbluebutton/akka-bbb-apps;
|
|
||||||
sbt update
|
|
Loading…
Reference in New Issue
Block a user