From 29024e887ff720e49ddc2560a8bf79630fe7811f Mon Sep 17 00:00:00 2001 From: Luca Sacchi Ricciardi Date: Thu, 16 Apr 2026 17:12:10 +0200 Subject: [PATCH] Fix: Replace grep commands with docker inspect commands and remove ideograms --- .../explanation/docker-iam-parallels.md | 2 +- .../docker-network-vpc-parallels.md | 2 +- .../tutorial/02-implement-healthchecks.md | 2 +- .../how-to-guides/connect-to-postgresql.md | 6 +----- .../tutorial/02-data-persistence.md | 9 +++----- .../tutorial/03-security-compliance.md | 21 +++++++++++-------- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/labs/lab-01-iam/explanation/docker-iam-parallels.md b/labs/lab-01-iam/explanation/docker-iam-parallels.md index 16bbad4..285e5dc 100644 --- a/labs/lab-01-iam/explanation/docker-iam-parallels.md +++ b/labs/lab-01-iam/explanation/docker-iam-parallels.md @@ -38,7 +38,7 @@ AWS IAM, Azure IAM, Google Cloud IAM sono tutti basati sullo stesso concetto fon **Similitudine:** I gruppi rendono facile gestire i permessi per molti utenti. Aggiungi un utente al gruppo e ha automaticamente tutti i permessi del gruppo. -**Differenza:** I gruppi Linux sono definiti localmente, i gruppi IAM sono definiti centralmente e possono avere utenti跨-region. +**Differenza:** I gruppi Linux sono definiti localmente, i gruppi IAM sono definiti centralmente e possono avere utenti tra diverse regioni. ### Socket Docker = Service Endpoint diff --git a/labs/lab-02-network/explanation/docker-network-vpc-parallels.md b/labs/lab-02-network/explanation/docker-network-vpc-parallels.md index 1ae77ed..d93c991 100644 --- a/labs/lab-02-network/explanation/docker-network-vpc-parallels.md +++ b/labs/lab-02-network/explanation/docker-network-vpc-parallels.md @@ -23,7 +23,7 @@ AWS VPC, Azure VNet, Google Cloud VPC sono tutti basati sullo stesso concetto fo | `docker network create` | `aws ec2 create-vpc` | | Bridge network `lab02-vpc-public` | VPC `vpc-12345678` | | Subnet `10.0.1.0/24` | Subnet `subnet-abc123` | -| Driver `bridge` | VPC本身 (implicito) | +| Driver `bridge` | VPC stesso (implicito) | | `docker network ls` | `aws ec2 describe-vpcs` | **Similitudine:** Entrambi forniscono isolamento di rete e segmentazione IP. diff --git a/labs/lab-03-compute/tutorial/02-implement-healthchecks.md b/labs/lab-03-compute/tutorial/02-implement-healthchecks.md index 6cc20bb..014f836 100644 --- a/labs/lab-03-compute/tutorial/02-implement-healthchecks.md +++ b/labs/lab-03-compute/tutorial/02-implement-healthchecks.md @@ -75,7 +75,7 @@ services: | test | - | Comando da eseguire (richiesto) | | interval | 30s | Frequenza del check | | timeout | 30s | Tempo massimo per completare | -| retries | 3 | Tentativi prima di标记 unhealthy | +| retries | 3 | Tentativi prima di segnalare unhealthy | | start_period | 0s | Grace period all'avvio | --- diff --git a/labs/lab-05-database/how-to-guides/connect-to-postgresql.md b/labs/lab-05-database/how-to-guides/connect-to-postgresql.md index 74924a4..de54ed2 100644 --- a/labs/lab-05-database/how-to-guides/connect-to-postgresql.md +++ b/labs/lab-05-database/how-to-guides/connect-to-postgresql.md @@ -57,8 +57,4 @@ Nota: il servizio `lab05-app` usa `nginx:alpine` e non include `psql`. ### Password authentication failed -Verifica le credenziali in docker-compose.yml: - -```bash -grep POSTGRES_PASSWORD docker-compose.yml -``` +Verifica le credenziali nel file docker-compose.yml cercando le variabili POSTGRES_: diff --git a/labs/lab-05-database/tutorial/02-data-persistence.md b/labs/lab-05-database/tutorial/02-data-persistence.md index 057814f..b9f2c7c 100644 --- a/labs/lab-05-database/tutorial/02-data-persistence.md +++ b/labs/lab-05-database/tutorial/02-data-persistence.md @@ -199,14 +199,11 @@ Verifica che la configurazione sia INF-04 compliant. Esegui: ```bash -# Verifica volume montato -grep -A 20 "db:" docker-compose.yml | grep "/var/lib/postgresql/data" +# Verifica volume montato nel container +docker inspect lab05-db --format '{{json .Mounts}}' # Verifica volume nominativo -grep "db-data:" docker-compose.yml - -# Verifica driver local -grep -A 3 "volumes:" docker-compose.yml | grep -A 2 "db-data:" +docker volume ls | grep db-data ``` Tutte le verifiche devono passare. diff --git a/labs/lab-05-database/tutorial/03-security-compliance.md b/labs/lab-05-database/tutorial/03-security-compliance.md index 66f55a5..b07a22e 100644 --- a/labs/lab-05-database/tutorial/03-security-compliance.md +++ b/labs/lab-05-database/tutorial/03-security-compliance.md @@ -85,10 +85,10 @@ docker inspect lab05-db --format '{{.HostConfig.Memory}}' docker inspect lab05-db --format '{{.HostConfig.NanoCpus}}' ``` -Verifica con docker-compose: +Verifica i limiti risorse configurati nel compose: + ```bash -# Verifica configurazione compose -grep -A 10 "deploy:" docker-compose.yml | grep -A 5 "resources:" +docker inspect lab05-db --format '{{.HostConfig.Memory}} {{.HostConfig.NanoCpus}}' ``` Atteso: @@ -137,10 +137,13 @@ Lo script finale copre anche i controlli di sicurezza principali del lab. Le credenziali nel docker-compose.yml sono solo per laboratorio. -Esegui: -```bash -# Verifica credenziali attuali -grep POSTGRES_PASSWORD docker-compose.yml +Per visualizzarle, cerca le variabili POSTGRES_ nel file docker-compose.yml: + +```yaml +environment: + POSTGRES_DB: lab05_db + POSTGRES_USER: lab05_user + POSTGRES_PASSWORD: lab05_password ``` Per produzione (simulazione RDS): @@ -271,8 +274,8 @@ docker port lab05-db # Verifica Docker versione (>= 20.10 per deploy.resources) docker version --format '{{.Server.Version}}' -# Verifica che 'deploy' sia configurato -grep -A 20 "db:" docker-compose.yml | grep "deploy:" +# Verifica che 'deploy' sia configurato nel compose +docker compose config | grep -A 5 "deploy:" ``` ---