Merge branch 'develop' into feature/BETA-455

.gitignore

@@ -42,4 +42,3 @@ Thumbs.db
 *.flv
 *.mov
 *.wmv
-attendancesystem/

Makefile

@@ -2,8 +2,7 @@ ENV ?= prod
 COMPOSE_FILE = docker-compose.yml
 ENV_FILE = .env.$(ENV)
 
-CONTAINER_POSTFIX := $(shell grep '^CONTAINER_POSTFIX=' $(ENV_FILE) 2>/dev/null | cut -d'=' -f2-)
+PROJECT_NAME = attendancesystem-$(ENV)
-PROJECT_NAME = attendancesystem-$(ENV)$(if $(CONTAINER_POSTFIX),-$(CONTAINER_POSTFIX),)
 NETWORK_NAME = attendancesystem-network
 
 .PHONY: app install update reset-network nuke nuke-project

docker-compose.yml

@@ -2,23 +2,22 @@ services:
   # ================= BACKEND =================
 
   attendancesystem-api:
-    container_name: attendancesystem-api${CONTAINER_NAME_SUFFIX}
+    image: ${DOCKER_REPO}/backend-attendance-system-api:${IMAGEM_UNSTABLE_LATEST}
-    image: ${DOCKER_REPO}/backend-attendance-system-api:${IMAGEM_RELEASE_1_3}
     profiles: ["app"]
     ports:
       - "${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}:${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}"
     environment:
-      - ASPNETCORE_URLS=http://*:${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}
-      - Kestrel__Endpoints__Http__Url=http://*:${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}
       - SYSBASE_URL=${SYSTEM_BASE_CONN}
       - SystemBaseConn=${SYSTEM_BASE_CONN}
       - FrotendConn=${EXTERNAL_HOST}:${FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT}
+    env_file:
+      - path: .env.observability
+        required: false
     networks:
       - app-network
 
   # ================= FRONTEND =================
   config-generator:
-    container_name: config-generator${CONTAINER_NAME_SUFFIX}
     image: alpine:${IMAGEM_LATEST}
     profiles: ["app"]
     environment:
@@ -43,8 +42,7 @@ services:
     restart: "no"
 
   attendancesystem-app:
-    container_name: attendancesystem-app${CONTAINER_NAME_SUFFIX}
+    image: ${DOCKER_REPO}/attendancesystem-frontend:${IMAGEM_RELEASE}
-    image: ${DOCKER_REPO}/attendancesystem-frontend:${IMAGEM_RELEASE_1_3}
     profiles: ["app"]
     volumes:
       - config-volume:/config-inject:ro

install.sh

@@ -4,7 +4,7 @@
 #  🚀 Instalador - AttendanceSystem
 #  Uso:
 #    bash <(curl -fsSL \
-#      "https://git.seventh.com.br/seventh.p7/attendance-system.install/raw/branch/main/install.sh")
+#      "https://git.seventh.com.br/seventh.p7/attendance-system.install/raw/branch/develop/install.sh")
 # ==============================================================
 
 # ── Redireciona stdin para o terminal quando rodado via curl | bash ──
@@ -28,7 +28,7 @@ NC='\033[0m'
 
 # ─── Repositório Git ──────────────────────────────────────────
 INSTALL_DIR="attendancesystem"
-BRANCH="${BRANCH:-feature/SDA-304}"
+BRANCH="${BRANCH:-develop}"
 ENV_FILE=""
 GIT_REPO="https://git.seventh.com.br/seventh.p7/attendance-system.install.git"
 
@@ -91,24 +91,6 @@ ask() {
   eval "$varname=\"$value\""
 }
 
