Skip to content

Commit 01d003e

Browse files
tom-sapletta-comtom-sapletta-com
committed
tests
1 parent a1b277b commit 01d003e

4 files changed

Lines changed: 281 additions & 50 deletions

File tree

‎.env.example‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RPI_API_INTERNAL_PORT=8081
3636
# ZEBRA PRINTER 1
3737
# -----------------------------------------------------------------------------
3838
ZEBRA_1_ENABLED=true
39-
ZEBRA_1_NAME=ZEBRA-001
39+
ZEBRA_1_NAME=ZEBRA-192.168.9.165
4040
ZEBRA_1_MODEL=ZT230
4141
ZEBRA_1_HOST=192.168.9.165
4242
ZEBRA_1_SOCKET_PORT=9100
@@ -49,9 +49,9 @@ ZEBRA_1_INTERNAL_WEB_PORT=8080
4949
# ZEBRA PRINTER 2
5050
# -----------------------------------------------------------------------------
5151
ZEBRA_2_ENABLED=true
52-
ZEBRA_2_NAME=ZEBRA-002
52+
ZEBRA_2_NAME=ZEBRA-192.168.8.166
5353
ZEBRA_2_MODEL=ZT410
54-
ZEBRA_2_HOST=192.168.9.165
54+
ZEBRA_2_HOST=192.168.8.166
5555
ZEBRA_2_SOCKET_PORT=9100
5656
ZEBRA_2_CONTAINER_NAME=zebra-printer-2
5757
ZEBRA_2_EXTERNAL_SOCKET_PORT=9101

‎Makefile‎

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ prod: ## Uruchamia tryb produkcyjny (tylko RPI Server)
5151
@echo "$(YELLOW)[!] Uzywa zewnetrznych: MSSQL, Zebra printers$(RESET)"
5252
@docker-compose -f docker-compose.prod.yml down --remove-orphans 2>/dev/null || true
5353
@docker network rm prinet_wapro-network 2>/dev/null || true
54-
@docker-compose -f docker-compose.prod.yml up -d --build
54+
@docker-compose -f docker-compose.prod.yml up --build
5555
@echo ""
5656
@echo "$(GREEN)[+] RPI Server uruchomiony$(RESET)"
5757
@docker-compose -f docker-compose.prod.yml ps
@@ -70,10 +70,10 @@ prod-status: ## Status trybu produkcyjnego
7070
@echo "$(BLUE)[i] Status produkcyjny:$(RESET)"
7171
@docker-compose -f docker-compose.prod.yml ps
7272
@echo ""
73-
@echo "$(BLUE)[i] Konfiguracja zewnetrzna:$(RESET)"
74-
@echo " MSSQL: $${MSSQL_HOST:-nie ustawiono}:$${MSSQL_PORT:-1433}"
75-
@echo " Zebra 1: $${ZEBRA_1_HOST:-nie ustawiono}:$${ZEBRA_1_SOCKET_PORT:-9100}"
76-
@echo " Zebra 2: $${ZEBRA_2_HOST:-nie ustawiono}:$${ZEBRA_2_SOCKET_PORT:-9100}"
73+
@echo "$(BLUE)[i] Konfiguracja zewnetrzna (z .env):$(RESET)"
74+
@. ./.env 2>/dev/null; echo " MSSQL: $${MSSQL_HOST:-nie ustawiono}:$${MSSQL_PORT:-1433}"
75+
@. ./.env 2>/dev/null; echo " Zebra 1: $${ZEBRA_1_HOST:-nie ustawiono}:$${ZEBRA_1_SOCKET_PORT:-9100}"
76+
@. ./.env 2>/dev/null; echo " Zebra 2: $${ZEBRA_2_HOST:-nie ustawiono}:$${ZEBRA_2_SOCKET_PORT:-9100}"
7777

7878
prod-build: ## Buduje obraz produkcyjny
7979
@echo "$(YELLOW)[B] Budowanie obrazu produkcyjnego...$(RESET)"
@@ -154,15 +154,39 @@ rebuild: ## Przebudowuje wszystkie obrazy (bez cache)
154154

