better default paths for docker images

benkuly · May 22, 2020 · d9ee2aa · d9ee2aa
1 parent 3e0dc12
commit d9ee2aa
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -103,31 +103,31 @@ matrix:
         gammu:
           # (optional) default is disabled
           enabled: true
-          # (optional) Path to the Gammu-Inbox directory. Default is "/var/spool/gammu/inbox".
-          inboxPath: "/var/spool/gammu/inbox"
-          # (optional) Path to the directory, where to put processed messages. Default is "/var/spool/gammu/inbox_processed".
-          inboxProcessedPath: "/var/spool/gammu/inbox_processed"
+          # (optional) Path to the Gammu-Inbox directory. Default is "/data/spool/inbox".
+          inboxPath: "/data/spool/inbox"
+          # (optional) Path to the directory, where to put processed messages. Default is "/data/spool/inbox_processed".
+          inboxProcessedPath: "/data/spool/inbox_processed"
 ```
 
 Your `gammu-smsdrc` should look like this:
 ```text
 [gammu]
 Device = /dev/ttyModem
-LogFile = /var/log/gammu/gammu.log
+LogFile = /data/log/gammu.log
 debugLevel = 1
 
 [smsd]
 Service = files
 LoopSleep = 3
-InboxPath = /var/spool/gammu/inbox/
-OutboxPath = /var/spool/gammu/outbox/
-SentSMSPath = /var/spool/gammu/sent/
-ErrorSMSPath = /var/spool/gammu/error/
+InboxPath = /data/spool/inbox/
+OutboxPath = /data/spool/outbox/
+SentSMSPath = /data/spool/sent/
+ErrorSMSPath = /data/spool/error/
 InboxFormat = detail
 OutboxFormat = detail
 TransmitFormat = auto
 debugLevel = 1
-LogFile = /var/log/gammu/smsd.log
+LogFile = /data/log/smsd.log
 DeliveryReport = log
 DeliveryReportDelay = 7200
 HangupCalls = 1

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,7 @@ allprojects {
     apply(plugin = "kotlin")
 
     group = "net.folivo"
-    version = "0.1.1.RELEASE"
+    version = "0.1.2.RELEASE"
     java.sourceCompatibility = JavaVersion.VERSION_11
 
     repositories {
@@ -105,8 +105,6 @@ tasks.register<Exec>("docker-gammu") {
             "build",
             "--build-arg",
             "JAR_FILE=./build/libs/*.jar",
-            "--cache-from",
-            "folivonet/matrix-sms-bridge:latest",
             "-t",
             "folivonet/matrix-sms-bridge:$version",
             "-t",

diff --git a/examples/gammu/bridge/application.yml → examples/gammu/config/application.yml b/examples/gammu/bridge/application.yml → examples/gammu/config/application.yml
diff --git a/examples/gammu/gammu/config/gammu-smsdrc → examples/gammu/config/gammu-smsdrc b/examples/gammu/gammu/config/gammu-smsdrc → examples/gammu/config/gammu-smsdrc
@@ -1,20 +1,20 @@
 [gammu]
 Device = /dev/ttyModem
-LogFile = /var/log/gammu/gammu.log
+LogFile = /data/log/gammu.log
 debugLevel = 1
 
 [smsd]
 Service = files
 LoopSleep = 3
-InboxPath = /var/spool/gammu/inbox/
-OutboxPath = /var/spool/gammu/outbox/
-SentSMSPath = /var/spool/gammu/sent/
-ErrorSMSPath = /var/spool/gammu/error/
+InboxPath = /data/spool/inbox/
+OutboxPath = /data/spool/outbox/
+SentSMSPath = /data/spool/sent/
+ErrorSMSPath = /data/spool/error/
 InboxFormat = detail
 OutboxFormat = detail
 TransmitFormat = auto
 debugLevel = 1
-LogFile = /var/log/gammu/smsd.log
+LogFile = /data/log/smsd.log
 DeliveryReport = log
 DeliveryReportDelay = 7200
 HangupCalls = 1

diff --git a/examples/gammu/gammu/.gitignore → examples/gammu/data/.gitignore b/examples/gammu/gammu/.gitignore → examples/gammu/data/.gitignore
diff --git a/examples/gammu/docker-compose.yml b/examples/gammu/docker-compose.yml
@@ -1,31 +1,21 @@
 version: '3.3'
 services:
   matrix-sms-bridge:
-    image: net.folivo/matrix-sms-bridge
+    image: folivonet/matrix-sms-bridge:latest
     volumes:
       - type: bind
-        source: ./bridge
+        source: ./config
         target: /config
       - type: bind
-        source: ./gammu/config/gammu-smsdrc
-        target: /etc/gammu-smsdrc
-        read_only: true
-      - type: bind
-        source: ./gammu/config/gammu-smsdrc
-        target: /etc/gammurc
-        read_only: true
-      - type: bind
-        source: ./gammu/spool
-        target: /var/spool/gammu
-      - type: bind
-        source: ./gammu/log
-        target: /var/log/gammu
+        source: ./data
+        target: /data
       #devices:
       #- "/dev/ttyUSB1:/dev/ttyModem"
     depends_on:
       - neo4j
     environment:
       - CONFIG_LOCATION=/config/application.yml
+      - GAMMU_CONFIG=/config/gammu-smsdrc
     networks:
       - local-kannel
     expose:

diff --git a/src/main/docker/gammu/Dockerfile b/src/main/docker/gammu/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:focal
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
-VOLUME ["/var/spool/gammu", "/var/log/gammu"]
+VOLUME ["/data", "/config"]
 
 RUN apt-get update && apt-get install -y \
         locales \
@@ -23,5 +23,6 @@ EXPOSE 8080
 ARG JAR_FILE
 COPY ${JAR_FILE} app.jar
 
-ENV CONFIG_LOCATION /config/
+ENV CONFIG_LOCATION /config/application.yml
+ENV GAMMU_CONFIG /config/gammu-smsdrc
 ENTRYPOINT ["/usr/bin/supervisord"]
diff --git a/src/main/docker/gammu/supervisord.conf b/src/main/docker/gammu/supervisord.conf
@@ -7,6 +7,6 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 
 [program:gammu]
-command=gammu-smsd
+command=gammu-smsd -c %(ENV_GAMMU_CONFIG)s
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
diff --git a/src/main/kotlin/net/folivo/matrix/bridge/sms/provider/gammu/GammuSmsProviderProperties.kt b/src/main/kotlin/net/folivo/matrix/bridge/sms/provider/gammu/GammuSmsProviderProperties.kt
@@ -7,6 +7,6 @@ import org.springframework.boot.context.properties.ConstructorBinding
 @ConstructorBinding
 data class GammuSmsProviderProperties(
         val enabled: Boolean = false,
-        val inboxPath: String = "/var/spool/gammu/inbox",
-        val inboxProcessedPath: String = "/var/spool/gammu/inbox_processed"
+        val inboxPath: String = "/data/spool/inbox",
+        val inboxProcessedPath: String = "/data/spool/inbox_processed"
 )