improvements

Author: kanzitelli

build.sh

@@ -1,6 +1,6 @@
 # -- getting docker-compose files
-DC_FILES="docker-compose.main.yml"
-for F in `find ./services -type f -maxdepth 1 -name "docker-compose*.yml"`
+DC_FILES="-f docker-compose.main.yml"
+for F in `find ./services -maxdepth 1 -type f -name "docker-compose*.yml"`
 do
   DC_FILES="$DC_FILES -f $F "
 done

run/services/postgresql.sh

@@ -3,4 +3,7 @@ DIR=data/postgresql
 
 if [ ! -d "$DIR" ]; then
   mkdir data/postgresql
-fi
+fi
+
+# -- bitnami image needs permissions
+sudo chown -R 1001:1001 data/postgresql

run/services/redis.sh

@@ -5,4 +5,5 @@ if [ ! -d "$DIR" ]; then
   mkdir data/redis
 fi
 
+# -- bitnami image needs permissions
 sudo chown -R 1001:1001 data/redis

services/docker-compose.frontend.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   frontend:
-    build: ./frontend
+    build: ./services/frontend
     restart: always
     labels:
       - "traefik.enable=true"

services/docker-compose.postgres.yml services/docker-compose.postgresql.ymlservices/docker-compose.postgres.yml renamed to services/docker-compose.postgresql.yml

@@ -9,7 +9,7 @@ services:
       - POSTGRESQL_PASSWORD=${POSTGRESQL_PASSWORD}
       - POSTGRESQL_DATABASE=${POSTGRESQL_DATABASE}
     volumes:
-      - ../data/postgresql:/bitnami/postgresql
+      - ./data/postgresql:/bitnami/postgresql
     labels:
       - "traefik.enable=true"
       - "traefik.tcp.routers.postgresql.rule=HostSNI(`*`)"

services/docker-compose.redis.yml

@@ -8,7 +8,7 @@ services:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
       - REDIS_DISABLE_COMMANDS=${REDIS_DISABLE_COMMANDS}
     volumes:
-      - ../data/redis:/bitnami/postgresql
+      - ./data/redis:/bitnami/postgresql
     labels:
       - "traefik.enable=true"
       - "traefik.tcp.routers.redis.rule=HostSNI(`*`)"

setup.sh

@@ -1,7 +1,7 @@
 # -- running services' bash files
 BASH_SYSTEM_FILES="bash run/acme.sh; bash run/data.sh;"
 BASH_FILES=""
-for F in `find ./run/services -type f -maxdepth 1 -name "*.sh"`
+for F in `find ./run/services -maxdepth 1 -type f -name "*.sh"`
 do
   BASH_FILES="$BASH_FILES bash $F;"
 done