Skip to content

Commit 3c0b63f

Browse files
authored
Change name of ads container to ads-python (#118)
## Description This changes the name of the ads container to ads-python. References in readme files have also been updated to match.
2 parents 33a692b + 1332244 commit 3c0b63f

File tree

6 files changed

+22
-17
lines changed

6 files changed

+22
-17
lines changed

.github/workflows/ads.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ jobs:
4343
context: ./services/ads/python
4444
platforms: linux/amd64,linux/arm64
4545
push: true
46-
tags: ghcr.io/datadog/storedog/ads:latest
46+
tags: ghcr.io/datadog/storedog/ads-python:latest
4747

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
IMAGES=(
4444
ghcr.io/datadog/storedog/backend
4545
ghcr.io/datadog/storedog/discounts
46-
ghcr.io/datadog/storedog/ads
46+
ghcr.io/datadog/storedog/ads-python
4747
ghcr.io/datadog/storedog/ads-java
4848
ghcr.io/datadog/storedog/nginx
4949
ghcr.io/datadog/storedog/frontend

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ This requires running a second Ads service in addition to the default Java Ads s
229229
```yaml
230230
# OPTIONAL: Advertisement service (Python)
231231
ads-python:
232-
image: ghcr.io/datadog/storedog/ads:${STOREDOG_IMAGE_VERSION:-latest}
233-
build:
232+
image: ghcr.io/datadog/storedog/ads-python:${STOREDOG_IMAGE_VERSION:-latest}
233+
build: # Only used if building from source in development
234234
context: ./services/ads/python
235235
depends_on:
236236
- postgres
@@ -246,6 +246,8 @@ This requires running a second Ads service in addition to the default Java Ads s
246246
- DD_PROFILING_ENABLED=true
247247
- DD_PROFILING_TIMELINE_ENABLED=true
248248
- DD_PROFILING_ALLOCATION_ENABLED=true
249+
volumes: # Only used in development
250+
- ./services/ads/python:/app
249251
networks:
250252
- storedog-network
251253
labels:

k8s-manifests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export REGISTRY_URL=localhost:5000
8282
```
8383

8484
```bash
85-
SERVICE_NAME=ads
85+
SERVICE_NAME=discounts
8686
docker build -t $REGISTRY_URL/$SERVICE_NAME:latest ./services/$SERVICE_NAME && docker push $REGISTRY_URL/$SERVICE_NAME:latest
8787
```
8888

services/ads/README.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,29 +149,32 @@ The `ads` table has the following schema:
149149
To use the Python ads service, replace the `ads` definition with the following in your `docker-compose.yml` file:
150150

151151
```yaml
152-
ads:
153-
build:
152+
# OPTIONAL: Advertisement service (Python)
153+
ads-python:
154+
image: ghcr.io/datadog/storedog/ads-python:${STOREDOG_IMAGE_VERSION:-latest}
155+
build: # Only used if building from source in development
154156
context: ./services/ads/python
155-
command: wait-for-it postgres:5432 -- flask run --port=3030 --host=0.0.0.0 # If using any other port besides the default 9292, overriding the CMD is required
156157
depends_on:
157158
- postgres
158159
- dd-agent
159160
environment:
160-
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
161-
- POSTGRES_USER=${POSTGRES_USER}
161+
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
162+
- POSTGRES_USER=${POSTGRES_USER:-postgres}
162163
- POSTGRES_HOST=postgres
163164
- DD_AGENT_HOST=dd-agent
164-
- DD_ENV=${DD_ENV}
165-
- DD_SERVICE=store-ads
166-
- DD_VERSION=${DD_VERSION_ADS-1.0.0}
167-
- DD_RUNTIME_METRICS_ENABLED=true
165+
- DD_ENV=${DD_ENV:-production}
166+
- DD_SERVICE=store-ads-python
167+
- DD_VERSION=${DD_VERSION_ADS_PYTHON:-1.0.0}
168168
- DD_PROFILING_ENABLED=true
169169
- DD_PROFILING_TIMELINE_ENABLED=true
170170
- DD_PROFILING_ALLOCATION_ENABLED=true
171-
volumes:
171+
volumes: # Only used in development
172172
- ./services/ads/python:/app
173+
networks:
174+
- storedog-network
173175
labels:
174176
com.datadoghq.ad.logs: '[{"source": "python"}]'
177+
```
175178
176179
#### Kubernetes
177180
@@ -216,7 +219,7 @@ spec:
216219
path: /var/run/datadog/
217220
containers:
218221
- name: ads
219-
image: ${REGISTRY_URL}/ads:${SD_TAG}
222+
image: ${REGISTRY_URL}/ads-python:${SD_TAG}
220223
ports:
221224
- containerPort: 3030
222225
env:

services/ads/k8s-manifests/ads-python.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
path: /var/run/datadog/
3737
containers:
3838
- name: ads-python
39-
image: ${REGISTRY_URL}/ads:${SD_TAG}
39+
image: ${REGISTRY_URL}/ads-python:${SD_TAG}
4040
ports:
4141
- containerPort: 3030
4242
env:

0 commit comments

Comments
 (0)