1
0
Fork 0

Migrate build assets and scripts to deploy/docker structure

- Removed `install.sh` and moved Docker-related assets to `deploy/docker`.
- Updated all Dockerfile references from `build/` to `deploy/docker/`.
- Refactored paths in E2E tests, Makefile, and documentation for consistency with new directory structure.
- Added `HAPROXY_STATS_CORS_ORIGIN` environment variable in `docker-compose.yml`.
This commit is contained in:
Joao Gilberto Magalhaes 2026-02-18 02:58:32 -05:00
parent 53c32499b5
commit 48f6e1f783
30 changed files with 20 additions and 49 deletions

View file

@ -13,6 +13,6 @@
1. Investigate the source code in src/*
2. Try to fix it.
3. After the code is changed, build it again: `docker build -t byjg/easy-haproxy:5.0.0 -f build/Dockerfile --no-cache .` and start the tests again.
3. After the code is changed, build it again: `docker build -t byjg/easy-haproxy:5.0.0 -f deploy/docker/Dockerfile --no-cache .` and start the tests again.

View file

@ -96,7 +96,7 @@ services:
haproxy:
build:
context: ../..
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
depends_on:
pebble_health:
condition: service_healthy

View file

@ -35,7 +35,7 @@ services:
haproxy:
build:
context: ../../
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -48,7 +48,7 @@ services:
haproxy:
build:
context: ../..
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -44,7 +44,7 @@ services:
haproxy:
build:
context: ../../
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -52,7 +52,7 @@ services:
haproxy:
build:
context: ../..
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -48,7 +48,7 @@ services:
haproxy:
build:
context: ../../
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -46,7 +46,7 @@ services:
haproxy:
build:
context: ../../
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -64,7 +64,7 @@ services:
haproxy:
build:
context: ../../
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -17,7 +17,7 @@ services:
haproxy:
build:
context: ../..
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -50,7 +50,7 @@ services:
haproxy:
build:
context: ../..
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
image: byjg/easy-haproxy:local
volumes:
- /var/run/docker.sock:/var/run/docker.sock

View file

@ -109,7 +109,7 @@ echo -e "${GREEN}✓ kind cluster '${CLUSTER_NAME}' is ready${NC}"
# Build and load local EasyHAProxy image
echo -e "${BLUE}[4/9] Building local EasyHAProxy image (may take 30-60s)...${NC}"
docker build -t byjg/easy-haproxy:local \
-f "${PROJECT_ROOT}/build/Dockerfile" \
-f "${PROJECT_ROOT}/deploy/docker/Dockerfile" \
"${PROJECT_ROOT}"
echo -e "${BLUE}[5/9] Loading image into kind cluster (may take 10-20s)...${NC}"

View file

@ -63,7 +63,7 @@ services:
image: byjg/easy-haproxy:local
build:
context: ../..
dockerfile: build/Dockerfile
dockerfile: deploy/docker/Dockerfile
volumes:
- ./conf/:/etc/easyhaproxy/static/
- ../static/host1.local.pem:/etc/easyhaproxy/certs/haproxy/host1.local.pem:ro

View file

@ -326,7 +326,7 @@ nodes:
project_root = BASE_DIR.parent
subprocess.run(
["docker", "build", "-t", "byjg/easy-haproxy:local",
"-f", str(project_root / "build" / "Dockerfile"),
"-f", str(project_root / "deploy" / "docker" / "Dockerfile"),
str(project_root)],
check=True,
capture_output=True,