feature/SDA-304 #4

Open
taina.carvalho wants to merge 12 commits from feature/SDA-304 into develop
5 changed files with 62 additions and 130 deletions

3
.gitignore vendored
View File

@@ -41,4 +41,5 @@ Thumbs.db
*.avi
*.flv
*.mov
*.wmv
*.wmv
attendancesystem/

View File

@@ -2,10 +2,11 @@ ENV ?= prod
COMPOSE_FILE = docker-compose.yml
ENV_FILE = .env.$(ENV)
PROJECT_NAME = attendancesystem-$(ENV)
CONTAINER_POSTFIX := $(shell grep '^CONTAINER_POSTFIX=' $(ENV_FILE) 2>/dev/null | cut -d'=' -f2-)
PROJECT_NAME = attendancesystem-$(ENV)$(if $(CONTAINER_POSTFIX),-$(CONTAINER_POSTFIX),)
NETWORK_NAME = attendancesystem-network
.PHONY: infra app install update reset-network nuke nuke-project
.PHONY: app install update reset-network nuke nuke-project
# ===============================
# 🧹 Reset Network
@@ -14,25 +15,6 @@ reset-network:
@echo "🧹 Removendo rede antiga (se existir)..."
-docker network rm $(NETWORK_NAME) 2>/dev/null || true
# ===============================
# 🏗 Subir apenas INFRA
# ===============================
infra: reset-network
@echo "📥 Baixando imagens de INFRA ($(PROJECT_NAME))..."
docker compose \
--project-name $(PROJECT_NAME) \
--env-file $(ENV_FILE) \
--profile infra \
-f $(COMPOSE_FILE) \
pull
@echo "🚀 Subindo apenas INFRA ($(PROJECT_NAME))..."
docker compose \
--project-name $(PROJECT_NAME) \
--env-file $(ENV_FILE) \
--profile infra \
-f $(COMPOSE_FILE) \
up -d --pull never
# ===============================
# 🧩 Subir apenas APP
# ===============================
@@ -60,7 +42,6 @@ install:
docker compose \
--project-name $(PROJECT_NAME) \
--env-file $(ENV_FILE) \
--profile infra \
--profile app \
-f $(COMPOSE_FILE) \
pull
@@ -68,7 +49,6 @@ install:
docker compose \
--project-name $(PROJECT_NAME) \
--env-file $(ENV_FILE) \
--profile infra \
--profile app \
-f $(COMPOSE_FILE) \
up -d --pull never
@@ -111,7 +91,6 @@ nuke-project:
docker compose \
--project-name $(PROJECT_NAME) \
--env-file $(ENV_FILE) \
--profile infra \
--profile app \
-f $(COMPOSE_FILE) \
down --volumes --remove-orphans
@@ -120,4 +99,3 @@ nuke-project:
- docker images --format '{{.Repository}}:{{.Tag}}' | grep '^seventhltda/' | xargs -r docker rmi -f 2>/dev/null || true
@echo "✅ Projeto $(PROJECT_NAME) limpo (containers, volumes, rede e imagens)."
@echo " Imagens de infraestrutura preservadas."

View File

@@ -7,15 +7,15 @@
},
"urlLgpd": "https://lgpd.seventh.com.br/feedback?product=situator",
"modules": {
"suite": "${FRONTEND_SUITE_URL}",
"suite": "",
"attendance": "${FRONTEND_ATTENDANCE_URL}",
"account": "${FRONTEND_ACCOUNT_URL}",
"people": "${FRONTEND_PEOPLE_URL}"
"account": "",
"people": ""
},
"api": {
"suite": "${BACKEND_SUITE_API_URL}",
"people": "${BACKEND_PEOPLE_API_URL}",
"account": "${BACKEND_ACCOUNT_API_URL}",
"suite": "",
"people": "",
"account": "",
"attendance": "${BACKEND_ATTENDANCE_API_URL}"
}
}

View File

