diff --git a/.drone.yml b/.drone.yml index 04a89ada1a9e..68500b3d8f91 100644 --- a/.drone.yml +++ b/.drone.yml @@ -98,13 +98,13 @@ services: - name: redis image: redis:7.0.4 - name: elastic - image: docker.elastic.co/elasticsearch/elasticsearch:8.3.3 + image: docker.elastic.co/elasticsearch/elasticsearch:8.4.1 environment: discovery.type: single-node xpack.security.enabled: false ES_JAVA_OPTS: -Xms2g -Xmx2g - name: minio - image: minio/minio:RELEASE.2022-08-13T21-54-44Z + image: minio/minio:RELEASE.2022-08-26T19-53-15Z environment: MINIO_ROOT_USER: ChangeMe MINIO_ROOT_PASSWORD: ChangeMe diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectContent.js b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectContent.js index 73f188bc090e..f6d05285ea94 100644 --- a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectContent.js +++ b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectContent.js @@ -30,10 +30,6 @@ import { } from '../../../../utils/ListParameters'; import Loader from '../../../../components/Loader'; import StixDomainObjectContentBar from './StixDomainObjectContentBar'; -import RobotoRegular from '../../../../static/fonts/Roboto-Regular.ttf'; -import RobotoBold from '../../../../static/fonts/Roboto-Bold.ttf'; -import RobotoItalic from '../../../../static/fonts/Roboto-Italic.ttf'; -import RobotoBoldItalic from '../../../../static/fonts/Roboto-BoldItalic.ttf'; pdfjs.GlobalWorkerOptions.workerSrc = `${APP_BASE_PATH}/static/ext/pdf.worker.min.js`; @@ -349,12 +345,14 @@ class StixDomainObjectContentComponent extends Component { content: ret.content, images, }; + const { protocol, hostname, port } = window.location; + const url = `${protocol}//${hostname}:${port || ''}`; const fonts = { Roboto: { - normal: `${APP_BASE_PATH}${RobotoRegular}`, - bold: `${APP_BASE_PATH}${RobotoBold}`, - italics: `${APP_BASE_PATH}${RobotoItalic}`, - bolditalics: `${APP_BASE_PATH}${RobotoBoldItalic}`, + normal: `${url}${APP_BASE_PATH}/static/ext/Roboto-Regular.ttf`, + bold: `${url}${APP_BASE_PATH}/static/ext/Roboto-Bold.ttf`, + italics: `${url}${APP_BASE_PATH}/static/ext/Roboto-Italic.ttf`, + bolditalics: `${url}${APP_BASE_PATH}/static/ext/Roboto-BoldItalic.ttf`, }, }; const fragment = currentFileId.split('/'); diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-Black.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-Black.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-Black.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-Black.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-BlackItalic.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-BlackItalic.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-BlackItalic.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-BlackItalic.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-Bold.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-Bold.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-Bold.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-Bold.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-BoldItalic.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-BoldItalic.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-BoldItalic.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-BoldItalic.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-Italic.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-Italic.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-Italic.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-Italic.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-Light.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-Light.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-Light.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-Light.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-LightItalic.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-LightItalic.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-LightItalic.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-LightItalic.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-Medium.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-Medium.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-Medium.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-Medium.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-MediumItalic.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-MediumItalic.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-MediumItalic.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-MediumItalic.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-Regular.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-Regular.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-Regular.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-Regular.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-Thin.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-Thin.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-Thin.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-Thin.ttf diff --git a/opencti-platform/opencti-front/src/static/fonts/Roboto-ThinItalic.ttf b/opencti-platform/opencti-front/src/static/ext/Roboto-ThinItalic.ttf similarity index 100% rename from opencti-platform/opencti-front/src/static/fonts/Roboto-ThinItalic.ttf rename to opencti-platform/opencti-front/src/static/ext/Roboto-ThinItalic.ttf