Skip to content

Commit 6bd2ede

Browse files
use nightly releases (#1399)
Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io>
1 parent 1b9b117 commit 6bd2ede

File tree

3 files changed

+35
-34
lines changed

3 files changed

+35
-34
lines changed

.env

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Demo App version
44
IMAGE_VERSION=1.8.0
55
IMAGE_NAME=ghcr.io/open-telemetry/demo
6+
DEMO_VERSION=latest
67

78
# Dependent images
89
COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.93.0

docker-compose.minimal.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020

2121
# AdService
2222
adservice:
23-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
23+
image: ${IMAGE_NAME}:${DEMO_VERSION}-adservice
2424
container_name: ad-service
2525
build:
2626
context: ./
@@ -48,7 +48,7 @@ services:
4848

4949
# Cart service
5050
cartservice:
51-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-cartservice
51+
image: ${IMAGE_NAME}:${DEMO_VERSION}-cartservice
5252
container_name: cart-service
5353
build:
5454
context: ./
@@ -78,7 +78,7 @@ services:
7878

7979
# Checkout service
8080
checkoutservice:
81-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-checkoutservice
81+
image: ${IMAGE_NAME}:${DEMO_VERSION}-checkoutservice
8282
container_name: checkout-service
8383
build:
8484
context: ./
@@ -123,7 +123,7 @@ services:
123123

124124
# Currency service
125125
currencyservice:
126-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
126+
image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
127127
container_name: currency-service
128128
build:
129129
context: ./src/currencyservice
@@ -148,7 +148,7 @@ services:
148148

149149
# Email service
150150
emailservice:
151-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-emailservice
151+
image: ${IMAGE_NAME}:${DEMO_VERSION}-emailservice
152152
container_name: email-service
153153
build:
154154
context: ./src/emailservice
@@ -174,7 +174,7 @@ services:
174174

175175
# Frontend
176176
frontend:
177-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend
177+
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend
178178
container_name: frontend
179179
build:
180180
context: ./
@@ -228,7 +228,7 @@ services:
228228

229229
# Frontend Proxy (Envoy)
230230
frontendproxy:
231-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
231+
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontendproxy
232232
container_name: frontend-proxy
233233
build:
234234
context: ./
@@ -268,7 +268,7 @@ services:
268268

269269
# Load Generator
270270
loadgenerator:
271-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator
271+
image: ${IMAGE_NAME}:${DEMO_VERSION}-loadgenerator
272272
container_name: load-generator
273273
build:
274274
context: ./
@@ -301,7 +301,7 @@ services:
301301

302302
# Payment service
303303
paymentservice:
304-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-paymentservice
304+
image: ${IMAGE_NAME}:${DEMO_VERSION}-paymentservice
305305
container_name: payment-service
306306
build:
307307
context: ./
@@ -328,7 +328,7 @@ services:
328328

329329
# Product Catalog service
330330
productcatalogservice:
331-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
331+
image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
332332
container_name: product-catalog-service
333333
build:
334334
context: ./
@@ -355,7 +355,7 @@ services:
355355

356356
# Quote service
357357
quoteservice:
358-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-quoteservice
358+
image: ${IMAGE_NAME}:${DEMO_VERSION}-quoteservice
359359
container_name: quote-service
360360
build:
361361
context: ./
@@ -383,7 +383,7 @@ services:
383383

384384
# Recommendation service
385385
recommendationservice:
386-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-recommendationservice
386+
image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendationservice
387387
container_name: recommendation-service
388388
build:
389389
context: ./
@@ -415,7 +415,7 @@ services:
415415

416416
# Shipping service
417417
shippingservice:
418-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-shippingservice
418+
image: ${IMAGE_NAME}:${DEMO_VERSION}-shippingservice
419419
container_name: shipping-service
420420
build:
421421
context: ./

docker-compose.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
# ******************
2020
# Accounting service
2121
accountingservice:
22-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-accountingservice
22+
image: ${IMAGE_NAME}:${DEMO_VERSION}-accountingservice
2323
container_name: accounting-service
2424
build:
2525
context: ./
@@ -46,7 +46,7 @@ services:
4646

4747
# AdService
4848
adservice:
49-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
49+
image: ${IMAGE_NAME}:${DEMO_VERSION}-adservice
5050
container_name: ad-service
5151
build:
5252
context: ./
@@ -75,7 +75,7 @@ services:
7575

7676
# Cart service
7777
cartservice:
78-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-cartservice
78+
image: ${IMAGE_NAME}:${DEMO_VERSION}-cartservice
7979
container_name: cart-service
8080
build:
8181
context: ./
@@ -106,7 +106,7 @@ services:
106106

107107
# Checkout service
108108
checkoutservice:
109-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-checkoutservice
109+
image: ${IMAGE_NAME}:${DEMO_VERSION}-checkoutservice
110110
container_name: checkout-service
111111
build:
112112
context: ./
@@ -154,7 +154,7 @@ services:
154154

155155
# Currency service
156156
currencyservice:
157-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
157+
image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
158158
container_name: currency-service
159159
build:
160160
context: ./src/currencyservice
@@ -179,7 +179,7 @@ services:
179179

180180
# Email service
181181
emailservice:
182-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-emailservice
182+
image: ${IMAGE_NAME}:${DEMO_VERSION}-emailservice
183183
container_name: email-service
184184
build:
185185
context: ./src/emailservice
@@ -205,7 +205,7 @@ services:
205205

206206
# Feature Flag service
207207
featureflagservice:
208-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-featureflagservice
208+
image: ${IMAGE_NAME}:${DEMO_VERSION}-featureflagservice
209209
container_name: feature-flag-service
210210
build:
211211
context: ./
@@ -236,7 +236,7 @@ services:
236236

237237
# Fraud Detection service
238238
frauddetectionservice:
239-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frauddetectionservice
239+
image: ${IMAGE_NAME}:${DEMO_VERSION}-frauddetectionservice
240240
container_name: frauddetection-service
241241
build:
242242
context: ./
@@ -263,7 +263,7 @@ services:
263263

264264
# Frontend
265265
frontend:
266-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend
266+
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend
267267
container_name: frontend
268268
build:
269269
context: ./
@@ -318,7 +318,7 @@ services:
318318

319319
# Frontend Proxy (Envoy)
320320
frontendproxy:
321-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
321+
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontendproxy
322322
container_name: frontend-proxy
323323
build:
324324
context: ./
@@ -360,7 +360,7 @@ services:
360360

361361
# Load Generator
362362
loadgenerator:
363-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator
363+
image: ${IMAGE_NAME}:${DEMO_VERSION}-loadgenerator
364364
container_name: load-generator
365365
build:
366366
context: ./
@@ -393,7 +393,7 @@ services:
393393

394394
# Payment service
395395
paymentservice:
396-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-paymentservice
396+
image: ${IMAGE_NAME}:${DEMO_VERSION}-paymentservice
397397
container_name: payment-service
398398
build:
399399
context: ./
@@ -420,7 +420,7 @@ services:
420420

421421
# Product Catalog service
422422
productcatalogservice:
423-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
423+
image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
424424
container_name: product-catalog-service
425425
build:
426426
context: ./
@@ -448,7 +448,7 @@ services:
448448

449449
# Quote service
450450
quoteservice:
451-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-quoteservice
451+
image: ${IMAGE_NAME}:${DEMO_VERSION}-quoteservice
452452
container_name: quote-service
453453
build:
454454
context: ./
@@ -476,7 +476,7 @@ services:
476476

477477
# Recommendation service
478478
recommendationservice:
479-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-recommendationservice
479+
image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendationservice
480480
container_name: recommendation-service
481481
build:
482482
context: ./
@@ -511,7 +511,7 @@ services:
511511

512512
# Shipping service
513513
shippingservice:
514-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-shippingservice
514+
image: ${IMAGE_NAME}:${DEMO_VERSION}-shippingservice
515515
container_name: shipping-service
516516
build:
517517
context: ./
@@ -541,7 +541,7 @@ services:
541541
# ******************
542542
# Postgres used by Feature Flag service
543543
ffspostgres:
544-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-ffspostgres
544+
image: ${IMAGE_NAME}:${DEMO_VERSION}-ffspostgres
545545
container_name: ffs-postgres
546546
build:
547547
context: ./
@@ -568,7 +568,7 @@ services:
568568

569569
# Kafka used by Checkout, Accounting, and Fraud Detection services
570570
kafka:
571-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-kafka
571+
image: ${IMAGE_NAME}:${DEMO_VERSION}-kafka
572572
container_name: kafka
573573
build:
574574
context: ./
@@ -733,7 +733,7 @@ services:
733733
# *****
734734
# Frontend Tests
735735
frontendTests:
736-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend-tests
736+
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend-tests
737737
container_name: frontend-tests
738738
build:
739739
context: ./
@@ -752,7 +752,7 @@ services:
752752

753753
# Integration Tests
754754
integrationTests:
755-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-integrationTests
755+
image: ${IMAGE_NAME}:${DEMO_VERSION}-integrationTests
756756
container_name: integrationTests
757757
profiles:
758758
- tests
@@ -783,7 +783,7 @@ services:
783783

784784
# Tracebased Tests
785785
traceBasedTests:
786-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-traceBasedTests
786+
image: ${IMAGE_NAME}:${DEMO_VERSION}-traceBasedTests
787787
container_name: traceBasedTests
788788
profiles:
789789
- tests

0 commit comments

Comments
 (0)