@@ -1,44 +1,15 @@
services:
# ================= INFRA =================
mongodb:
image: mongo:${IMAGEM_LATEST}
profiles: ["infra"]
ports:
- "${MONGO_PORT}:27017"
volumes:
- mongodb_data:/data/db
networks:
- app-network
healthcheck:
test: echo 'db.runCommand("ping").ok' | mongosh localhost:27017/test --quiet
interval: 10s
timeout: 5s
retries: 5
# ================= BACKEND =================
suite-api:
image: ${DOCKER_REPO}/suite-api:${IMAGEM_UNSTABLE_LATEST}
profiles: ["app"]
ports:
- "${BACKEND_SUITE_API_INTERNAL_PORT}:${BACKEND_SUITE_API_INTERNAL_PORT}"
environment:
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT}
- MONGODB_CONNECTION_STRING=${MONGODB_CONNECTION_STRING}
- MONGODB_DATABASE=${MONGODB_DATABASE}
- SYSTEM_BASE_CONN=${SYSTEM_BASE_CONN}
- FRONTEND_CONN=${INTERNAL_HOST}:${FRONTEND_SUITE_APP_INTERNAL_PORT}
- KEEPALIVE_ATTENDANCE_SYSTEM_BACKEND_HOST=${KEEPALIVE_ATTENDANCE_SYSTEM_BACKEND_HOST}
- KEEPALIVE_ATTENDANCE_SYSTEM_FRONTEND_HOST=${KEEPALIVE_ATTENDANCE_SYSTEM_FRONTEND_HOST}
networks:
- app-network
attendancesystem-api:
image: ${DOCKER_REPO}/backend-attendance-system-api:${IMAGEM_RELEASE_1_1}
container_name: attendancesystem-api${CONTAINER_NAME_SUFFIX}
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}
@@ -47,6 +18,7 @@ services:
# ================= FRONTEND =================
config-generator:
container_name: config-generator${CONTAINER_NAME_SUFFIX}
image: alpine:${IMAGEM_LATEST}
profiles: ["app"]
environment:
@@ -71,7 +43,8 @@ services:
restart: "no"
attendancesystem-app:
image: ${DOCKER_REPO}/attendancesystem-frontend:${IMAGEM_RELEASE_1_1}
container_name: attendancesystem-app${CONTAINER_NAME_SUFFIX}
image: ${DOCKER_REPO}/attendancesystem-frontend:${IMAGEM_RELEASE_1_3}
profiles: ["app"]
volumes:
- config-volume:/config-inject:ro
@@ -91,5 +64,4 @@ networks:
name: attendancesystem-network
volumes:
mongodb_data:
config-volume:

107
install.sh Normal file → Executable file
View File

