#develop - ajuste na variável do sistema base

Makefile

@@ -50,7 +50,7 @@ app:
 		--env-file $(ENV_FILE) \
 		--profile app \
 		-f $(COMPOSE_FILE) \
-		up -d --pull never
+		up -d --pull never --force-recreate
 
 # ===============================
 # 🔥 Subir TUDO
@@ -71,7 +71,7 @@ install:
 		--profile infra \
 		--profile app \
 		-f $(COMPOSE_FILE) \
-		up -d --pull never
+		up -d --pull never --force-recreate
 
 # ===============================
 # 🔄 Atualizar projeto

config.template.json

@@ -10,12 +10,14 @@
     "suite": "${FRONTEND_SUITE_URL}",
     "attendance": "${FRONTEND_ATTENDANCE_URL}",
     "account": "${FRONTEND_ACCOUNT_URL}",
-    "people": "${FRONTEND_PEOPLE_URL}"
+    "people": "${FRONTEND_PEOPLE_URL}",
+    "reports": "${FRONTEND_REPORTS_URL}"
   },
   "api": {
     "suite": "${BACKEND_SUITE_API_URL}",
     "people": "${BACKEND_PEOPLE_API_URL}",
     "account": "${BACKEND_ACCOUNT_API_URL}",
-    "attendance": "${BACKEND_ATTENDANCE_API_URL}"
+    "attendance": "${BACKEND_ATTENDANCE_API_URL}",
+    "reports": "${BACKEND_REPORTS_API_URL}"
   }
 }

docker-compose.yml

@@ -30,11 +30,31 @@ services:
       - 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}
+      - KEEPALIVE_REPORTS_BACKEND_HOST=${KEEPALIVE_REPORTS_BACKEND_HOST}
+      - KEEPALIVE_REPORTS_FRONTEND_HOST=${KEEPALIVE_REPORTS_FRONTEND_HOST}
+    networks:
+      - app-network
+
+  reports-api:
+    image: ${DOCKER_REPO}/sca-reports-api:${IMAGEM_UNSTABLE_LATEST}
+    profiles: ["app"]
+    ports:
+      - "${BACKEND_REPORTS_API_INTERNAL_PORT}:${BACKEND_REPORTS_API_INTERNAL_PORT}"
+    environment:
+      - ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT}
+      - MONGODB_CONNECTION_STRING=${MONGODB_CONNECTION_STRING}
+      - MONGODB_DATABASE=${MONGODB_DATABASE}
+      - SystemBaseConn=${SYSTEM_BASE_CONN}
+      - FRONTEND_CONN=${INTERNAL_HOST}:${FRONTEND_REPORTS_APP_INTERNAL_PORT}
+      - KEEPALIVE_ATTENDANCE_SYSTEM_BACKEND_HOST=${KEEPALIVE_ATTENDANCE_SYSTEM_BACKEND_HOST}
+      - KEEPALIVE_ATTENDANCE_SYSTEM_FRONTEND_HOST=${KEEPALIVE_ATTENDANCE_SYSTEM_FRONTEND_HOST}
+      - KEEPALIVE_REPORTS_BACKEND_HOST=${KEEPALIVE_REPORTS_BACKEND_HOST}
+      - KEEPALIVE_REPORTS_FRONTEND_HOST=${KEEPALIVE_REPORTS_FRONTEND_HOST}
     networks:
       - app-network
 
   attendancesystem-api:
-    image: ${DOCKER_REPO}/backend-attendance-system-api:${IMAGEM_RELEASE_1_1}
+    image: ${DOCKER_REPO}/backend-attendance-system-api:${IMAGEM_UNSTABLE_LATEST}
     profiles: ["app"]
     ports:
       - "${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}:${BACKEND_ATTENDANCESYSTEM_API_INTERNAL_PORT}"
@@ -60,6 +80,8 @@ services:
       - BACKEND_ATTENDANCE_API_URL=${EXTERNAL_HOST}:${BACKEND_ATTENDANCESYSTEM_API_EXTERNAL_PORT}
       - BACKEND_PEOPLE_API_URL=${EXTERNAL_HOST}:${BACKEND_PEOPLE_API_EXTERNAL_PORT}
       - BACKEND_ACCOUNT_API_URL=${EXTERNAL_HOST}:${BACKEND_ACCOUNT_API_EXTERNAL_PORT}
+      - BACKEND_REPORTS_API_URL=${EXTERNAL_HOST}:${BACKEND_REPORTS_API_EXTERNAL_PORT}
+      - FRONTEND_REPORTS_URL=${EXTERNAL_HOST}:${FRONTEND_REPORTS_APP_EXTERNAL_PORT}
     command: >
       sh -c "apk add --no-cache gettext &&
             envsubst < /config.template.json > /output/config.json &&
@@ -71,7 +93,7 @@ services:
     restart: "no"
 
   attendancesystem-app:
-    image: ${DOCKER_REPO}/attendancesystem-frontend:${IMAGEM_RELEASE_1_1}
+    image: ${DOCKER_REPO}/attendancesystem-frontend:${IMAGEM_RELEASE}
     profiles: ["app"]
     volumes:
       - config-volume:/config-inject:ro
@@ -86,6 +108,38 @@ services:
       config-generator:
         condition: service_completed_successfully
 
