#26 Add volume

README.md

@@ -9,9 +9,8 @@ nbscloud requires `java>=18`
 ### `deploy.sh`
 
 ## Config
-To adjust the default configuration create the file `~/.config/nbscloud/application.properties`. It allows overwriting
-properties from every configuration file of nbscloud. To get a full list of existing properties look at the following
-files:
+To adjust the default configuration adjust the key-value pairs in the `.env` file. Keep in mind that not all properties
+are mentioned in there. To see all available properties click through the available properties files below:
 |File|Description|
 |----|-----------|
 |[application.properties](./web-container/src/main/resources/config/application.properties)|Main config file providing general app properties|

bookmarks/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nbs-cloud-aggregator</artifactId>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>

build/Dockerfile

@@ -1,11 +1,10 @@
-FROM eclipse-temurin:25-jre-alpine
+FROM eclipse-temurin:25-jre-jammy
+
+RUN groupadd -r spring && useradd -r -g spring spring
 
-# Create a non-root user for security
-RUN addgroup -S spring && adduser -S spring -G spring
 USER spring:spring
 
 ARG JAR_FILE
-
 COPY ${JAR_FILE} app.jar
 
 EXPOSE 8082

build/Jenkinsfile

@@ -62,19 +62,20 @@ pipeline {
         stage('Docker Build & Push') {
             steps {
                 script {
-                    sh "pwd"
-                    sh "ls -R"
                     def jarPath = sh(script: "ls target/checkout/web-container/target/*.jar | head -n 1", returnStdout: true).trim()
                     def releaseVer = sh(script: "pkgx mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f target/checkout/web-container/pom.xml", returnStdout: true).trim()
+                    def registry = env.DOCKER_REGISTRY.toLowerCase()
+                    def registryHost = registry.replace("https://", "").replace("http://", "").replaceAll("/\$", "").toLowerCase()
+                    def imageTag = "${registryHost}/nbscloud:${releaseVer}".toLowerCase()
 
-                    docker.withRegistry("${env.DOCKER_REGISTRY}", '') {
-                        def customImage = docker.build("${env.DOCKER_REGISTRY}/my-app:${releaseVer}",
-                            "-f build/Dockerfile --build-arg JAR_FILE=${jarPath} .")
+                    docker.withRegistry(registry, '') {
+                        def customImage = docker.build(imageTag, "-f build/Dockerfile --build-arg JAR_FILE=${jarPath} .")
 
                         if (params.DRY_RUN) {
                             echo "DRY_RUN - do not push image to registry"
                         }
                         else {
+                            customImage.push("${releaseVer}")
                             customImage.push("latest")
                         }
                     }

dashboard/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nbs-cloud-aggregator</artifactId>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>

examples/.env

@@ -0,0 +1,36 @@
+# nbscloud will look for and store files in this directory - mind the permissions
+NBSCLOUD_FILES_BASEDIR=/nbscloud
+
+# Whether dark mode should be used by default
+NBSCLOUD_WEBCONTAINER_SHARED_DARKMODE=true
+
+# Knob to configure whether hidden files are shown
+NBSCLOUD_FILES_FILTERHIDDEN=true
+
+# Whether to use the trash bin or directly removefiles
+NBSCLOUD_FILES_USETRASHBIN=true
+
+# Knob to configure the name of the trash bin directory
+NBSCLOUD_FILES_TRASHBINNAME=nbs.internal/nbs.trashbin
+
+# Knob to configure the amount of character after which the filename
+# will be truncated
+NBSCLOUD_FILES_TRUNCATEFILENAMECHARS=130
+
+# Knob to configure the name of the shares directory
+NBSCLOUD_FILES_SHARESNAME=nbs.internal/nbs.shares
+
+# Knob to configure the name of the app directory
+NBSCLOUD_FILES_APPDIR=nbs.internal/apps
+
+# The address the embedded tomcat listens on - you probably want to keep this on localhost
+SERVER_ADDRESS=localhost
+
+SERVER_SERVLET_CONTEXTPATH=/nbscloud
+SERVER_PORT=8082
+
+# No upload sze restriction
+SPRING_SERVLET_MULTIPART_MAXFILESIZE=-1
+SPRING_SERVLET_MULTIPART_MAXREQUESTSIZE=-1
+
+LOGGING_LEVEL_DE_NBSCLOUD=DEBUG

examples/docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  app:
+    image: your-registry.com/nbscloud:latest
+    ports:
+      - "8082:8082"
+    restart: always
+    env_file:
+      - .env
+    volumes:
+      - nbscloud_vol:/nbscloud
+
+volumes:
+  nbscloud_vol:
+    name: nbscloud_vol

files-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
         <artifactId>nbs-cloud-aggregator</artifactId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>

files/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
         <artifactId>nbs-cloud-aggregator</artifactId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>

notes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nbs-cloud-aggregator</artifactId>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>

pastebin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nbs-cloud-aggregator</artifactId>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>
     <artifactId>nbs-cloud-aggregator</artifactId>
-    <version>27-SNAPSHOT</version>
+    <version>35-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>The umbrella for all No BullShit cloud projects</description>
     <name>nbs-cloud-aggregator</name>

todo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nbs-cloud-aggregator</artifactId>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>

web-container-config/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nbs-cloud-aggregator</artifactId>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <artifactId>web-container-config</artifactId>

web-container-registry/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nbs-cloud-aggregator</artifactId>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <artifactId>web-container-registry</artifactId>

web-container/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.77zzcx7.nbs-cloud</groupId>
         <artifactId>nbs-cloud-aggregator</artifactId>
-        <version>27-SNAPSHOT</version>
+        <version>35-SNAPSHOT</version>
     </parent>
 
     <groupId>de.77zzcx7.nbs-cloud</groupId>