feat(makefile): add docker pull/rebuild and dual tags (TAG1/TAG2); drop TAG\n\n- build/rebuild now tag with TAG1/TAG2\n- add docker pull (both tags)\n- push handles both tags\n- docs updated (README, docs/*)\n- examples migrated to TAG1/TAG2
This commit is contained in:
12
docs/faq.md
12
docs/faq.md
@@ -6,10 +6,10 @@
|
||||
**A:** Установите WSL2 или используйте Git Bash:
|
||||
```bash
|
||||
# В Git Bash
|
||||
make docker build IMAGE=myapp TAG=latest
|
||||
make docker build IMAGE=myapp TAG1=latest TAG2=v1.0.0
|
||||
|
||||
# Или через WSL2
|
||||
wsl make docker build IMAGE=myapp TAG=latest
|
||||
wsl make docker build IMAGE=myapp TAG1=latest TAG2=v1.0.0
|
||||
```
|
||||
|
||||
### Q: Можно ли использовать с Docker Compose?
|
||||
@@ -30,14 +30,14 @@ services:
|
||||
```bash
|
||||
# .git/hooks/post-commit
|
||||
#!/bin/bash
|
||||
make docker build IMAGE=myapp TAG=$(git rev-parse --short HEAD)
|
||||
make docker build IMAGE=myapp TAG1=$(git rev-parse --short HEAD)
|
||||
```
|
||||
|
||||
### Q: Можно ли использовать с Kubernetes?
|
||||
**A:** Да, после сборки образа:
|
||||
```bash
|
||||
# Сборка образа
|
||||
make docker build IMAGE=myapp TAG=v1.0.0
|
||||
make docker build IMAGE=myapp TAG1=v1.0.0
|
||||
|
||||
# Применение в Kubernetes
|
||||
kubectl apply -f k8s/
|
||||
@@ -47,7 +47,7 @@ kubectl apply -f k8s/
|
||||
**A:** Используйте кэширование и .dockerignore:
|
||||
```bash
|
||||
# Сборка с кэшем
|
||||
make docker build IMAGE=myapp TAG=v1.0.0
|
||||
make docker build IMAGE=myapp TAG1=v1.0.0
|
||||
|
||||
# Создание .dockerignore
|
||||
echo "node_modules" >> .dockerignore
|
||||
@@ -86,7 +86,7 @@ make docker push IMAGE=myapp TAG=v1.0.0 REGISTRY=your-private-registry.com
|
||||
# Сборка для ARM64
|
||||
make docker build \
|
||||
IMAGE=myapp \
|
||||
TAG=v1.0.0 \
|
||||
TAG1=v1.0.0 \
|
||||
USE_BUILDX=1 \
|
||||
PLATFORMS=linux/arm64
|
||||
```
|
||||
|
||||
Reference in New Issue
Block a user