diff --git a/optaweb-employee-rostering/Dockerfile b/optaweb-employee-rostering/Dockerfile index 55bcfd1..9604517 100644 --- a/optaweb-employee-rostering/Dockerfile +++ b/optaweb-employee-rostering/Dockerfile @@ -1,7 +1,7 @@ FROM maven:3-jdk-8-slim AS builder MAINTAINER EasyPi Software Foundation -ENV APP_VERSION=7.45.0.Final +ENV APP_VERSION=8.12.0.Final ENV APP_URL=https://github.com/kiegroup/optaweb-employee-rostering/archive/${APP_VERSION}.tar.gz WORKDIR /opt/app @@ -17,7 +17,7 @@ RUN set -xe \ FROM openjdk:8-alpine MAINTAINER EasyPi Software Foundation -ENV APP_VERSION=7.45.0.Final +ENV APP_VERSION=8.12.0.Final WORKDIR /opt/app diff --git a/optaweb-employee-rostering/docker-compose.yml b/optaweb-employee-rostering/docker-compose.yml index c89f3d7..b427855 100644 --- a/optaweb-employee-rostering/docker-compose.yml +++ b/optaweb-employee-rostering/docker-compose.yml @@ -15,7 +15,7 @@ services: restart: unless-stopped postgres: - image: postgres:12-alpine + image: postgres:14-alpine volumes: - ./data:/var/lib/postgresql/data environment: diff --git a/owntracks/ot-recorder/Dockerfile b/owntracks/ot-recorder/Dockerfile index 79dce50..a94c298 100644 --- a/owntracks/ot-recorder/Dockerfile +++ b/owntracks/ot-recorder/Dockerfile @@ -26,4 +26,4 @@ VOLUME $OTR_STORAGEDIR COPY docker-entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -EXPOSE 8083 +EXPOSE 8083 8085 diff --git a/owntracks/ot-recorder/README.md b/owntracks/ot-recorder/README.md index 9f8c028..3794184 100644 --- a/owntracks/ot-recorder/README.md +++ b/owntracks/ot-recorder/README.md @@ -7,7 +7,7 @@ location data published via MQTT (or HTTP) by the OwnTracks apps. ## docker-compose.yml ```yaml -version: "3.7" +version: "3.8" services: @@ -15,6 +15,7 @@ services: image: vimagick/ot-recorder ports: - "8083:8083" + - "8085:8085" volumes: - ./data:/var/spool/owntracks/recorder/store environment: @@ -23,8 +24,7 @@ services: - OTR_USER=username - OTR_PASS=password - OTR_TOPICS=owntracks/# - # OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem - # OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + # OTR_CAPATH=/etc/ssl/certs/ # OTR_OPTIONS=--debug restart: unless-stopped @@ -47,7 +47,6 @@ Click [this][2] to generate a google map api key. ```bash $ docker-compse up -d -$ tree data $ docker-compose exec recorder bash >>> ocat --list {"results":["foo"]} diff --git a/owntracks/ot-recorder/arm/Dockerfile b/owntracks/ot-recorder/arm/Dockerfile index 1a1d5c6..f941caf 100644 --- a/owntracks/ot-recorder/arm/Dockerfile +++ b/owntracks/ot-recorder/arm/Dockerfile @@ -26,4 +26,4 @@ VOLUME $OTR_STORAGEDIR COPY docker-entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -EXPOSE 8083 +EXPOSE 8083 8085 diff --git a/owntracks/ot-recorder/arm/docker-compose.yml b/owntracks/ot-recorder/arm/docker-compose.yml index 930e86e..74ed7b6 100644 --- a/owntracks/ot-recorder/arm/docker-compose.yml +++ b/owntracks/ot-recorder/arm/docker-compose.yml @@ -6,6 +6,7 @@ services: image: easypi/ot-recorder-arm ports: - "8083:8083" + - "8085:8085" volumes: - ./data:/var/spool/owntracks/recorder/store environment: @@ -15,7 +16,6 @@ services: - OTR_PASS=password - OTR_TOPICS=owntracks/# - OTR_CAPATH=/etc/ssl/certs/ - # OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX # OTR_OPTIONS=--debug restart: unless-stopped diff --git a/owntracks/ot-recorder/docker-compose.yml b/owntracks/ot-recorder/docker-compose.yml index 5ac3dd6..d028bf0 100644 --- a/owntracks/ot-recorder/docker-compose.yml +++ b/owntracks/ot-recorder/docker-compose.yml @@ -6,6 +6,7 @@ services: image: vimagick/ot-recorder ports: - "8083:8083" + - "8085:8085" volumes: - ./data:/var/spool/owntracks/recorder/store environment: @@ -15,7 +16,6 @@ services: - OTR_PASS=password - OTR_TOPICS=owntracks/# - OTR_CAPATH=/etc/ssl/certs/ - # OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX # OTR_OPTIONS=--debug restart: unless-stopped