Skip to content

Commit 5f24825

Browse files
committed
fix(docker): simplify local data cleanup
1 parent e5c6431 commit 5f24825

2 files changed

Lines changed: 5 additions & 14 deletions

File tree

docker/Makefile

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ endif
4646
VERSION ?= v4.5.0
4747
REGISTRY ?= pgsty
4848
NAME ?= pigsty
49-
DATA ?= $(PWD)/data
5049

5150
# Port mappings (host:container)
5251
SSH_PORT ?= 2222
@@ -90,7 +89,7 @@ help:
9089
@echo "Alternative (docker run):"
9190
@echo " make run # Run with docker run"
9291
@echo " make clean # Stop and remove container"
93-
@echo " make purge # Remove container + delete data"
92+
@echo " make purge # Remove container + delete ./data"
9493
@echo ""
9594
@echo "Container Access:"
9695
@echo " make exec # Bash into container"
@@ -187,12 +186,12 @@ push:
187186
# Container Run (docker run alternative)
188187
#--------------------------------------------------------------#
189188
run:
190-
@mkdir -p $(DATA)
189+
@mkdir -p -- ./data
191190
docker run -d --privileged \
192191
--platform=linux/$(ARCH) \
193192
--name=$(NAME) \
194193
--hostname=$(NAME) \
195-
-v $(DATA):/data \
194+
-v "$$(pwd -P)/data:/data" \
196195
-p $(SSH_PORT):22 \
197196
-p $(HTTP_PORT):80 \
198197
-p $(HTTPS_PORT):443 \
@@ -216,15 +215,7 @@ rm:
216215
clean: stop rm
217216

218217
purge: clean
219-
@echo ""
220-
@echo "WARNING: This will DELETE all data in ./data"
221-
@echo ""
222-
@for i in 2 1; do \
223-
echo " Deleting in $$i... (Ctrl+C to cancel)"; \
224-
sleep 1; \
225-
done
226-
rm -rf $(DATA)
227-
@echo "Data removed."
218+
rm -rf -- ./data
228219

229220

230221
#--------------------------------------------------------------#

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ make push # Build and push multi-arch image
9898
```bash
9999
make run # Run with docker run
100100
make clean # Stop and remove
101-
make purge # Remove + delete data
101+
make purge # Remove + delete ./data
102102
```
103103

104104
### Container Access

0 commit comments

Comments
 (0)