ssh disabled for general use for elk.

admin-key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPWTB2wopf6byp
-P3jO1cjIsItFYGNO86/aAtZBmv74HkezmYnwrTNOMPgnrGKKizqQ0m3RLIufqe2A
-zpPQ3a3x7xwWjghzNQMu8WXm/LbpZzxMXFYsB+8AR4aadx0E3UXPa0GGTful0zvl
-apgMcTxaWLAQGzJIaGFsUy/UrhKiitdi8JGBcqdEKSjGSDK84MppL56yaWyMQWNK
-2e5ulIZoaZdyUZCX/f+sVIR+wD8VI5MLGeuzLP5lybrNM/LUaem+Ky8eMUWTfix8
-tlSFc6l4V7vMr/tJaAu9QXADWBJeVMImEsI2ytKziJUCt7fClhtViznk6nX0LPYa
-vhvKiTM3AgMBAAECggEAdmqFVw27YRNn/3CUWeuWA6dvomtty8U4BNXh7w3J14HT
-iSqCsMT5rAojbuTwUhc5l0PWG8PI6aJuVUWk/X/cu3LHI8px4PnBm6mZfNWO0LV4
-plOFkxfk0tAGe2jTVdfY6qBih4U51nZQmrDJrTFuOlq0Ej619MxH90l644eWdOS1
-mDDI/KCrW4ayNd1uF69uV/UHf4fjPDkU9oIzilND8KXEDR2jmBsbzaLvS7Yg/+ln
-M5wXY94Lw2Ytfx5X337UWaWEJFE8DMZKod740i2MzZ+5V44WCA6p4HDrz+4JiEp2
-pioAYacYlJXGKW3sG4cPU9r6c1iJ5bg64wt5qTYXwQKBgQD/WxakfiIFg04DEEev
-luOBnuDM52HHMI6SNUUoI6Xt+Ekcf6VJ0RNQB47b8/zfQ38ihzqfuD6TntLyiMeD
-MV89BriBpG8aw2zVNIGnqEKk4a0WeVivYfe4fJDeo4sPc6UssowRytPQKgMg+z+K
-+a2yISGz7g9J4H4NDhvKcyz8qQKBgQDP3xjfDNMboyFBzhSfIRTop3viQm36Tshl
-ILHX6I53lIfBptlcDPATlOmTGgiWk/xSxMzrEv9h4CYGhydcawvaKC60hZF3IZUG
-Wjl42Kk2vlx11b0k2QsHOkS+WM/DwXuizFtjtXuMyQ+ELTJ7Ba2mtzNkGuUmV+cM
-GfgcgYW83wKBgAfc5CuYfq+wxVwuyiZL/SFmpQFqNoaNpjY2UbTUtC1Jseagv5Qw
-Tenu8aUwNB8j0uxbQaDdaX/eKhyxvYL6qDYW2OOVDp7CWb2O6lchRTwSfuPsRKDR
-4XDa1RMl8gg9xV5E+S8rEa6dPI9tbR14ZrLPdlw1/l6F/RulzZFETqRRAoGAZYH5
-QDqgAFf5zouW8FoUPsRCr6tmzxuXqiJ8FgX/RA+o93zFmbjLp5RJN0c4OGfNiJGH
-y6c8RIxTpU5sfyna4M5MeGTdMwKYJkD63bNXdl8hAX29XngKdZ4Toav20Q3zlP0c
-B6XAznAEfrQfeYm9UbMWimTDz6SPNA6eZTUunJsCgYEAmu4roPWfZ7Rlxh6/akcs
-PsbrBhNFEeJSNU/pWqPTnGbsH/bP+OHfBAg+KQaNnLLgAc2cMatfP3j9RBR2n+wj
-LPl0zmB/bqnnIYGQ4LVew7kabqns+o9TbSRMIX5j9+Fk4BUlplno5r2md7bWzRrR
-GmzerPqHxqPAuWFIg7q55UU=
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCxuhCyqixVl9Dw
+CSJcw5IYEVXND+tVK+v8iKQweJT28bikkDJcbDVPRElCMQJKua1NTYQ/tE7YozkR
+rdbjfnd61n1ou0y7h28DMfM6YTnPRnw56iomLzR734gIckVG+AdBt1Wxs+pf+CG5
+UziephGXKEbyj/ZeE+dHJYafNBylJaQgKQhAMm5GxxxqY5pKmdDzJq1Xjx/obOcb
+w2EUsLOCtlSrVjCNm+zEwkDRmI9JHueuZamVIYUmKEuJGdt4ohefy2cEzc8Vdl9s
+ddsoVq+ny2fcFjag0qsNpcZLCOpw4HdMRDfwoQIja3ARpLlSKpSqBaN3fBNmvmBj
+Zk+1so8tAgMBAAECggEBAKLPFGTXR23ReXGqrHPWJIsvti34G1kWt0PL2L0eeTgP
+D1qRTdEkv2Ex6Ppd8v+JQJzEGhZRkrkaLTloyqX0QHei7Zd3nT9dPfDrXSlpz491
+vm8/eAUq0SV5DCDQrW3p4Jvu2u3DJz1rDVm8Ru3uq8aQ+w1RnBtqmD+wvLYzAtq1
+LT2j8n9NaJcfak9u+nERMJ7E55OymRqvsUdq6l+kyM4mQTvzGp3Vh6NvKhhD0j3i
+oX9hj7JH3LukG/CXqW0NtJkhreeHrIUkDB6vXl35d+CGAqp5jSTsgxrSxQ5P44VL
+GWgQ43AxQryMZpekksQPGXZcFNuI0o2US3/Ib8nxBnECgYEA4j35MIA01FWCbSQE
+aEciEKdfw2lsRDkQ/ZMmLiO30xXrnnFDGuE1USm2TjePJcjQhN4yESbUfxTN4AKe
+Xh1GkjqDsM8KHsu13iy2pF4rhVyHt6W+pgXRShgLpcuYnJ8jI8djwx5eubOWLFK9
+4XGbdJhZMMsBBiUb6YTAgvKNU4MCgYEAyRp8L9DGSawwkat6FdpqHanAXwUi0hOl
+v+t0i75EWXZDHaXNMYomn3TPrkasfrqrahZ6YjEsKQBg4t2+qpZkvdcfQgzxDvtg
+D/uOt9U9Kz2ceHPl1Y3ZCkgLfAj6TL1c7cfu0eklSqV/DEuJG59lQyXcor2MB/Vq
+Ejgo+5JyI48CgYEA1PKsOECUeT+7Mety0owRvkcsVgxGwbhNC8CTcV5hSigZzNqi
+5QwRWUG/vMOC03e+/TD/QzGfVbZJSY5tbfx0TnMRPTzDM9Vea67+gpu4ryA3Bl7V
+ogNbyTf0zqtiDBmlw6mLdz6Avp4QvctrumVqg0ZavRh28EfBi/1ODnMrHu0CgYBX
+aerHQgGe7njiKN5Vd24e3LWg1/OtyxqGFMvBHoBJPs2nqnVJ7lohf73ybAf4wh1W
+bNTfr64ZWG/EzUxejCbYGhUdOdDiiUPVTqxXnhoLnKlR9lbV/+VywaQ0UxaxmrI1
+LW3S0nwCOXPDHWZImn2CtYd1Od0PbI6hwsWVrK9uYwKBgQDSyZXS8B3IFQFwCTr7
+2k8Nw5a2sX7yqLGsxRmxq/d+UiD1dlIOQQ122SVu55H9UFCe/ZtG9REZsZTH08df
+RNNhZ0oUB4r2h7X+fK1ker3ncT7e6lP3DC3RY4n+090P0g9Nkt+yJhbJRjekrpSk
+LKykCs20EIO3aQOlHHbdtZoEWA==
 -----END PRIVATE KEY-----

