From 3c453670d2513594abafe59af4d44ad88ac84360 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sat, 28 Sep 2024 11:31:37 +0200 Subject: [PATCH] feat(couchdb): Enable use of latest CouchDB with nouveau Signed-off-by: Helio Chissini de Castro --- config/couchdb/nouveau.ini | 3 +++ docker-compose.yml | 11 ++++++++++- sw360.code-workspace | 15 ++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 config/couchdb/nouveau.ini diff --git a/config/couchdb/nouveau.ini b/config/couchdb/nouveau.ini new file mode 100644 index 0000000000..818f22f5a2 --- /dev/null +++ b/config/couchdb/nouveau.ini @@ -0,0 +1,3 @@ +[nouveau] +enable = true +url = http://couchdb-nouveau:5987 diff --git a/docker-compose.yml b/docker-compose.yml index 26878eb444..afbc775c88 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,17 +22,26 @@ services: - etc:/etc/sw360 - ./config/sw360:/app/sw360/config + couchdb-nouveau: + image: ghcr.io/eclipse-sw360/couchdb:3.4.1-nouveau + ports: + - "5987:5987" + - "5988:5988" + couchdb: - image: couchdb:3 + image: ghcr.io/eclipse-sw360/couchdb:3.4.1 restart: unless-stopped environment: - COUCHDB_CREATE_DATABASE=yes ports: - "5984:5984" + depends_on: + - couchdb-nouveau volumes: - couchdb:/opt/couchdb/data - ./config/couchdb/sw360_setup.ini:/opt/couchdb/etc/local.d/sw360_setup.ini - ./config/couchdb/sw360_log.ini:/opt/couchdb/etc/local.d/sw360_log.ini + - ./config/couchdb/nouveau.ini:/opt/couchdb/etc/local.d/nouveau.ini healthcheck: test: ["CMD-SHELL", "curl --fail -s http://couchdb:5984/_up"] interval: 30s diff --git a/sw360.code-workspace b/sw360.code-workspace index da43174020..a8b0f99603 100644 --- a/sw360.code-workspace +++ b/sw360.code-workspace @@ -11,6 +11,19 @@ "java.configuration.updateBuildConfiguration": "automatic", "java.format.settings.url": ".vscode/java-formatter.xml", "java.compile.nullAnalysis.mode": "automatic", - "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable" + "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable", + "workbench.colorCustomizations": { + "commandCenter.border": "#15202b99", + "sash.hoverBorder": "#65c89b", + "statusBar.background": "#42b883", + "statusBar.foreground": "#15202b", + "statusBarItem.hoverBackground": "#359268", + "statusBarItem.remoteBackground": "#42b883", + "statusBarItem.remoteForeground": "#15202b", + "titleBar.activeBackground": "#42b883", + "titleBar.activeForeground": "#15202b", + "titleBar.inactiveBackground": "#42b88399", + "titleBar.inactiveForeground": "#15202b99" + } } }