Merge pull request #578 from ukkopahis/timescaledb-broken

Timescaledb: fix broken template

Author: Slyke

.templates/timescaledb/build.py

@@ -1,13 +1,13 @@
-timescaledb:
-  container_name: timescaledb
-  image: timescale/timescaledb:latest-pg12
-  restart: unless-stopped
-  environment:
-    POSTGRES_USER=timescaleuser
-    POSTGRES_PASSWORD=%randomPassword%
-    POSTGRES_DB=postdb
-  ports:
-    - "5432:5432"
-  volumes:
-    - ./volumes/timescaledb/data:/var/lib/postgresql/data
+  timescaledb:
+    container_name: timescaledb
+    image: timescale/timescaledb:latest-pg12
+    restart: unless-stopped
+    environment:
+      - POSTGRES_USER=${IOTSTACK_TIMESCALEDB_USER:-postgres}
+      - POSTGRES_PASSWORD={IOTSTACK_TIMESCALEDB_INITIAL_PASSWORD:-IOtSt4ckTim3Scale}
+      - POSTGRES_DB=postdb
+    ports:
+      - ${IOTSTACK_TIMESCALEDB_PORT_INT:-5433}:5432
+    volumes:
+      - ./volumes/timescaledb/data:/var/lib/postgresql/data
 

.templates/timescaledb/service.yml

@@ -38,7 +38,7 @@ Do note that the ports listed are not all of the ports containers use. They are
 | rtl_433        | *none*           | *none*     | *none* | No |
 | tasmoadmin     | *none*           | *none*     | 8088   | No |
 | telegraf       | *none*           | *none*     | *none* | No |
-| timescaledb    | timescaleuser    | IOtSt4ckTim3Scale | *none* | No |
+| timescaledb    | postgres         | IOtSt4ckTim3Scale | *none* | No |
 | transmission   | *none*           | *none*     | 9091   | No |
 | webthingsio_gateway | *none*      | *none*     | 4060   | No |
 | zigbee2mqtt    | *none*           | *none*     | *none* | No |

docs/Basic_setup/Default-Configs.md

@@ -0,0 +1,8 @@
+
+### Default port changed
+
+In order to avoid port conflict with PostgreSQL, the public database port is
+mapped to **5433** using Docker.
+
+Cross-container access from other containers still works as previously:
+`timescaledb:5432`.