You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2022/02/03 16:48:23 UTC
[sling-org-apache-sling-starter] 06/07: SLING-9638 - Update Starter Docker image to be based on the feature model
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 4657556cbbf431da225fa80ba66dd58e5243ca2f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Nov 26 16:57:56 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Make MongoDB host and port configurable using the Felix ConfigAdmin interpolation plugin.
---
pom.xml | 6 +++---
src/main/features/boot.json | 7 ++++++-
src/main/features/oak/persistence/oak_persistence_mongods.json | 5 +----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f50ffe..e6ef407 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,10 +322,10 @@
<frameworkProperties>
<org.osgi.service.http.port>${http.port.mongo}</org.osgi.service.http.port>
</frameworkProperties>
- <variables>
- <mongo.port>${mongo.port}</mongo.port>
- </variables>
</launcherArguments>
+ <environmentVariables>
+ <MONGODB_PORT>${mongo.port}</MONGODB_PORT>
+ </environmentVariables>
<startTimeoutSeconds>${it.startTimeoutSeconds}</startTimeoutSeconds>
</launch>
</launches>
diff --git a/src/main/features/boot.json b/src/main/features/boot.json
index 425ff85..9e47afa 100644
--- a/src/main/features/boot.json
+++ b/src/main/features/boot.json
@@ -17,6 +17,10 @@
"start-order":"1"
},
{
+ "id":"org.apache.felix:org.apache.felix.configadmin.plugin.interpolation:1.1.2",
+ "start-order":"1"
+ },
+ {
"id":"org.apache.felix:org.apache.felix.converter:1.0.18",
"start-order":"1"
},
@@ -150,6 +154,7 @@
"sling.fileinstall.dir.autocreate":"true",
"sling.jre-jpms":"{dollar}{felix.jpms.java.base}{dollar}{felix.jpms.java.compiler}{dollar}{felix.jpms.java.datatransfer}{dollar}{felix.jpms.java.desktop}{dollar}{felix.jpms.java.instrument}{dollar}{felix.jpms.java.logging}{dollar}{felix.jpms.java.management}{dollar}{felix.jpms.java.management.rmi}{dollar}{felix.jpms.java.naming}{dollar}{felix.jpms.java.net.http}{dollar}{felix.jpms.java.prefs}{dollar}{felix.jpms.java.rmi}{dollar}{felix.jpms.java.scripting}{dollar}{felix.jpms.java. [...]
"sling.jpms.java.xml":"{dollar}{sling.jre.java.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"",
- "sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dolla [...]
+ "sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dolla [...]
+ "felix.cm.config.plugins": "org.apache.felix.configadmin.plugin.interpolation"
}
}
diff --git a/src/main/features/oak/persistence/oak_persistence_mongods.json b/src/main/features/oak/persistence/oak_persistence_mongods.json
index 965f4c4..a3a4485 100644
--- a/src/main/features/oak/persistence/oak_persistence_mongods.json
+++ b/src/main/features/oak/persistence/oak_persistence_mongods.json
@@ -1,7 +1,4 @@
{
- "variables": {
- "mongo.port":"27017"
- },
"bundles":[
{
"id":"com.h2database:h2-mvstore:1.4.200",
@@ -15,7 +12,7 @@
"configurations":{
"org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService":{
"db":"sling",
- "mongouri":"mongodb://localhost:${mongo.port}"
+ "mongouri":"mongodb://$[env:MONGODB_HOST;default=localhost]:$[env:MONGODB_PORT;type=Integer;default=27107]"
}
}
}