From d9ee2aaaac5857c4d9b509c6db95db53fdcd3c90 Mon Sep 17 00:00:00 2001 From: benkuly <12199167+benkuly@users.noreply.github.com> Date: Fri, 22 May 2020 13:35:36 +0200 Subject: [PATCH] better default paths for docker images --- README.md | 20 +++++++++---------- build.gradle.kts | 4 +--- .../gammu/{bridge => config}/application.yml | 0 .../gammu/{gammu => }/config/gammu-smsdrc | 12 +++++------ examples/gammu/{gammu => data}/.gitignore | 0 examples/gammu/docker-compose.yml | 20 +++++-------------- src/main/docker/gammu/Dockerfile | 5 +++-- src/main/docker/gammu/supervisord.conf | 2 +- .../gammu/GammuSmsProviderProperties.kt | 4 ++-- 9 files changed, 28 insertions(+), 39 deletions(-) rename examples/gammu/{bridge => config}/application.yml (100%) rename examples/gammu/{gammu => }/config/gammu-smsdrc (52%) rename examples/gammu/{gammu => data}/.gitignore (100%) diff --git a/README.md b/README.md index 5720357..8edcf36 100644 --- 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 index cd34430..68418c9 100644 --- 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("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 b/examples/gammu/config/application.yml similarity index 100% rename from examples/gammu/bridge/application.yml rename to examples/gammu/config/application.yml diff --git a/examples/gammu/gammu/config/gammu-smsdrc b/examples/gammu/config/gammu-smsdrc similarity index 52% rename from examples/gammu/gammu/config/gammu-smsdrc rename to examples/gammu/config/gammu-smsdrc index 3f2cd94..33a4681 100644 --- a/examples/gammu/gammu/config/gammu-smsdrc +++ b/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 b/examples/gammu/data/.gitignore similarity index 100% rename from examples/gammu/gammu/.gitignore rename to examples/gammu/data/.gitignore diff --git a/examples/gammu/docker-compose.yml b/examples/gammu/docker-compose.yml index 6a39f9f..c12e29f 100644 --- 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 index b2ece74..78901bc 100644 --- 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"] \ No newline at end of file diff --git a/src/main/docker/gammu/supervisord.conf b/src/main/docker/gammu/supervisord.conf index 091e1a3..a494a62 100644 --- 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 \ No newline at end of file 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 index c9bb131..aa1b062 100644 --- 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" ) \ No newline at end of file