+  reports-app:
+    image: ${DOCKER_REPO}/reports-app:${IMAGEM_UNSTABLE_LATEST}
+    profiles: ["app"]
+    volumes:
+      - config-volume:/config-inject:ro
+    entrypoint: >
+      sh -c "cp /config-inject/config.json /usr/share/nginx/html/config.json &&
+             nginx -g 'daemon off;'"
+    ports:
+      - "${FRONTEND_REPORTS_APP_INTERNAL_PORT}:${NGINX_DEFAULT_PORT}"
+    networks:
+      - app-network
+    depends_on:
+      config-generator:
+        condition: service_completed_successfully
+
+  suite-app:
+    image: ${DOCKER_REPO}/suite-app:${IMAGEM_UNSTABLE_LATEST}
+    profiles: ["app"]
+    volumes:
+      - config-volume:/config-inject:ro
+    entrypoint: >
+      sh -c "cp /config-inject/config.json /usr/share/nginx/html/config.json &&
+             nginx -g 'daemon off;'"
+    ports:
+      - "${FRONTEND_SUITE_APP_INTERNAL_PORT}:${NGINX_DEFAULT_PORT}"
+    networks:
+      - app-network
+    depends_on:
+      config-generator:
+        condition: service_completed_successfully
+
 networks:
   app-network:
     name: attendancesystem-network

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:-main}"
+BRANCH="${BRANCH:-develop}"
 ENV_FILE=""
 GIT_REPO="https://git.seventh.com.br/seventh.p7/attendance-system.install.git"
 
@@ -225,10 +225,12 @@ collect_internal_ports() {
   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 BACKEND_REPORTS_API_INTERNAL_PORT           "Backend Reports API"           "${BACKEND_REPORTS_API_INTERNAL_PORT:-10105}"
   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}"
+  ask FRONTEND_REPORTS_APP_INTERNAL_PORT          "Frontend Reports"              "${FRONTEND_REPORTS_APP_INTERNAL_PORT:-4205}"
 }
 
 collect_external_ports() {
@@ -239,10 +241,12 @@ collect_external_ports() {
   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 BACKEND_REPORTS_API_EXTERNAL_PORT           "Backend Reports API"           "${BACKEND_REPORTS_API_EXTERNAL_PORT:-$BACKEND_REPORTS_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}"
+  ask FRONTEND_REPORTS_APP_EXTERNAL_PORT          "Frontend Reports"              "${FRONTEND_REPORTS_APP_EXTERNAL_PORT:-$FRONTEND_REPORTS_APP_INTERNAL_PORT}"
 }
 
 collect_database() {
@@ -273,10 +277,12 @@ collect_config() {
     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"
+    BACKEND_REPORTS_API_EXTERNAL_PORT="$BACKEND_REPORTS_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"
+    FRONTEND_REPORTS_APP_EXTERNAL_PORT="$FRONTEND_REPORTS_APP_INTERNAL_PORT"
     print_ok "Portas externas definidas iguais às internas."
   fi
 
@@ -303,12 +309,12 @@ 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 "      Backend  Suite/People/Attendance/Account/Reports : ${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} / ${BOLD}${BACKEND_REPORTS_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 "      Frontend Suite/People/Attendance/Account/Reports : ${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} / ${BOLD}${FRONTEND_REPORTS_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 "      Backend  Suite/People/Attendance/Account/Reports : ${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} / ${BOLD}${BACKEND_REPORTS_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 "      Frontend Suite/People/Attendance/Account/Reports : ${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} / ${BOLD}${FRONTEND_REPORTS_APP_EXTERNAL_PORT}${NC}"
     echo ""
     echo -e "  ${BOLD}[5] Banco de Dados${NC}"
     echo -e "      MongoDB : ${BOLD}${MONGO_PORT}${NC}"
@@ -348,21 +354,19 @@ generate_envs() {
 
   local BASE_DIR="$INSTALL_DIR"
   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 KEEPALIVE_BACKEND_REPORTS="${EXTERNAL_HOST}:${BACKEND_REPORTS_API_EXTERNAL_PORT}"
+  local KEEPALIVE_FRONTEND_REPORTS="${EXTERNAL_HOST}:${FRONTEND_REPORTS_APP_EXTERNAL_PORT}"
+
   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=2.0
-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 ───────────────────────────────────────────────
@@ -392,6 +396,9 @@ 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_REPORTS_API_INTERNAL_PORT=${BACKEND_REPORTS_API_INTERNAL_PORT}
+BACKEND_REPORTS_API_EXTERNAL_PORT=${BACKEND_REPORTS_API_EXTERNAL_PORT}
+
 BACKEND_ATTENDANCESYSTEM_API_APPLICATIONNAME=AttendanceSystem
 BACKEND_ATTENDANCESYSTEM_API_NAME=attendancesystem-api
 
@@ -408,9 +415,16 @@ 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}
 
+FRONTEND_REPORTS_APP_INTERNAL_PORT=${FRONTEND_REPORTS_APP_INTERNAL_PORT}
+FRONTEND_REPORTS_APP_EXTERNAL_PORT=${FRONTEND_REPORTS_APP_EXTERNAL_PORT}
+
 # ── Keepalive ─────────────────────────────────────────────
 KEEPALIVE_ATTENDANCE_SYSTEM_BACKEND_HOST=${KEEPALIVE_BACKEND}
 KEEPALIVE_ATTENDANCE_SYSTEM_FRONTEND_HOST=${KEEPALIVE_FRONTEND}
+
+KEEPALIVE_REPORTS_BACKEND_HOST=${KEEPALIVE_BACKEND_REPORTS}
+KEEPALIVE_REPORTS_FRONTEND_HOST=${KEEPALIVE_FRONTEND_REPORTS}
+
 EOF
   print_ok ".env.prod gerado"
 }