Commit b84a47282289241cf33935e4f3fab7e17f98c61d
Exists in
master
and in
2 other branches
Merge branch 'master' of interlab.csd.auth.gr:anaskos/curex-knowledge-extraction-analytics-kea
Showing 3 changed files
api/.env.example
View file @
b84a472
| ... | ... | @@ -55,11 +55,11 @@ |
| 55 | 55 | KEYCLOAK_CLIENT_ID=KEA |
| 56 | 56 | |
| 57 | 57 | # url must be without trailing / |
| 58 | -KIBANA_URL=$APP_URL | |
| 59 | -GRAFANA_URL=$APP_URL | |
| 58 | +KIBANA_URL=https://kea-kibana.vlahavas.com | |
| 59 | +GRAFANA_URL=https://kea-grafana.vlahavas.com | |
| 60 | 60 | # set ports null to ignore |
| 61 | -KIBANA_PORT=5611 | |
| 62 | -GRAFANA_PORT=3001 | |
| 61 | +KIBANA_PORT=null #5611 | |
| 62 | +GRAFANA_PORT=null #3001 | |
| 63 | 63 | |
| 64 | 64 | REMOTESYSLOG=192.168.50.32 |
| 65 | 65 |
api/Dockerfile
View file @
b84a472
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | # Install dependencies |
| 10 | 10 | RUN apt-get update && apt-get install -y \ |
| 11 | 11 | build-essential \ |
| 12 | - postgresql-server-dev-11 \ | |
| 12 | + libpq-dev \ | |
| 13 | 13 | libpng-dev \ |
| 14 | 14 | libjpeg62-turbo-dev \ |
| 15 | 15 | libfreetype6-dev \ |
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | rm -rf /var/lib/apt/lists/* |
| 25 | 25 | |
| 26 | 26 | # Install extensions |
| 27 | -RUN docker-php-ext-install pdo pdo_pgsql exif pcntl && \ | |
| 27 | +RUN docker-php-ext-install pdo pdo_pgsql pgsql exif pcntl && \ | |
| 28 | 28 | docker-php-ext-configure gd --with-jpeg=/usr/include/ \ |
| 29 | 29 | --with-freetype=/usr/include/ && \ |
| 30 | 30 | docker-php-ext-install gd |
docker-compose-jfrog.yml
View file @
b84a472
| ... | ... | @@ -116,6 +116,15 @@ |
| 116 | 116 | - "KEYCLOAK_APPEND_DECODED_TOKEN=${KEYCLOAK_APPEND_DECODED_TOKEN}" |
| 117 | 117 | - "KEYCLOAK_ALLOWED_RESOURCES=${KEYCLOAK_ALLOWED_RESOURCES}" |
| 118 | 118 | - "AUTH_ENABLED=${AUTH_ENABLED}" |
| 119 | + - "KEYCLOAK_REALM=${KEYCLOAK_REALM}" | |
| 120 | + - "KEYCLOAK_URL=${KEYCLOAK_URL}" | |
| 121 | + - "KEYCLOAK_CLIENT_ID=${KEYCLOAK_CLIENT_ID}" | |
| 122 | + - "KIBANA_URL=${KIBANA_URL}" | |
| 123 | + - "GRAFANA_URL=${GRAFANA_URL}" | |
| 124 | + - "OD_GRAFANA_PARAMS=${OD_GRAFANA_PARAMS}" | |
| 125 | + - "MLTD_GRAFANA_PARAMS=${MLTD_GRAFANA_PARAMS}" | |
| 126 | + - "CEPTD_KIBANA_PARAMS=${CEPTD_KIBANA_PARAMS}" | |
| 127 | + - "REMOTESYSLOG=${REMOTESYSLOG}" | |
| 119 | 128 | |
| 120 | 129 | #OD |
| 121 | 130 | od: |