Feature/FF-305 add file handler and combine fe and proxy (#17)

* add filehandler

* remove reverse proxy and add filehandler

* fix error and remove debug

* fix spelling mistake

* add profile variable to rest and filehandler for cors

* add volume to filehandler

* update version

* use var for lastest version of services

Author: qvalentin

.github/workflows/nginx_image.yml

@@ -4,11 +4,16 @@ services:
     image: filefighter/frontend:stable
     networks:
       - FileFighterNetwork
+    depends_on:
+      - FileFighterREST
+      - FileFighterFileHandler
+    ports:
+      - "80:80"
   FileFighterREST:
     image: filefighter/rest:stable
     environment:
       DB_USERNAME: root
-      DB_PASSWORD: GUZFDEGFIDGSZGFZGZDGSZ
+      DB_PASSWORD: GUZFDEGFIDGSZGFZGZDGSZ #change this
       DB_NAME: filefighter
       DB_CONTAINER_NAME: FileFighterDB
       SPRING_PROFILES_ACTIVE: "prod"
@@ -23,17 +28,14 @@ services:
     environment:
       MONGO_INITDB: filefighter
       MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: GUZFDEGFIDGSZGFZGZDGSZ
+      MONGO_INITDB_ROOT_PASSWORD: GUZFDEGFIDGSZGFZGZDGSZ  #change this
     networks:
       - FileFighterNetwork
-  FileFighterReverseProxy:
-    image: filefighter/reverseproxy:v1.0.2
+  FileFighterFileHandler:
+    image: filefighter/filehandler:stable
     networks:
       - FileFighterNetwork
     depends_on:
-      - FileFighterFrontend
       - FileFighterREST
-    ports:
-    - "80:80"
 networks:
   FileFighterNetwork:

ReverseProxy/Dockerfile

@@ -21,8 +21,8 @@ source lib/stop.sh
 source lib/status.sh
 source lib/update.sh
 
-VERSION="v1.6"
-DATE="24.01.21"
+VERSION="v1.7"
+DATE="13.05.21"
 
 # Check if docker is running
 if ! docker info >/dev/null 2>&1; then

ReverseProxy/nginx.conf

@@ -7,15 +7,19 @@ ffinstall() {
   configFilePath=$(pwd)/config.cfg
   restname="FileFighterREST"
   frontendname="FileFighterFrontend"
+  filehandlername="FileFighterFileHandler"
   dbname="FileFighterDB"
   networkname="FileFighterNetwork"
-  reverseproxyname="FileFighterReverseProxy"
 
   # latest stable versions.
   frontendVersion="latest"
   restVersion="latest"
-  proxyVersion="$(getTagsByName filefighter/reverseproxy | tail -1)"
+  filehandlerVersion="latest"
 
+  # cors profile
+  profile="prod"
+
+  volumesLocation="/home/$USER/filefighter/volumes"
 
   echo "Docker prerequisites matched. Docker instance running."
   echo "Reading in config file from: $configFilePath."
@@ -65,20 +69,22 @@ ffinstall() {
     echo "Installing stable versions."
     frontendVersion="$(getTagsByName filefighter/frontend v | tail -1)"
     restVersion="$(getTagsByName filefighter/rest v | tail -1)"
+    filehandlerVersion="$(getTagsByName filefighter/filehandler v | tail -1)"
   else
     echo "Installing latest versions. Be aware that minor bugs could occur. Please report found bugs: filefigther@t-online.de."
-    docker rmi filefighter/rest:latest >/dev/null 2>&1
-    docker rmi filefighter/frontend:latest >/dev/null 2>&1
+    docker rmi filefighter/rest:$restVersion >/dev/null 2>&1
+    docker rmi filefighter/frontend:$frontendVersion >/dev/null 2>&1
+    docker rmi filefighter/filehandler:$filehandlerVersion >/dev/null 2>&1
     docker rmi mongo >/dev/null 2>&1
   fi
 
   # Finished Config:
   echo "Finished reading config. Building containers..."
 
   # Check for already existing CONTAINERS.
-  if [[ $(docker ps -a --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $reverseproxyname) ]]; then
+  if [[ $(docker ps -a --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $filehandlername) ]]; then
     echo ""
-    echo "A container with already exists with the name $restname or $frontendname or $dbname."
+    echo "A container with already exists with the name $restname or $frontendname or $dbname or $filehandlername."
     echo "Maybe its the second time that you run this script. If not please remove these containers."
     echo "If you want to check for updates, run the update.sh script."
     echo ""
@@ -100,7 +106,6 @@ ffinstall() {
     --network $networkname \
     --name $dbname mongo:latest >/dev/null 2>&1
 
-  echo "Finished downloading."
   echo ""
 
   # REST APP
@@ -111,34 +116,34 @@ ffinstall() {
     -e DB_PASSWORD=$db_password \
     -e DB_NAME=$db_name \
     -e DB_CONTAINER_NAME=$dbname \
-    -e SPRING_PROFILES_ACTIVE="prod" \
+    -e SPRING_PROFILES_ACTIVE=$profile \
     --expose 8080 \
     --network $networkname \
     --name $restname filefighter/rest:$restVersion >/dev/null 2>&1
 
-  echo "Finished downloading."
   echo ""
 
-  # Frontend
-  echo "Creating Frontend Container, with tag: $frontendVersion."
-  echo "Downloading filefighter/frontend image."
+  #FileHandler
+  echo "Creating FileHandler Container, with tag: $filehandlerVersion."
+  echo "Downloading filefighter/filehandler image."
   docker create \
+    -e PROFILE=$profile \
+    -v $volumesLocation:/workdir \
     --network $networkname \
-    --name $frontendname filefighter/frontend:$frontendVersion >/dev/null 2>&1
+    --name $filehandlername filefighter/filehandler:$filehandlerVersion >/dev/null 2>&1
 
-  echo "Finished downloading."
   echo ""
 
-  # ReverseProxy
-  echo "Creating ReverseProxy Container with tag: $proxyVersion."
-  echo "Downloading filefighter/reverseproxy image."
+  # Frontend
+  echo "Creating Frontend Container, with tag: $frontendVersion."
+  echo "Downloading filefighter/frontend image."
   docker create \
     --network $networkname \
     -p $app_port:80 \
-    --name=$reverseproxyname \
-    filefighter/reverseproxy:$proxyVersion >/dev/null 2>&1
+    --name $frontendname filefighter/frontend:$frontendVersion >/dev/null 2>&1
 
-  # DataHandler
+  echo "Finished downloading."
+  echo ""
 
   echo ""
   echo "Finished Building FileFighter."

docker-compose.yml

@@ -2,14 +2,14 @@
 ffremove() {
   restname="FileFighterREST"
   frontendname="FileFighterFrontend"
+  filehandlername="FileFighterFileHandler"
   dbname="FileFighterDB"
-  reverseproxyname="FileFighterReverseProxy"
 
-  if [[ $(docker ps -a --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $reverseproxyname) ]]; then
+  if [[ $(docker ps -a --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $filehandlername) ]]; then
     docker container stop $restname && docker container rm $restname >/dev/null 2>&1
     docker container stop $frontendname && docker container rm $frontendname >/dev/null 2>&1
     docker container stop $dbname && docker container rm $dbname >/dev/null 2>&1
-    docker container stop $reverseproxyname && docker container rm $reverseproxyname >/dev/null 2>&1
+    docker container stop $filehandlername && docker container rm $filehandlername >/dev/null 2>&1
 
     echo ""
     echo "Removed FileFighter Application. Install it again with 'ffighter install'."

ffighter

@@ -7,17 +7,19 @@ ffstart() {
   # setup variables
   restname="FileFighterREST"
   frontendname="FileFighterFrontend"
+  filehandlername="FileFighterFileHandler"
   dbname="FileFighterDB"
-  reverseproxyname="FileFighterReverseProxy"
 
-  if [[ $(docker ps -a --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $reverseproxyname) ]]; then
+
+  if [[ $(docker ps -a --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $filehandlername) ]]; then
     echo "Docker prerequisites matched. Docker instance running."
     echo "Starting services..."
 
+    docker start $dbname
     docker start $restname
+    docker start $filehandlername
     docker start $frontendname
-    docker start $dbname
-    docker start $reverseproxyname
+
 
     echo ""
     echo "Finished starting FileFighter services."

lib/install.sh

@@ -1,11 +1,11 @@
 function ffstatus() {
   restname="FileFighterREST"
   frontendname="FileFighterFrontend"
+  filehandlername="FileFighterFileHandler"
   dbname="FileFighterDB"
-  reverseproxyname="FileFighterReverseProxy"
 
   # installed
-  if [[ $(docker ps -a --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $reverseproxyname) ]]; then
+  if [[ $(docker ps -a --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps -a --format "{{.Names}}" | grep $filehandlername) ]]; then
     echo "FileFigher Application is currently installed."
     echo "Remove it with 'ffighter remove'."
 
@@ -16,7 +16,7 @@ function ffstatus() {
 
   echo ""
   # running
-  if [[ $(docker ps --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps --format "{{.Names}}" | grep $reverseproxyname) ]]; then
+  if [[ $(docker ps --format "{{.Names}}" | grep $restname) ]] || [[ $(docker ps --format "{{.Names}}" | grep $frontendname) ]] || [[ $(docker ps --format "{{.Names}}" | grep $dbname) ]] || [[ $(docker ps --format "{{.Names}}" | grep $filehandlername) ]]; then
     echo "FileFigher Application is currently running."
     echo "Stop it with 'ffighter stop'."
     echo ""

lib/remove.sh

@@ -3,16 +3,16 @@
 ffstop() {  # setup variables
   restname="FileFighterREST"
   frontendname="FileFighterFrontend"
+  filehandlername="FileFighterFileHandler"
   dbname="FileFighterDB"
-  reverseproxyname="FileFighterReverseProxy"
 
   echo "Docker prerequisites matched. Docker instance running."
   echo "Stopping services..."
 
-  docker stop $restname
   docker stop $frontendname
+  docker stop $restname
+  docker stop $filehandlername
   docker stop $dbname
-  docker stop $reverseproxyname
 
   echo "Finished stopping FileFighter services."
   echo "You can start them again with 'ffighter start'."