command changes

docker/compose/companion.yaml

@@ -9,15 +9,15 @@ services:
     volumes:
       - ../../configuration/apache:/etc/share/vhosts/apache
       - ../../configuration/nginx:/etc/share/vhosts/nginx
-      - ../extras:/etc/share/vhosts/node
+      - ../../configuration/node:/etc/share/vhosts/node
+      - ../../configuration/sops/config:/etc/share/sops/config
+      - ../../configuration/sops/global:/etc/share/sops/global
+      - ../../configuration/sops/keys:/etc/share/sops/keys
       - ../../configuration/ssl:/etc/mkcert
       - "../../configuration/ssh:/home/root/.ssh:ro"
       - "${PROJECT_DIR:-./../../../application}:/app"
       - ../../configuration/rootCA:/etc/share/rootCA
       - /var/run/docker.sock:/var/run/docker.sock
-      - ../../configuration/sops/config:/etc/share/sops/config
-      - ../../configuration/sops/global:/etc/share/sops/global
-      - ../../configuration/sops/keys:/etc/share/sops/keys
       - "${SOP_REPO:-./../../../sops-repo}:/etc/share/vhosts/sops"
       - "${HOME}/.gitconfig:/home/root/.gitconfig:ro"
     networks:

docker/compose/db-client.yaml

@@ -13,8 +13,6 @@ services:
     profiles: [redis]
     depends_on:
       - redis
-    ports:
-      - "${REDIS_INSIGHT_PORT:-5540}:5540"
     environment:
       - RI_REDIS_HOST=redis
     volumes:
@@ -31,8 +29,6 @@ services:
     hostname: cloud-beaver
     image: dbeaver/cloudbeaver:latest
     profiles: [mysql, mariadb, postgresql]
-    ports:
-      - "${DBEAVER_PORT:-8080}:8978"
     environment:
       - TZ=${TZ:-}
     volumes:
@@ -51,8 +47,6 @@ services:
     profiles: [mongodb]
     depends_on:
       - mongodb
-    ports:
-      - "${MONGO_EXPRESS_PORT:-8081}:8081"
     environment:
       - TZ=${TZ:-}
       - ME_CONFIG_BASICAUTH=false
@@ -69,12 +63,10 @@ services:
     <<: *db-client-service
     container_name: KIBANA
     hostname: kibana
-    image: kibana:${ELASTICSEARCH_VERSION:-8.18.0}
+    image: kibana:${ELASTICSEARCH_VERSION:-9.2.4}
     profiles: [elasticsearch]
     depends_on:
       - elasticsearch
-    ports:
-      - "${KIBANA_PORT:-5601}:5601"
     environment:
       - TZ=${TZ:-}
       - "ELASTICSEARCH_HOSTS=http://elasticsearch:9200"

docker/compose/db.yaml

@@ -10,8 +10,6 @@ services:
     hostname: redis
     image: redis/redis-stack-server:${REDIS_VERSION:-latest}
     profiles: [redis]
-    ports:
-      - "${REDIS_PORT:-6379}:6379"
     volumes:
       - ../../data/redis:/data
     environment:
@@ -66,8 +64,6 @@ services:
     hostname: mysql
     image: mysql:${MYSQL_VERSION:-latest}
     profiles: [mysql]
-    ports:
-      - "${MYSQL_PORT:-3306}:3306"
     environment:
       - TZ=${TZ:-}
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-12345}
@@ -92,8 +88,6 @@ services:
     hostname: mongodb
     image: mongo:${MONGODB_VERSION:-latest}
     profiles: [mongodb]
-    ports:
-      - "${MONGODB_PORT:-27017}:27017"
     environment:
       - TZ=${TZ:-}
       - MONGO_INITDB_ROOT_USERNAME=${MONGODB_ROOT_USERNAME:-root}
@@ -119,8 +113,6 @@ services:
     hostname: mariadb
     image: mariadb:${MARIADB_VERSION:-latest}
     profiles: [mariadb]
-    ports:
-      - "${MARIADB_PORT:-3306}:3306"
     environment:
       - TZ=${TZ:-}
       - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD:-12345}
@@ -143,10 +135,8 @@ services:
     <<: *db-service
     container_name: ELASTICSEARCH
     hostname: elasticsearch
-    image: elasticsearch:${ELASTICSEARCH_VERSION:-8.18.0}
+    image: elasticsearch:${ELASTICSEARCH_VERSION:-9.2.4}
     profiles: [elasticsearch]
-    ports:
-      - "${ELASTICSEARCH_PORT:-9200}:9200"
     environment:
       - TZ=${TZ:-}
       - "discovery.type=single-node"

docker/compose/http.yaml

@@ -7,8 +7,8 @@ services:
     environment:
       - TZ=${TZ:-}
     ports:
-      - "${NGINX_HTTP_PORT:-80}:80"
-      - "${NGINX_HTTPS_PORT:-443}:443"
+      - "${HTTP_PORT:-80}:80"
+      - "${HTTPS_PORT:-443}:443"
     volumes:
       - ../../logs/nginx:/var/log/nginx
       - ../../configuration/nginx:/etc/nginx/conf.d:ro