-ask_optional() {
-  # ask_optional <VARNAME> <prompt> [default]
-  local varname="$1"
-  local prompt="$2"
-  local default="$3"
-  local value=""
-
-  if [ -n "$default" ]; then
-    echo -ne "  ${BOLD}${prompt}${NC} ${DIM}[${default}]${NC} ${DIM}(ENTER para nenhum)${NC}: "
-  else
-    echo -ne "  ${BOLD}${prompt}${NC} ${DIM}(ENTER para nenhum)${NC}: "
-  fi
-
-  read -r value
-  value="${value:-$default}"
-  eval "$varname=\"$value\""
-}
-
 confirm() {
   echo -ne "  ${BOLD}$1${NC} ${CYAN}[s/N]${NC}: "
   read -r resp
@@ -251,14 +233,6 @@ collect_external_ports() {
   ask FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT "Frontend AttendanceSystem"     "${FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT:-$FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT}"
 }
 
-collect_container_postfix() {
-  print_section "5. Identificador de instância (postfix dos containers)"
-  echo -e "  ${DIM}Distingue containers de múltiplas instalações na mesma máquina.${NC}"
-  echo -e "  ${DIM}Exemplo: 'cliente1' → 'attendancesystem-api-cliente1', etc.${NC}"
-  echo -e "  ${DIM}Deixe em branco para manter o comportamento padrão.${NC}\n"
-  ask_optional CONTAINER_POSTFIX "Postfix" "${CONTAINER_POSTFIX:-}"
-}
-
 # ══════════════════════════════════════════════════════════════
 # Wizard principal — coleta com navegação
 # ══════════════════════════════════════════════════════════════
@@ -282,8 +256,6 @@ collect_config() {
     FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT="$FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT"
     print_ok "Portas externas definidas iguais às internas."
   fi
-
-  collect_container_postfix
 }
 
 # ══════════════════════════════════════════════════════════════
@@ -313,13 +285,6 @@ show_summary() {
     echo -e "      Backend  Attendance : ${BOLD}${BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT}${NC}"
     echo -e "      Frontend Attendance : ${BOLD}${FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT}${NC}"
     echo ""
-    echo -e "  ${BOLD}[5] Identificador de instância${NC}"
-    if [ -n "$CONTAINER_POSTFIX" ]; then
-      echo -e "      Postfix : ${BOLD}${CONTAINER_POSTFIX}${NC}"
-    else
-      echo -e "      Postfix : ${DIM}(nenhum — comportamento padrão)${NC}"
-    fi
-    echo ""
     echo -e "  ──────────────────────────────────────────────────────────────"
     echo -e "  ${GREEN}${BOLD}[C]${NC} Confirmar e continuar   ${RED}${BOLD}[X]${NC} Cancelar instalação"
     echo -e "  ──────────────────────────────────────────────────────────────"
@@ -332,7 +297,6 @@ show_summary() {
       2) collect_system_base ;;
       3) collect_internal_ports ;;
       4) collect_external_ports ;;
-      5) collect_container_postfix ;;
       C) break ;;
       X)
         echo ""
@@ -340,7 +304,7 @@ show_summary() {
         exit 0
         ;;
       *)
-        print_warn "Opção inválida. Digite 1-5, C ou X."
+        print_warn "Opção inválida. Digite 1-4, C ou X."
         ;;
     esac
   done
@@ -357,15 +321,13 @@ generate_envs() {
   local SYSTEM_BASE_CONN="${SYSTEM_BASE_HOST}:${SYSTEM_BASE_PORT}"
   local KEEPALIVE_BACKEND="${EXTERNAL_HOST}:${BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT}"
   local KEEPALIVE_FRONTEND="${EXTERNAL_HOST}:${FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT}"
-  local CONTAINER_NAME_SUFFIX=""
-  [ -n "$CONTAINER_POSTFIX" ] && CONTAINER_NAME_SUFFIX="-${CONTAINER_POSTFIX}"
 
   cat > "$BASE_DIR/.env.prod" <<EOF
 ASPNETCORE_ENVIRONMENT=Production
 DOCKER_REPO=seventhltda
 IMAGEM_LATEST=latest
 IMAGEM_UNSTABLE_LATEST=unstable-latest
-IMAGEM_RELEASE_1_3=1.3
+IMAGEM_RELEASE=2.0
 NGINX_DEFAULT_PORT=80
 
 # ── Sistema Base ──────────────────────────────────────────
@@ -388,13 +350,17 @@ BACKEND_ATTENDANCESYSTEM_API_NAME=attendancesystem-api
 FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT=${FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT}
 FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT=${FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT}
 
+# ── Portas de integração com outros módulos da suite ──────
+FRONTEND_SUITE_APP_EXTERNAL_PORT=
+FRONTEND_ACCOUNT_APP_EXTERNAL_PORT=
+FRONTEND_PEOPLE_APP_EXTERNAL_PORT=
+BACKEND_SUITE_API_EXTERNAL_PORT=
+BACKEND_PEOPLE_API_EXTERNAL_PORT=
+BACKEND_ACCOUNT_API_EXTERNAL_PORT=
+
 # ── Keepalive ─────────────────────────────────────────────
 KEEPALIVE_ATTENDANCE_SYSTEM_BACKEND_HOST=${KEEPALIVE_BACKEND}
 KEEPALIVE_ATTENDANCE_SYSTEM_FRONTEND_HOST=${KEEPALIVE_FRONTEND}
-
-# ── Identificador de instância ────────────────────────────
-CONTAINER_POSTFIX=${CONTAINER_POSTFIX}
-CONTAINER_NAME_SUFFIX=${CONTAINER_NAME_SUFFIX}
 EOF
   print_ok ".env.prod gerado"
 }