@@ -28,7 +28,7 @@ NC='\033[0m'
# ─── Repositório Git ──────────────────────────────────────────
INSTALL_DIR="attendancesystem"
BRANCH="${BRANCH:-main}"
BRANCH="${BRANCH:-feature/SDA-304}"
ENV_FILE=""
GIT_REPO="https://git.seventh.com.br/seventh.p7/attendance-system.install.git"
@@ -91,6 +91,24 @@ 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
@@ -221,33 +239,24 @@ collect_system_base() {
collect_internal_ports() {
print_section "3. Portas Internas (rede local)"
ask BACKEND_SUITE_API_INTERNAL_PORT "Backend Suite API" "${BACKEND_SUITE_API_INTERNAL_PORT:-10101}"
ask BACKEND_PEOPLE_API_INTERNAL_PORT "Backend People API" "${BACKEND_PEOPLE_API_INTERNAL_PORT:-10100}"
ask BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT "Backend AttendanceSystem API" "${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT:-10102}"
ask BACKEND_ACCOUNT_API_INTERNAL_PORT "Backend Account API" "${BACKEND_ACCOUNT_API_INTERNAL_PORT:-10103}"
ask FRONTEND_SUITE_APP_INTERNAL_PORT "Frontend Suite" "${FRONTEND_SUITE_APP_INTERNAL_PORT:-4200}"
ask FRONTEND_PEOPLE_APP_INTERNAL_PORT "Frontend People" "${FRONTEND_PEOPLE_APP_INTERNAL_PORT:-4201}"
ask FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT "Frontend AttendanceSystem" "${FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT:-4202}"
ask FRONTEND_ACCOUNT_APP_INTERNAL_PORT "Frontend Account" "${FRONTEND_ACCOUNT_APP_INTERNAL_PORT:-4203}"
}
collect_external_ports() {
print_section "4. Portas Externas (NAT/acesso remoto)"
echo -e " ${DIM}Pressione ENTER para usar a mesma porta interna.${NC}\n"
ask BACKEND_SUITE_API_EXTERNAL_PORT "Backend Suite API" "${BACKEND_SUITE_API_EXTERNAL_PORT:-$BACKEND_SUITE_API_INTERNAL_PORT}"
ask BACKEND_PEOPLE_API_EXTERNAL_PORT "Backend People API" "${BACKEND_PEOPLE_API_EXTERNAL_PORT:-$BACKEND_PEOPLE_API_INTERNAL_PORT}"
ask BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT "Backend AttendanceSystem API" "${BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT:-$BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}"
ask BACKEND_ACCOUNT_API_EXTERNAL_PORT "Backend Account API" "${BACKEND_ACCOUNT_API_EXTERNAL_PORT:-$BACKEND_ACCOUNT_API_INTERNAL_PORT}"
ask FRONTEND_SUITE_APP_EXTERNAL_PORT "Frontend Suite" "${FRONTEND_SUITE_APP_EXTERNAL_PORT:-$FRONTEND_SUITE_APP_INTERNAL_PORT}"
ask FRONTEND_PEOPLE_APP_EXTERNAL_PORT "Frontend People" "${FRONTEND_PEOPLE_APP_EXTERNAL_PORT:-$FRONTEND_PEOPLE_APP_INTERNAL_PORT}"
ask FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT "Frontend AttendanceSystem" "${FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT:-$FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT}"
ask FRONTEND_ACCOUNT_APP_EXTERNAL_PORT "Frontend Account" "${FRONTEND_ACCOUNT_APP_EXTERNAL_PORT:-$FRONTEND_ACCOUNT_APP_INTERNAL_PORT}"
}
collect_database() {
print_section "5. Banco de Dados"
ask MONGO_PORT "MongoDB (porta interna)" "${MONGO_PORT:-27017}"
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:-}"
}
# ══════════════════════════════════════════════════════════════
@@ -269,18 +278,12 @@ collect_config() {
else
collect_internal_ports
# Copia internas → externas automaticamente
BACKEND_SUITE_API_EXTERNAL_PORT="$BACKEND_SUITE_API_INTERNAL_PORT"
BACKEND_PEOPLE_API_EXTERNAL_PORT="$BACKEND_PEOPLE_API_INTERNAL_PORT"
BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT="$BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT"
BACKEND_ACCOUNT_API_EXTERNAL_PORT="$BACKEND_ACCOUNT_API_INTERNAL_PORT"
FRONTEND_SUITE_APP_EXTERNAL_PORT="$FRONTEND_SUITE_APP_INTERNAL_PORT"
FRONTEND_PEOPLE_APP_EXTERNAL_PORT="$FRONTEND_PEOPLE_APP_INTERNAL_PORT"
FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT="$FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT"
FRONTEND_ACCOUNT_APP_EXTERNAL_PORT="$FRONTEND_ACCOUNT_APP_INTERNAL_PORT"
print_ok "Portas externas definidas iguais às internas."
fi
collect_database
collect_container_postfix
}
# ══════════════════════════════════════════════════════════════
@@ -303,15 +306,19 @@ show_summary() {
echo -e " Porta : ${BOLD}${SYSTEM_BASE_PORT}${NC}"
echo ""
echo -e " ${BOLD}[3] Portas Internas${NC}"
echo -e " Backend Suite/People/Attendance/Account : ${BOLD}${BACKEND_SUITE_API_INTERNAL_PORT}${NC} / ${BOLD}${BACKEND_PEOPLE_API_INTERNAL_PORT}${NC} / ${BOLD}${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}${NC} / ${BOLD}${BACKEND_ACCOUNT_API_INTERNAL_PORT}${NC}"
echo -e " Frontend Suite/People/Attendance/Account : ${BOLD}${FRONTEND_SUITE_APP_INTERNAL_PORT}${NC} / ${BOLD}${FRONTEND_PEOPLE_APP_INTERNAL_PORT}${NC} / ${BOLD}${FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT}${NC} / ${BOLD}${FRONTEND_ACCOUNT_APP_INTERNAL_PORT}${NC}"
echo -e " Backend Attendance : ${BOLD}${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}${NC}"
echo -e " Frontend Attendance : ${BOLD}${FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT}${NC}"
echo ""
echo -e " ${BOLD}[4] Portas Externas${NC}"
echo -e " Backend Suite/People/Attendance/Account : ${BOLD}${BACKEND_SUITE_API_EXTERNAL_PORT}${NC} / ${BOLD}${BACKEND_PEOPLE_API_EXTERNAL_PORT}${NC} / ${BOLD}${BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT}${NC} / ${BOLD}${BACKEND_ACCOUNT_API_EXTERNAL_PORT}${NC}"
echo -e " Frontend Suite/People/Attendance/Account : ${BOLD}${FRONTEND_SUITE_APP_EXTERNAL_PORT}${NC} / ${BOLD}${FRONTEND_PEOPLE_APP_EXTERNAL_PORT}${NC} / ${BOLD}${FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT}${NC} / ${BOLD}${FRONTEND_ACCOUNT_APP_EXTERNAL_PORT}${NC}"
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] Banco de Dados${NC}"
echo -e " MongoDB : ${BOLD}${MONGO_PORT}${NC}"
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"
@@ -325,7 +332,7 @@ show_summary() {
2) collect_system_base ;;
3) collect_internal_ports ;;
4) collect_external_ports ;;
5) collect_database ;;
5) collect_container_postfix ;;
C) break ;;
X)
echo ""
@@ -350,26 +357,17 @@ 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_1=1.1
IMAGEM_RELEASE_1_2=1.2
IMAGEM_RELEASE_1_3=1.3
IMAGEM_RELEASE_1_4=1.4
IMAGEM_RELEASE_1_5=1.5
IMAGEM_RELEASE_1_6=1.6
IMAGEM_RELEASE_1_7=1.7
NGINX_DEFAULT_PORT=80
# ── MongoDB ───────────────────────────────────────────────
MONGO_PORT=${MONGO_PORT}
MONGODB_CONNECTION_STRING=mongodb://mongodb:27017/suitedb
MONGODB_DATABASE=suitedb
# ── Sistema Base ──────────────────────────────────────────
SYSTEM_BASE_CONN=${SYSTEM_BASE_CONN}
SYSTEM_BASE_HOST=${SYSTEM_BASE_HOST}
@@ -380,37 +378,23 @@ INTERNAL_HOST=${INTERNAL_HOST}
EXTERNAL_HOST=${EXTERNAL_HOST}
# ── Backend ───────────────────────────────────────────────
BACKEND_SUITE_API_INTERNAL_PORT=${BACKEND_SUITE_API_INTERNAL_PORT}
BACKEND_SUITE_API_EXTERNAL_PORT=${BACKEND_SUITE_API_EXTERNAL_PORT}
BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT=${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}
BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT=${BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT}
BACKEND_PEOPLE_API_INTERNAL_PORT=${BACKEND_PEOPLE_API_INTERNAL_PORT}
BACKEND_PEOPLE_API_EXTERNAL_PORT=${BACKEND_PEOPLE_API_EXTERNAL_PORT}
BACKEND_ACCOUNT_API_INTERNAL_PORT=${BACKEND_ACCOUNT_API_INTERNAL_PORT}
BACKEND_ACCOUNT_API_EXTERNAL_PORT=${BACKEND_ACCOUNT_API_EXTERNAL_PORT}
BACKEND_ATTENDANCESYSTEM_API_APPLICATIONNAME=AttendanceSystem
BACKEND_ATTENDANCESYSTEM_API_NAME=attendancesystem-api
# ── Frontend ──────────────────────────────────────────────
FRONTEND_SUITE_APP_INTERNAL_PORT=${FRONTEND_SUITE_APP_INTERNAL_PORT}
FRONTEND_SUITE_APP_EXTERNAL_PORT=${FRONTEND_SUITE_APP_EXTERNAL_PORT}
FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT=${FRONTEND_ATTENDANCESYSTEM_APP_INTERNAL_PORT}
FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT=${FRONTEND_ATTENDANCESYSTEM_APP_EXTERNAL_PORT}
FRONTEND_PEOPLE_APP_INTERNAL_PORT=${FRONTEND_PEOPLE_APP_INTERNAL_PORT}
FRONTEND_PEOPLE_APP_EXTERNAL_PORT=${FRONTEND_PEOPLE_APP_EXTERNAL_PORT}
FRONTEND_ACCOUNT_APP_INTERNAL_PORT=${FRONTEND_ACCOUNT_APP_INTERNAL_PORT}
FRONTEND_ACCOUNT_APP_EXTERNAL_PORT=${FRONTEND_ACCOUNT_APP_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"
}
@@ -430,15 +414,12 @@ start_environment() {
echo -e " ║ ✅ Instalação concluída com sucesso! ║"
echo -e " ╚══════════════════════════════════════════════╝${NC}"
echo ""
echo -e " Acesse o sistema em:"
echo -e " ${CYAN}${BOLD} ${SYSTEM_BASE_CONN}${NC}"
echo -e " Menu do usuário: Monitoramento (beta)"
echo -e " Menu do usuário: Monitoramento V1"
echo ""
echo -e " Comandos úteis (dentro da pasta ${BOLD}${INSTALL_DIR}${NC}):"
echo -e " ${BOLD}make install${NC} → sobe o projeto"
echo -e " ${BOLD}make update${NC} → atualiza o projeto"
echo -e " ${BOLD}make app${NC} → sobe apenas a aplicação"
echo -e " ${BOLD}make infra${NC} → sobe apenas a infra (MongoDB)"
echo -e " ${BOLD}make nuke-project${NC} → limpa o projeto"
echo -e " ${BOLD}make nuke${NC} → limpa tudo (cuidado!)"
echo ""