From c63e9f848bc0dfec7b2b9620dfd9c124f51ead18 Mon Sep 17 00:00:00 2001
From: magnus anatolius <magnusanatolius@localhost.localdomain>
Date: Tue, 17 Mar 2020 01:55:05 +0100
Subject: [PATCH] general bug fixing*

---
 build.sh                | 19 ++++++++++++-------
 data.sql                | 14 +++++++-------
 doc/build.sh            |  6 ------
 gatekeeper/build.sh     |  7 +------
 login/build.sh          |  7 +------
 portal/.env             |  2 +-
 portal/Dockerfile       |  2 +-
 portal/build.sh         | 11 ++---------
 postgresql/build.sh     |  2 +-
 search/build.sh         |  8 +-------
 source.manager/build.sh |  6 ------
 11 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/build.sh b/build.sh
index 0135789..f31d584 100644
--- a/build.sh
+++ b/build.sh
@@ -1,22 +1,27 @@
 #!/bin/bash
 
-sh ./gatekeeper/build.sh
+if [$1 -eq ""]
+then
+    set "id_ed25519"
+fi
+
+sh ./gatekeeper/build.sh $1
 wait 
 echo "gatekeeper image Successfully built"
-sh ./keycloak/build.sh
+sh ./keycloak/build.sh $1
 wait
 echo "keycloak image Successfully built"
-sh ./login/build.sh
+sh ./login/build.sh $1
 wait
 echo "login image Successfully built"
-sh ./portal/build.sh
+sh ./portal/build.sh $1
 wait
 echo "portal image Successfully built"
-sh ./postgresql/build.sh
+sh ./postgresql/build.sh $1
 wait
 echo "postgresql image Successfully built"
-sh ./source.manager/build.sh
+sh ./source.manager/build.sh $1
 echo "source.manager image Successfully built"
 wait
-sh ./doc/build.sh
+sh ./doc/build.sh $1
 echo "doc image Successfully built"
