diff --git a/CHANGELOG.md b/CHANGELOG.md index a2a9e2dcb..1703ab068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ All notable changes to this project will be documented in this file. - Wrong image tag in env file - `EDC_IDS_ENDPOINT` was not set correctly on image build +### Changed +- Reverted docker-compose.yaml to run only one connector + ## [3.0.0] - 2023-04-04 ### Major Changes diff --git a/docker-compose.yaml b/docker-compose.yaml index dfd5c08cc..a2cbffae0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -65,73 +65,6 @@ services: volumes: - 'postgresql:/bitnami/postgresql' - edc-ui2: - image: ${RELEASE_EDC_UI_IMAGE} - ports: - - '22000:80' - environment: - - EDC_UI_ACTIVE_PROFILE=${EDC_UI_ACTIVE_PROFILE} - - EDC_UI_CONFIG_URL=edc-ui-config - - EDC_UI_DATA_MANAGEMENT_API_URL=http://localhost:22002/api/v1/management - - EDC_UI_DATA_MANAGEMENT_API_KEY=ApiKeyDefaultValue - - EDC_UI_CATALOG_URLS=http://edc:22003/api/v1/ids/data - edc2: - image: ${RELEASE_EDC_IMAGE} - depends_on: - - postgresql2 - environment: - MY_EDC_NAME_KEBAB_CASE: "example-connector" - MY_EDC_TITLE: "EDC Connector" - MY_EDC_DESCRIPTION: "Community Edition EDC Connector by sovity" - MY_EDC_CURATOR_URL: "https://example.com" - MY_EDC_CURATOR_NAME: "Example GmbH" - MY_EDC_MAINTAINER_URL: "https://sovity.de" - MY_EDC_MAINTAINER_NAME: "sovity GmbH" - - # Data Management API Key - EDC_API_AUTH_KEY: ApiKeyDefaultValue - - # Data Space Configuration - EDC_OAUTH_CLIENT_ID: ${EDC_OAUTH_CLIENT_ID} - EDC_OAUTH_TOKEN_URL: https://daps.test.mobility-dataspace.eu/token - EDC_OAUTH_PROVIDER_JWKS_URL: https://daps.test.mobility-dataspace.eu/jwks.json - EDC_BROKER_BASE_URL: https://broker.test.mobility-dataspace.eu - EDC_CLEARINGHOUSE_LOG_URL: https://clearing.test.mobility-dataspace.eu/messages/log - EDC_KEYSTORE: /secrets/keystore.jks - EDC_KEYSTORE_PASSWORD: password - EDC_OAUTH_CERTIFICATE_ALIAS: 1 - EDC_OAUTH_PRIVATE_KEY_ALIAS: 1 - - MY_EDC_PROTOCOL: "http://" - MY_EDC_FQDN: "edc2" - MY_EDC_IDS_BASE_URL: "http://edc2:11003" - - MY_EDC_JDBC_URL: jdbc:postgresql://postgresql2:5432/edc - MY_EDC_JDBC_USER: edc - MY_EDC_JDBC_PASSWORD: edc - EDC_WEB_REST_CORS_ENABLED: 'true' - EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key' - EDC_WEB_REST_CORS_ORIGINS: '*' - ports: - - '22001:11001' - - '22002:11002' - - '22003:11003' - - '22004:11004' - - '22005:5005' - volumes: - - ./docs/getting-started/secrets:/secrets - postgresql2: - image: docker.io/bitnami/postgresql:11 - restart: always - environment: - POSTGRESQL_USERNAME: edc - POSTGRESQL_PASSWORD: edc - POSTGRESQL_DATABASE: edc - volumes: - - 'postgresql2:/bitnami/postgresql' - volumes: postgresql: driver: local - postgresql2: - driver: local