Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions k8s-manifests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ sudo systemctl restart docker
3. Build and push **ALL** images to local registry:

```bash
REGISTRY_URL=localhost:5000; find ./services -name Dockerfile | while read dockerfile; do context_dir=$(dirname "$dockerfile"); image_name=$(echo "$context_dir" | sed 's|^\./services/||; s|/|-|g'); full_tag="$REGISTRY_URL/storedog-$image_name:latest"; echo "Building $full_tag from $context_dir"; docker build -t "$full_tag" "$context_dir" && docker push "$full_tag"; done
REGISTRY_URL=localhost:5000; find ./services -name Dockerfile | while read dockerfile; do context_dir=$(dirname "$dockerfile"); image_name=$(echo "$context_dir" | sed 's|^\./services/||; s|/|-|g'); full_tag="$REGISTRY_URL/$image_name:latest"; echo "Building $full_tag from $context_dir"; docker build -t "$full_tag" "$context_dir" && docker push "$full_tag"; done
```

4. You may want to rebuild one service while testing. It helps to export the `REGISTRY_URL` so you don't need to keep setting it.
Expand All @@ -82,7 +82,7 @@ export REGISTRY_URL=localhost:5000
> Building and pushing containers to the local registry needs to be done on the worker node.

```bash
docker build -t $REGISTRY_URL/storedog-backend:latest ./services/backend && docker push $REGISTRY_URL/storedog-backend:latest
docker build -t $REGISTRY_URL/backend:latest ./services/backend && docker push $REGISTRY_URL/backend:latest
```

## Prerequisites
Expand Down
2 changes: 1 addition & 1 deletion k8s-manifests/storedog-app/deployments/ads.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
path: /var/run/datadog/
containers:
- name: ads
image: ${REGISTRY_URL}/storedog-ads-java:${SD_TAG} # (add if needed)
image: ${REGISTRY_URL}/ads-java:${SD_TAG}
ports:
- containerPort: 3030
env:
Expand Down
2 changes: 1 addition & 1 deletion k8s-manifests/storedog-app/deployments/backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
command: ['sh', '-c', 'until nc -z postgres 5432; do echo waiting for postgres; sleep 2; done;']
containers:
- name: backend
image: ${REGISTRY_URL}/storedog-backend:${SD_TAG}
image: ${REGISTRY_URL}/backend:${SD_TAG}
ports:
- containerPort: 4000
command: ["bundle", "exec", "rails", "s", "-b", "0.0.0.0", "-p", "4000"]
Expand Down
2 changes: 1 addition & 1 deletion k8s-manifests/storedog-app/deployments/discounts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
command: ['sh', '-c', 'until nc -z postgres 5432; do echo waiting for postgres; sleep 2; done;']
containers:
- name: discounts
image: ${REGISTRY_URL}/storedog-discounts:${SD_TAG}
image: ${REGISTRY_URL}/discounts:${SD_TAG}
ports:
- containerPort: 2814
command: ["ddtrace-run", "flask", "run", "--port=2814", "--host=0.0.0.0"]
Expand Down
2 changes: 1 addition & 1 deletion k8s-manifests/storedog-app/deployments/frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
command: ['sh', '-c', 'until nc -z backend 4000; do echo waiting for backend; sleep 2; done;']
containers:
- name: frontend
image: ${REGISTRY_URL}/storedog-frontend:${SD_TAG}
image: ${REGISTRY_URL}/frontend:${SD_TAG}
ports:
- containerPort: 3000
command: ["npm", "run", "dev"]
Expand Down
2 changes: 1 addition & 1 deletion k8s-manifests/storedog-app/deployments/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
path: /var/run/datadog/
containers:
- name: service-proxy
image: ${REGISTRY_URL}/storedog-nginx:${SD_TAG}
image: ${REGISTRY_URL}/nginx:${SD_TAG}
ports:
- containerPort: 80
env:
Expand Down
2 changes: 1 addition & 1 deletion k8s-manifests/storedog-app/deployments/puppeteer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: puppeteer
image: ${REGISTRY_URL}/storedog-puppeteer:${SD_TAG}
image: ${REGISTRY_URL}/puppeteer:${SD_TAG}
env:
- name: STOREDOG_URL
value: "http://service-proxy"
Expand Down
2 changes: 1 addition & 1 deletion k8s-manifests/storedog-app/deployments/worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
command: ['sh', '-c', 'until nc -z postgres 5432; do echo waiting for postgres; sleep 2; done;']
containers:
- name: worker
image: ${REGISTRY_URL}/storedog-backend:${SD_TAG}
image: ${REGISTRY_URL}/backend:${SD_TAG}
command: ["bundle", "exec", "sidekiq", "-C", "config/sidekiq.yml"]
env:
- name: WORKER
Expand Down
2 changes: 1 addition & 1 deletion k8s-manifests/storedog-app/statefulsets/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
spec:
containers:
- name: postgres
image: ${REGISTRY_URL}/storedog-postgres:${SD_TAG}
image: ${REGISTRY_URL}/postgres:${SD_TAG}
ports:
- containerPort: 5432
name: postgres
Expand Down