\ No newline at end of file
diff --git a/data.sql b/data.sql
index f1c8783..62538cc 100644
--- a/data.sql
+++ b/data.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS sources (
 );
 
 CREATE table IF NOT EXISTS provider_sources (
-    id serial PRIMARY KEY ,
+    id serial PRIMARY KEY,
     user_id integer NOT NULL,
     source_id integer,
 
@@ -40,8 +40,8 @@ CREATE table IF NOT EXISTS provider_sources (
     update_at timestamp
 );
 
-CREATE table IF NOT EXISTS std_fields (
-    id serial UNIQUE NOT NULL ,
+CREATE table IF NOT EXISTS std_fields(
+    id serial UNIQUE NOT NULL,
     std_field_id integer,
     
     category varchar(100), 
@@ -63,20 +63,20 @@ CREATE table IF NOT EXISTS std_fields (
     update_at timestamp
 );
 
-CREATE table IF NOT EXISTS std_fields_values (
+CREATE table IF NOT EXISTS std_fields_values(
     id serial UNIQUE NOT NULL, 
     std_field_id int NOT NULL, 
     values varchar(150),
 
-    CONSTRAINT std_fields_id_fkkey FOREIGN KEY (std_field_id)
+    CONSTRAINT std_fields_values_fkkey FOREIGN KEY (std_field_id)
         REFERENCES std_fields(id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION,
         
     create_at timestamp NOT NULL DEFAULT NOW(),
     update_at timestamp
-)
+);
 
-CREATE table IF NOT EXISTS addtl_fields (
+CREATE table IF NOT EXISTS addtl_fields(
     id serial UNIQUE NOT NULL ,
     addtl_field_id integer,
 
diff --git a/doc/build.sh b/doc/build.sh
index f183765..6d13b29 100644
--- a/doc/build.sh
+++ b/doc/build.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-# sh ./build.sh id_rsa_insylva_docker
-if [$1 -eq ""]
-then
-    set "id_rsa_insylva_docker"
-fi
 
 while [ "$1" != "" ]; do
    SSH_KEY=$(cat ~/.ssh/$1)
@@ -13,4 +8,3 @@ while [ "$1" != "" ]; do
 done
 
 docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.doc ./doc/.
-
diff --git a/gatekeeper/build.sh b/gatekeeper/build.sh
index b759695..4ddb87b 100644
--- a/gatekeeper/build.sh
+++ b/gatekeeper/build.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-# sh ./build.sh id_rsa_insylva_docker
-if [$1 -eq ""]
-then
-    set "id_rsa_insylva_docker"
-fi
 
 while [ "$1" != "" ]; do
    SSH_KEY=$(cat ~/.ssh/$1)
@@ -11,6 +6,6 @@ while [ "$1" != "" ]; do
     # Shift all the parameters down by one
     shift
 done
-# --no-cache
+
 docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.gatekeeper ./gatekeeper/.
 
diff --git a/login/build.sh b/login/build.sh
index 4653960..8b81754 100644
--- a/login/build.sh
+++ b/login/build.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 
-if [$1 -eq ""]
-then
-    set "id_rsa_insylva_docker"
-fi
-
- while [ "$1" != "" ]; do
+while [ "$1" != "" ]; do
    SSH_KEY=$(cat ~/.ssh/$1)
    SSH_KEY_PASSPHRASE=$(cat ~/.ssh/$1.pub)
     # Shift all the parameters down by one
diff --git a/portal/.env b/portal/.env
index f156d05..784ce6f 100644
--- a/portal/.env
+++ b/portal/.env
@@ -1,7 +1,7 @@
 REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/gatekeeper 
 REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/source-manager
 REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/keycloak
-REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app
+REACT_APP_IN_SYLVA_CLIENT_ID=data
 REACT_APP_IN_SYLVA_GRANT_TYPE=password
 REACT_APP_IN_SYLVA_REALM=in-sylva
 REACT_APP_PORT=3000
\ No newline at end of file
diff --git a/portal/Dockerfile b/portal/Dockerfile
index e931ef1..9ff0a3d 100644
--- a/portal/Dockerfile
+++ b/portal/Dockerfile
@@ -42,7 +42,7 @@ FROM nginx:latest
 
 RUN apt-get update && apt-get install wget -y && apt-get install telnet -y
 
-# RUN apt-get install iputils-ping -y
+RUN apt-get install iputils-ping -y
 
 RUN apt-get update && apt-get install nginx-extras -y
 
diff --git a/portal/build.sh b/portal/build.sh
index 7cb2b13..6daa32a 100644
--- a/portal/build.sh
+++ b/portal/build.sh
@@ -1,17 +1,10 @@
 #!/bin/bash
 
-# ex: sh ./build.sh id_rsa_insylva_docker
-
-if [$1 -eq ""]
-then
-    set "id_rsa_insylva_docker"
-fi
-
 while [ "$1" != "" ]; do
    SSH_KEY=$(cat ~/.ssh/$1)
    SSH_KEY_PASSPHRASE=$(cat ~/.ssh/$1.pub)
     # Shift all the parameters down by one
     shift
 done
-# --no-cache
-docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE"  --tag in-sylva.portal ./portal/.
+
+docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE"  --tag in-sylva.portal ./portal/.
diff --git a/postgresql/build.sh b/postgresql/build.sh
index f36ba02..51b3d2e 100644
--- a/postgresql/build.sh
+++ b/postgresql/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-# Benjamin
+
 docker build --no-cache -t in-sylva.postgres ./postgresql/.
\ No newline at end of file
diff --git a/search/build.sh b/search/build.sh
index b1e0cf2..f899027 100644
--- a/search/build.sh
+++ b/search/build.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-# sh ./build.sh id_rsa_insylva_docker
-if [$1 -eq ""]
-then
-    set "id_rsa_insylva_docker"
-fi
 
 while [ "$1" != "" ]; do
    SSH_KEY=$(cat ~/.ssh/$1)
@@ -12,6 +7,5 @@ while [ "$1" != "" ]; do
     shift
 done
 
-# --no-cache
-docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.search ./search/.
+docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.search .
 
diff --git a/source.manager/build.sh b/source.manager/build.sh
index 87e2db8..f284815 100644
--- a/source.manager/build.sh
+++ b/source.manager/build.sh
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# ex: sh ./build.sh id_rsa_insylva_docker
-if [$1 -eq ""]
-then
-    set "id_rsa_insylva_docker"
-fi
-
 while [ "$1" != "" ]; do
    SSH_KEY=$(cat ~/.ssh/$1)
    SSH_KEY_PASSPHRASE=$(cat ~/.ssh/$1.pub)