* Replace DATABASE_EXPOSED_PORT by DATABASE_PORT

* Remove access to database outside of container

Author: jjrom

build/resto/container_root/cont-init.d/15-resto-config.sh

@@ -54,13 +54,6 @@ if [ ! -z "${ADDON_TAG_ITAG_TAGGERS}" ]; then
     ADDON_TAG_ITAG_TAGGERS=\'$(echo $ADDON_TAG_ITAG_TAGGERS | sed s/,/\',\'/g)\'
 fi
 
-# [IMPORTANT] Set DATABASE_PORT
-if [ "${DATABASE_HOST}" == "restodb" ]; then
-    DATABASE_PORT=5432
-else
-    DATABASE_PORT=${DATABASE_EXPOSED_PORT}
-fi
-
 # Awfull trick
 eval "cat <<EOF
 $(<${CONFIG_TEMPLATE_FILE})

config-dev.env

@@ -54,7 +54,7 @@ API_HOST_DESCRIPTION="resto localhost server"
 DATABASE_HOST=restodb
 
 ### Database port
-DATABASE_EXPOSED_PORT=5253
+#DATABASE_PORT=5432
 
 ### [IMPORTANT] Usually you should only change the DATABASE_USER_PASSWORD value and leave the other values untouched
 DATABASE_NAME=resto

config.env

@@ -54,7 +54,7 @@ API_HOST_DESCRIPTION="resto localhost server"
 DATABASE_HOST=restodb
 
 ### Database exposed port
-DATABASE_EXPOSED_PORT=5253
+#DATABASE_PORT=5432
 
 ### [IMPORTANT] Usually you should only change the DATABASE_USER_PASSWORD value and leave the other values untouched
 DATABASE_NAME=resto

deploy

@@ -114,7 +114,7 @@ fi
 
 PUBLIC_ENDPOINT=$(grep ^PUBLIC_ENDPOINT= ${ENV_FILE} | awk -F= '{for (i=2; i<=NF; i++) print $i}'| xargs echo -n)
 RESTO_EXPOSED_PORT=$(grep ^RESTO_EXPOSED_PORT= ${ENV_FILE} | awk -F= '{for (i=2; i<=NF; i++) print $i}'| xargs echo -n)
-DATABASE_EXPOSED_PORT=$(grep ^DATABASE_EXPOSED_PORT= ${ENV_FILE} | awk -F= '{for (i=2; i<=NF; i++) print $i}'| xargs echo -n)
+DATABASE_PORT=$(grep ^DATABASE_PORT= ${ENV_FILE} | awk -F= '{for (i=2; i<=NF; i++) print $i}'| xargs echo -n)
 DATABASE_HOST=$(grep ^DATABASE_HOST= ${ENV_FILE} | awk -F= '{for (i=2; i<=NF; i++) print $i}'| xargs echo -n)
 DATABASE_NAME=$(grep ^DATABASE_NAME= ${ENV_FILE} | awk -F= '{for (i=2; i<=NF; i++) print $i}'| xargs echo -n)
 DATABASE_USER_NAME=$(grep ^DATABASE_USER_NAME= ${ENV_FILE} | awk -F= '{for (i=2; i<=NF; i++) print $i}'| xargs echo -n)
@@ -157,15 +157,15 @@ if [[ ${CLEAN} -eq 1 ]]; then
         echo -e "[INFO] Cleaning existing resto container and volumes"
         COMPOSE_FILE=${COMPOSE_FILE} \
         RESTO_EXPOSED_PORT=${RESTO_EXPOSED_PORT} \
-        DATABASE_EXPOSED_PORT=${DATABASE_EXPOSED_PORT} \
+        DATABASE_PORT=${DATABASE_PORT} \
         ENV_FILE=${ENV_FILE} \
         docker compose down -v
     fi
 fi
 
 COMPOSE_FILE=${COMPOSE_FILE} \
 RESTO_EXPOSED_PORT=${RESTO_EXPOSED_PORT} \
-DATABASE_EXPOSED_PORT=${DATABASE_EXPOSED_PORT} \
+DATABASE_PORT=${DATABASE_PORT} \
 DATABASE_HOST=${DATABASE_HOST} \
 DATABASE_NAME=${DATABASE_NAME} \
 DATABASE_USER_NAME=${DATABASE_USER_NAME} \

docker-compose.yml

@@ -48,8 +48,6 @@ services:
       - POSTGRES_PASSWORD=${DATABASE_USER_PASSWORD:-resto}
       - POSTGRES_USER=${DATABASE_USER_NAME:-resto}
       - POSTGRES_DB=${DATABASE_NAME:-resto}
-    ports:
-      - ${DATABASE_EXPOSED_PORT:-5253}:5432
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${DATABASE_USER_NAME:-resto}"]
       interval: 1m