155155
status: ## Pokazuje status wszystkich serwisow
156156
@echo "$(BLUE)[i] Status serwisow:$(RESET)"
157-
@docker-compose --profile full ps 2>/dev/null || sudo docker-compose --profile full ps
157+
@docker-compose --profile full ps 2>/dev/null || docker ps --format " {{.Names}}: {{.Status}}" 2>/dev/null | grep -E "rpi|zebra|mssql|prinet" || echo " Brak uruchomionych kontenerow"
158158
@echo ""
159-
@echo "$(BLUE)[i] Dostepne interfejsy (porty z .env):$(RESET)"
160-
@echo " RPI Server GUI: $(GREEN)http://localhost:$${RPI_GUI_EXTERNAL_PORT:-8082}$(RESET)"
161-
@echo " RPI Server API: $(GREEN)http://localhost:$${RPI_API_EXTERNAL_PORT:-8081}$(RESET)"
162-
@echo " ZEBRA Printer 1: $(GREEN)http://localhost:$${ZEBRA_1_EXTERNAL_WEB_PORT:-8091}$(RESET)"
163-
@echo " ZEBRA Printer 2: $(GREEN)http://localhost:$${ZEBRA_2_EXTERNAL_WEB_PORT:-8092}$(RESET)"
164-
@echo " Monitoring: $(GREEN)http://localhost:$${GRAFANA_PORT:-3000}$(RESET)"
165-
@echo " MSSQL WAPROMAG: $(GREEN)localhost:$${MSSQL_EXTERNAL_PORT:-1433}$(RESET)"
159+
@echo "$(BLUE)[i] Dostepne interfejsy:$(RESET)"
160+
@if curl -s --connect-timeout 1 http://localhost:$${RPI_GUI_EXTERNAL_PORT:-8082}/health >/dev/null 2>&1; then \
161+
echo " RPI Server GUI: $(GREEN)[+] http://localhost:$${RPI_GUI_EXTERNAL_PORT:-8082}$(RESET)"; \
162+
else \
163+
echo " RPI Server GUI: $(RED)[-] OFFLINE$(RESET)"; \
164+
fi
165+
@if curl -s --connect-timeout 1 http://localhost:$${RPI_API_EXTERNAL_PORT:-8081}/health >/dev/null 2>&1; then \
166+
echo " RPI Server API: $(GREEN)[+] http://localhost:$${RPI_API_EXTERNAL_PORT:-8081}$(RESET)"; \
167+
else \
168+
echo " RPI Server API: $(RED)[-] OFFLINE$(RESET)"; \
169+
fi
170+
@if curl -s --connect-timeout 1 http://localhost:$${ZEBRA_1_EXTERNAL_WEB_PORT:-8091}/api/status >/dev/null 2>&1; then \
171+
echo " ZEBRA Printer 1: $(GREEN)[+] http://localhost:$${ZEBRA_1_EXTERNAL_WEB_PORT:-8091}$(RESET)"; \
172+
else \
173+
echo " ZEBRA Printer 1: $(RED)[-] OFFLINE$(RESET)"; \
174+
fi
175+
@if curl -s --connect-timeout 1 http://localhost:$${ZEBRA_2_EXTERNAL_WEB_PORT:-8092}/api/status >/dev/null 2>&1; then \
176+
echo " ZEBRA Printer 2: $(GREEN)[+] http://localhost:$${ZEBRA_2_EXTERNAL_WEB_PORT:-8092}$(RESET)"; \
177+
else \
178+
echo " ZEBRA Printer 2: $(RED)[-] OFFLINE$(RESET)"; \
179+
fi
180+
@if curl -s --connect-timeout 1 http://localhost:$${GRAFANA_PORT:-3000} >/dev/null 2>&1; then \
181+
echo " Monitoring: $(GREEN)[+] http://localhost:$${GRAFANA_PORT:-3000}$(RESET)"; \
182+
else \
183+
echo " Monitoring: $(YELLOW)[?] OFFLINE$(RESET)"; \
184+
fi
185+
@if nc -z localhost $${MSSQL_EXTERNAL_PORT:-1433} 2>/dev/null; then \
186+
echo " MSSQL WAPROMAG: $(GREEN)[+] localhost:$${MSSQL_EXTERNAL_PORT:-1433}$(RESET)"; \
187+
else \
188+
echo " MSSQL WAPROMAG: $(RED)[-] OFFLINE$(RESET)"; \
189+
fi
166190

167191
health: ## Sprawdza stan zdrowia wszystkich serwisów
168192
@echo "$(BLUE)[H] Health Check:$(RESET)"

‎docker-compose.yml‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ services:
9898
- FLASK_RUN_PORT=${ZEBRA_1_INTERNAL_WEB_PORT:-8080}
9999
networks:
100100
wapro-network:
101-
ipv4_address: 192.168.9.31
101+
ipv4_address: 192.168.9.165
102102
healthcheck:
103103
test: ["CMD", "nc", "-z", "localhost", "9100"]
104104
interval: 15s
@@ -109,33 +109,6 @@ services:
109109
- zebra
110110
- full
111111

112-
# ---------------------------------------------------------------------------
113-
# ZEBRA PRINTER 2 (Mock)
114-
# ---------------------------------------------------------------------------
115-
zebra-printer-2:
116-
build: ./zebra-printer-2
117-
container_name: ${ZEBRA_2_CONTAINER_NAME:-zebra-printer-2}
118-
ports:
119-
- "${ZEBRA_2_EXTERNAL_SOCKET_PORT:-9101}:9100"
120-
- "${ZEBRA_2_EXTERNAL_WEB_PORT:-8092}:${ZEBRA_2_INTERNAL_WEB_PORT:-8080}"
121-
environment:
122-
- PRINTER_NAME=${ZEBRA_2_NAME:-ZEBRA-002}
123-
- PRINTER_MODEL=${ZEBRA_2_MODEL:-ZT410}
124-
- PRINTER_IP=${ZEBRA_2_HOST:-zebra-printer-2}
125-
- PRINTER_SOCKET_PORT=9100
126-
- FLASK_RUN_PORT=${ZEBRA_2_INTERNAL_WEB_PORT:-8080}
127-
networks:
128-
wapro-network:
129-
ipv4_address: 192.168.9.32
130-
healthcheck:
131-
test: ["CMD", "nc", "-z", "localhost", "9100"]
132-
interval: 15s
133-
timeout: 5s
134-
retries: 3
135-
profiles:
136-
- zebra2
137-
- zebra
138-
- full
139112

140113
# ---------------------------------------------------------------------------
141114
# TEST RUNNER

0 commit comments

Comments
 (0)