From 6e080b1c2a7bc77f8e90717f9b2addd9b554ddb4 Mon Sep 17 00:00:00 2001 From: Gabriel Radureau Date: Tue, 7 Apr 2026 13:45:10 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F=20chore:=20remove=20unuse?= =?UTF-8?q?d=20files=20and=20update=20ADR=20with=20cleanup=20information?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adr/0020-docker-build-strategy.md | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/adr/0020-docker-build-strategy.md b/adr/0020-docker-build-strategy.md index 353d8a2..3190817 100644 --- a/adr/0020-docker-build-strategy.md +++ b/adr/0020-docker-build-strategy.md @@ -446,13 +446,35 @@ echo "Hash: $DEPS_HASH" docker run --rm -i hadolint/hadolint < Dockerfile.prod ``` +## Cleanup and Organization + +### Files Removed + +1. **docker-compose.cicd-test.yml**: Unused Docker Compose file +2. **scripts/cicd/**: Old CI/CD test scripts (replaced by main test scripts) + +### Files Organized + +All Dockerfiles moved to `docker/` directory: +- `docker/Dockerfile` - Development +- `docker/Dockerfile.build` - Build cache +- `docker/Dockerfile.prod` - Production (dev only) +- `docker/Dockerfile.prod.template` - Template + +### Utility Scripts + +- `scripts/calculate-deps-hash.sh` - Consistent hash calculation +- `scripts/test-local-ci-cd.sh` - Main local testing +- `scripts/test-build-cache-environment.sh` - Build cache testing + ## Expected Outcomes -1. **Successful workflow execution**: Workflow 419 completes without errors +1. **Successful workflow execution**: Workflow completes without errors 2. **Cache image created**: Build cache image pushed to registry -3. **Production image built**: Final Docker image built using `Dockerfile.prod` +3. **Production image built**: Final Docker image built using generated `docker/Dockerfile.prod` 4. **Faster CI execution**: Reduced build times compared to previous approach 5. **No certificate errors**: No TLS certificate verification failures +6. **Clean organization**: No clutter in root directory ## References