general bug fixing: especially in build.sh there are some critiacal e…

…rrors to be fixed.

login/Dockerfile

@@ -1,5 +1,7 @@
 FROM node:latest
 
+ARG MODE_ENV
+
 ARG IN_SYLVA_GATEKEEPER_HOST
 ARG IN_SYLVA_GATEKEEPER_PORT
 
@@ -16,6 +18,8 @@ ARG IN_SYLVA_CLIENT_ID
 ARG IN_SYLVA_GRANT_TYPE
 ARG IN_SYLVA_REALM
 
+ENV MODE_ENV=${MODE_ENV}
+
 ENV IN_SYLVA_GATEKEEPER_HOST=${IN_SYLVA_GATEKEEPER_HOST}
 ENV IN_SYLVA_GATEKEEPER_PORT=${IN_SYLVA_GATEKEEPER_PORT}
 

login/build.sh

@@ -7,21 +7,29 @@ while [ "$1" != "" ]; do
     shift
 done
 
+echo $IN_SYLVA_SEARCH_HOST
+
 docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" \
  --build-arg MODE_ENV="production" \
  --build-arg IN_SYLVA_CLIENT_ID="in-sylva.user.app" \
  --build-arg IN_SYLVA_GRANT_TYPE="password" \
  --build-arg IN_SYLVA_REALM="in-sylva" \
- --tag in-sylva.user.login ./login/. \
- --build-arg IN_SYLVA_KEYCLOAK_HOST=$IN_SYLVA_KEYCLOAK_HOST \
- --build-arg IN_SYLVA_KEYCLOAK_PORT=$IN_SYLVA_KEYCLOAK_PORT \
- --build-arg IN_SYLVA_PORTAL_HOST=$IN_SYLVA_PORTAL_HOST  \
- --build-arg IN_SYLVA_PORTAL_PORT=$IN_SYLVA_PORTAL_PORT \
- --build-arg IN_SYLVA_SEARCH_HOST=$IN_SYLVA_SEARCH_HOST \
- --build-arg IN_SYLVA_SEARCH_PORT=$IN_SYLVA_SEARCH_PORT \
- --build-arg IN_SYLVA_GATEKEEPER_HOST=$IN_SYLVA_GATEKEEPER_HOST \
- --build-arg IN_SYLVA_GATEKEEPER_PORT=$IN_SYLVA_GATEKEEPER_PORT \
- --build-arg IN_SYLVA_LOGIN_HOST=$IN_SYLVA_LOGIN_HOST \
- --build-arg IN_SYLVA_LOGIN_PORT=$IN_SYLVA_LOGIN_PORT
-
+ --build-arg IN_SYLVA_KEYCLOAK_HOST="w3.avignon.inra.fr/bas_insylva/search/keycloak" \
+ --build-arg IN_SYLVA_KEYCLOAK_PORT="7000" \
+ --build-arg IN_SYLVA_PORTAL_HOST="w3.avignon.inra.fr/bas_insylva/portal" \
+ --build-arg IN_SYLVA_SEARCH_HOST="w3.avignon.inra.fr/bas_insylva/search" \
+ --build-arg IN_SYLVA_GATEKEEPER_HOST="147.100.20.44" \
+ --build-arg IN_SYLVA_GATEKEEPER_PORT="4000" \
+ --tag in-sylva.user.login ./login/.
+
+ # Note: The variables above could not set values from iptables.txt by build.sh
+ # Please notice, the variables should be set as aboves.
 
+ # --build-arg IN_SYLVA_KEYCLOAK_HOST=$IN_SYLVA_KEYCLOAK_HOST \
+ # --build-arg IN_SYLVA_KEYCLOAK_PORT=$IN_SYLVA_KEYCLOAK_PORT \
+ # --build-arg IN_SYLVA_PORTAL_HOST=$IN_SYLVA_PORTAL_HOST  \
+ # --build-arg IN_SYLVA_PORTAL_PORT=$IN_SYLVA_PORTAL_PORT \
+ # --build-arg IN_SYLVA_SEARCH_HOST=$IN_SYLVA_SEARCH_HOST \
+ # --build-arg IN_SYLVA_SEARCH_PORT=$IN_SYLVA_SEARCH_PORT \
+ # --build-arg IN_SYLVA_GATEKEEPER_HOST=$IN_SYLVA_GATEKEEPER_HOST \
+ # --build-arg IN_SYLVA_GATEKEEPER_PORT=$IN_SYLVA_GATEKEEPER_PORT \

portal/build.sh

@@ -8,4 +8,4 @@ while [ "$1" != "" ]; do
 done
 
 # 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/.
+docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE"  --tag in-sylva.portal ./portal/.

search/.env

@@ -2,7 +2,7 @@ REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/bas_insylva/search/gatekeeper
 REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/bas_insylva/search/source-manager
 REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/bas_insylva/search/keycloak
 REACT_APP_IN_SYLVA_SEARCH_HOST=/bas_insylva/search/search-api
-REACT_APP_IN_SYLVA_LOGIN_HOST=http://w3.avignon.inra.fr/bas_insylvalogin/
+REACT_APP_IN_SYLVA_LOGIN_HOST=http://w3.avignon.inra.fr/bas_insylva/login/
 REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app
 REACT_APP_IN_SYLVA_GRANT_TYPE=password
 REACT_APP_IN_SYLVA_REALM=in-sylva

search/Dockerfile

@@ -41,7 +41,7 @@ RUN yarn build
 # production environment
 FROM nginx:latest
 
-RUN apt-get update && apt-get install wget -y && apt-get install telnet -y
+RUN apt-get update && apt-get install wget -y && apt-get install telnet -y && apt-get install vim -y
 
 RUN apt-get install iputils-ping -y