admin.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
+ggU8Tm6a0QB0di+VQwbJbg61T33S
 -----END CERTIFICATE-----

data.sql

@@ -35,20 +35,6 @@ CREATE TABLE IF NOT EXISTS user_profile (
     update_at timestamp
 ); 
 
-CREATE TABLE IF NOT EXISTS profile_specifications(
-    profil_id int, 
-    field_specification_id int, 
-
-    CONSTRAINT profile_specifications_profil_id FOREIGN KEY (profil_id)
-        REFERENCES user_profile(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,
-
-    CONSTRAINT field_specifications_field_specification_id FOREIGN KEY (field_specification_id)
-        REFERENCES field_specifications(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 field_specifications (
     id serial PRIMARY KEY,
     std_field_id int,
@@ -68,6 +54,20 @@ CREATE TABLE IF NOT EXISTS field_specifications (
     update_at timestamp
 );
 
+CREATE TABLE IF NOT EXISTS profile_specifications(
+    profil_id int, 
+    field_specification_id int, 
+
+    CONSTRAINT profile_specifications_profil_id FOREIGN KEY (profil_id)
+        REFERENCES user_profile(id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION,
+
+    CONSTRAINT field_specifications_field_specification_id FOREIGN KEY (field_specification_id)
+        REFERENCES field_specifications(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 provider_sources (
     id serial PRIMARY KEY,
     user_id integer NOT NULL,

doc/build.sh

@@ -7,4 +7,4 @@ while [ "$1" != "" ]; do
     shift
 done
 
-docker build --no-cache --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.doc ./doc/.
+docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_KEY_PASSPHRASE="$SSH_KEY_PASSPHRASE" --tag in-sylva.doc ./doc/.

docker-compose.yml

@@ -168,8 +168,8 @@ services:
     volumes:
       - ./kibana.yml:/usr/share/kibana/config/kibana.yml
     environment:
-      ELASTICSEARCH_URL: https://odfe-node1:9200
-      ELASTICSEARCH_HOSTS: https://odfe-node1:9200
+      ELASTICSEARCH_URL: http://odfe-node1:9200
+      ELASTICSEARCH_HOSTS: http://odfe-node1:9200
     networks:
       - app-network
     restart: unless-stopped
@@ -213,21 +213,29 @@ services:
       IN_SYLVA_GATEKEEPER_HOST: http://in-sylva.gatekeeper 
       IN_SYLVA_GATEKEEPER_PORT: 4000 
 
-      MONGO_HOST: in-sylva.mongodb 
-      MONGO_USERNAME: inra_paca_mongoc 
+      MONGO_HOST: mongo 
+      MONGO_USERNAME: in_sylva_mongoc 
       MONGO_PASSWORD: v2kGBDUaGjXK2VuPyf5R64VS 
-      MONGO_DB_NAME: inra_mongodb 
+      MONGO_DB_NAME: insylva 
       MONGO_PORT: 27017 
 
-      DB_HOST: in-sylva.postgres 
+      DB_HOST: postgres 
       DB_USER: insylva_admin_pg 
       DB_PASSWORD: v2kGBDUaGjXK2VuPyf5R64VS 
       DB_DATABASE: insylva 
       DB_PORT: 5432 
 
+      ODFE_NODE1_HOST: odfe-node1
+      ODFE_NODE1_PORT: 9200
+      ODFE_NODE1_USERNAME: admin
+      ODFE_NODE1_PASSWORD: InSylva146544
+
       PORT: 5000
     ports:
       - 5000:5000
+    links: 
+      - mongo
+      - postgres
     networks:
       - app-network
     restart: unless-stopped

elasticsearch.yml

@@ -1,8 +1,9 @@
+# opendistro_security.disabled: true
 opendistro_security.ssl.transport.pemcert_filepath: node.pem
 opendistro_security.ssl.transport.pemkey_filepath: node-key.pem
 opendistro_security.ssl.transport.pemtrustedcas_filepath: root-ca.pem
 opendistro_security.ssl.transport.enforce_hostname_verification: false
-opendistro_security.ssl.http.enabled: true
+opendistro_security.ssl.http.enabled: false
 opendistro_security.ssl.http.pemcert_filepath: node.pem
 opendistro_security.ssl.http.pemkey_filepath: node-key.pem
 opendistro_security.ssl.http.pemtrustedcas_filepath: root-ca.pem

generate-certificates.sh

@@ -4,15 +4,17 @@
 # openssl genrsa -out root-ca-key.pem 2048
 # openssl req -new -x509 -sha256 -key root-ca-key.pem -out root-ca.pem
 # Admin cert
+# CN=admin,OU=INSYLVA,O=INRA,L=AVIGNON,ST=PACA,C=FR
 openssl genrsa -out admin-key-temp.pem 2048
 openssl pkcs8 -inform PEM -outform PEM -in admin-key-temp.pem -topk8 -nocrypt -v1 PBE-SHA1-3DES -out admin-key.pem
 openssl req -new -key admin-key.pem -out admin.csr
 openssl x509 -req -in admin.csr -CA root-ca.pem -CAkey root-ca-key.pem -CAcreateserial -sha256 -out admin.pem
 # Node cert
-# openssl genrsa -out node-key-temp.pem 2048
-# openssl pkcs8 -inform PEM -outform PEM -in node-key-temp.pem -topk8 -nocrypt -v1 PBE-SHA1-3DES -out node-key.pem
-# openssl req -new -key node-key.pem -out node.csr
-# openssl x509 -req -in node.csr -CA root-ca.pem -CAkey root-ca-key.pem -CAcreateserial -sha256 -out node.pem
+# CN=insylva.fr,OU=INSYLVA,O=INRA,L=AVIGNON,ST=PACA,C=FR
+openssl genrsa -out node-key-temp.pem 2048
+openssl pkcs8 -inform PEM -outform PEM -in node-key-temp.pem -topk8 -nocrypt -v1 PBE-SHA1-3DES -out node-key.pem
+openssl req -new -key node-key.pem -out node.csr
+openssl x509 -req -in node.csr -CA root-ca.pem -CAkey root-ca-key.pem -CAcreateserial -sha256 -out node.pem
 # Cleanup
 rm admin-key-temp.pem
 rm admin.csr

keycloak/build.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker build --no-cache --tag in-sylva.keycloak ./keycloak/.
+docker build --tag in-sylva.keycloak ./keycloak/.
 

kibana.yml

@@ -9,7 +9,7 @@ opendistro_security.multitenancy.enable_filter: true
 opendistro_security.multitenancy.tenants.enable_global: true
 opendistro_security.multitenancy.tenants.enable_private: true
 
-elasticsearch.hosts: ["https://localhost:9200"]
+elasticsearch.hosts: ["http://localhost:9200"]
 elasticsearch.ssl.verificationMode: none
 elasticsearch.username: "kibanaserver"
 elasticsearch.password: "InSylva146544"

node-key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQClQGU0dI638sj+
-s334W51H/aQuUwFh48o/+vA4PuYsYPus1l8WjErT1/0chGYtLARtZdLPlVdj3FgP
-os8YVYrTjY7x8gb2C81+HwBBwz3pmESaHac0gMbRKgNwmCfL8eYEXmPcdmvNfCv2
-DJRUk5/2qsNxLQpVybzgxnz+X3uuiECxQuP1yGNOpvP1xB6HtVhwmG5neYU4l0zZ
-FOu8Kv1PkuGfIM9kvKdC6povcOCjZj5uNVeuYrZXhr0/e3nYLV/2bwy2mlvOY6xR
-ARHmQHB5IB6hk5M7bbhWa71nfVYbXoLIHdXBLvwaxpFLj9lW5AXV3oLjW2YvDdee
-q7eoikKnAgMBAAECggEAH1HOHJv+tKRiLcvNEzYh4BQVeuYme+wVV/zybGaXb0/O
-Q1q52OcsA2yLP01kpCkUibtjsg4m6vlHA2ejAoSr9B5/OiHZ6eYgw0eS3+PmJxDB
-58e4+f1yMRBaaIud90xYgPl2ycDz+5UOK+sEbecwySpiMmAL9mhu0Nctt3RXV6OT
-UCxcGtHHUJKGEUAqbryRJT1I8Iszzni+CnnbmzKXQRRz3s42bno3VaqoF687b4mJ
-aGLH2OV7CEs0NVpj5Tlm2x7603Cj6Pb5Qp6EXOxlbN+glAv7zcfpHtvA+CmrEjaY
-1z3RuNyi/TCsvD9d2rKpYtiuY+9EKldOEo6M2E2MiQKBgQDOO4+ES4/MU1XMr1kk
-9bn5r1SkztdgiyXEdbB5n6vMmtfFPxS/Enz2egVIWUcvuGviuaWm9+bYy7x0zrBm
-JdAmXWUcmtvs4hPbZ2ZJsQmgW+ngdNoAfy+KB3yb3nUwfVgfpQn1Oe1WAWpMmwQw
-TYIGXCDCLr4n7E1l4x/S3CW4uwKBgQDNISS+tzqA9nTRC+FDgFGlqIDFAPBfYdq3
-ij6qWwY4Jy+KCXt6WMoc6JgzeHuILRiixWVfZDNxQ7DMYEBiqZ6JiMKWGEBKkyIz
-cBybP3EXcM5WVi5f5QlWleXW3bTLU4FOQxzs+8eJP47jfkZoYYWxdIvJ4o/DFNKI
-E7RNW3YFBQKBgQCOfaaGcLLVKQsSFmFQYRtzAYpJKMS05s9cczhQgFryTlYg6ZnK
-/toqblpyB4Vg2lpoV36143izd+kpB5nnqd6sc0EmR3UGsZmosUOCTPjqvDbWp8Xs
-K/RLuSqGg2iS7TfS/XPo5HIwR2ALt9toCFV7UXIs2KD38pPzfr8BMKw7ewKBgQC6
-nAA1j7KlR5AV7NzM75tXPOeIUMZbv0Wd2yIPECekReG1jdLLBqM3kVGE4YJf68aR
-rUn/ccRqsc3Q328zUmNrcwKyUPWL4jYm3ULo6NoVHQZY/KXLjyzjnBIvWhnzLtBf
-Ria2YIaxkSSISIP8yVs6iG/zBS0Lp5GvQV2xUhcXkQKBgAPDOQIiW5SyA1/SLy7I
-EVF2BIdvkq0JqC9x0qNKBn3245GYImWlnHKVNciZ/mO8gGi7q++DGcijWVa2ai6h
-YfnYiYhl8y2BAYigMwSvReOAXfMXkF9V1fNDd8VHAu1Sb+4xKyrN19A8/uqW8beU
-rlgswcNB2SpNe1hOHdOm55aH
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDixbR8hMlij9Oi
+bKL2HFgnPyP1/wnLgCbLiDKYFGtsVdiXJ8IWnI1f7YLl1HbXW8XwK0qaGDBKUu2r
+pdvz5I6gILTm2cw2ArZDjhgfFfTEx9+k8LEtjkrc8kSfFUdqj8VnkNmlwnC1/Bs+
+gLJmDt3lQSQCX3aIOIvswYEpYlCJThJ63/vpE+oRa/ip8sUSDx1YySNsNJ+C1ShW
+UBGr33hgQdupNpRV5PQojSD6lGeIAo/TpuLFixeXI5TFSmB/+ZU8lg+oje0MTmev
+Mx8St34tamnFHdzhEayFlSRCxkU6SeRcOM2SGMw2PK9rdlwedlB8zx42mg8DCh0c
+ZawOGD59AgMBAAECggEASXz0Tl3hvTUKyloWPVdWIfHOP4vUqsPuzopmiu4jGcqA
+FAvoU9eL4QhhIQXHNWciMAB3fpRUIeHZ74QiUVlB9xZiSWVPTjl2w1Gq83f0CEkV
+aqgtYqv4Cr3gCwWkTR4mRLemMJdgWzlFwu2F4pjyw7ZmavZwvRhGEAVtS/H2U2gD
+Jl16amADdCSCtUrPUZGkLerseGIvffQkgzikjhgPBKy26LN83h34pLXIdSruUtCh
+vy9+Ekfpyof7gOFf44GbHwElXkKDbrMsw0X7dmuuVJTAp0q0NfrbdESNtoFDQeYh
+3Q58RP5TBR5268n4HcRHJ49iaEVaHQvMJ+qxn5nnwQKBgQD+J1XFv+K5vaFx6x94
+/UUsG1s4GKNDTQUE8sky+mz+QKPJFTBWKDA7hLWoiTl+R1DELM4RUN6TcDxmRXkc
+CMH0h1TH7CTFt2sMveDs4tQTWAZ+ZuaUoHkXN9mpWb35HEr4XHbR99Qp8qN51kjg
+KqnaXvHPESbq+QVyahaf/qvFSQKBgQDka3J66v0wwmXXmukhpaP/83QcOasPf2sY
+3IJ1/AFHIHbnC/SgFbVpROZ5u6/GyB7HoMHBjCGCmozyK90egm74t86kugaIWcAj
+7GTlD8NYUM8QOmx4SnF2k6s1J2MpiF3QEWaAifbQXWA32IYhJEZKb3ZxHkTAvA4N
+5z02gqoTlQKBgGAN+8PWRtlOSzMj2uw+RKNr32jvHt0zwb7iB5rFvOXHBl/cKz2U
+yM3l1UZSPrF0QJk0Gdm/h6+PjrRUc3Zd9Pf3IdrBbBBxxvq01MqS2/ZHoYSqXWE0
+2S8mQ5RWv47j243MXHf0w3HrK0/D5h0a4sEOezN4Vw4deaqJX+2uMbtJAoGAGpff
+1iuxmpGnZbilV8N/GndvlzGnlsBQ6a4SikXyqCNBdJjRvCmK21yoMJgHWO9HlhpD
+NJNp+1ie/DrbHYg1/0L3DfqSdCFu2z/UZ060gX22/b6vjjmsiA+dKS0SwG0d7vF3
+q5NkZtHYN+g/hXBBtrzPX1AU1ROP11KKr+P6hRkCgYEAs45eHTcq6F0PGdd/BFey
+yUszqixiXCPhxBoTj0i+OTcFhdjkJ18Bc+nkMccEI/D3uffw61Klx/kRdg4e2hmx
+lDKEPuxZDcSKk3+7DFUx/IVurS5MU48/maaA4f8VHrrwVGuTQmEc2ZhwnOj6fYK6
+NM8ucT9t4GT/HvIWHbXfNAs=
 -----END PRIVATE KEY-----

node.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
+vLMuh2XpVW0EGLKSCuO2xWqqR3qthbdu5q4=
 -----END CERTIFICATE-----

portal/build.sh

@@ -7,4 +7,5 @@ while [ "$1" != "" ]; do
     shift
 done
 
-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 --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 .

postgresql/build.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build --no-cache -t in-sylva.postgres ./postgresql/.
+docker build -t in-sylva.postgres ./postgresql/.