Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore]: use nightly releases #1399

Merged
merged 2 commits into from
Feb 22, 2024
Merged

[chore]: use nightly releases #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c66b3e4
use nightly releases
puckpuck Feb 21, 2024
a802e22
Merge branch 'main' into chore.use-nightly-releases
austinlparker Feb 21, 2024
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
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Demo App version
IMAGE_VERSION=1.8.0
IMAGE_NAME=ghcr.io/open-telemetry/demo
DEMO_VERSION=latest

# Dependent images
COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.93.0
Expand Down
26 changes: 13 additions & 13 deletions docker-compose.minimal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:

# AdService
adservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-adservice
container_name: ad-service
build:
context: ./
Expand Down Expand Up @@ -48,7 +48,7 @@ services:

# Cart service
cartservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-cartservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-cartservice
container_name: cart-service
build:
context: ./
Expand Down Expand Up @@ -78,7 +78,7 @@ services:

# Checkout service
checkoutservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-checkoutservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-checkoutservice
container_name: checkout-service
build:
context: ./
Expand Down Expand Up @@ -123,7 +123,7 @@ services:

# Currency service
currencyservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
container_name: currency-service
build:
context: ./src/currencyservice
Expand All @@ -148,7 +148,7 @@ services:

# Email service
emailservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-emailservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-emailservice
container_name: email-service
build:
context: ./src/emailservice
Expand All @@ -174,7 +174,7 @@ services:

# Frontend
frontend:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend
container_name: frontend
build:
context: ./
Expand Down Expand Up @@ -228,7 +228,7 @@ services:

# Frontend Proxy (Envoy)
frontendproxy:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontendproxy
container_name: frontend-proxy
build:
context: ./
Expand Down Expand Up @@ -268,7 +268,7 @@ services:

# Load Generator
loadgenerator:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator
image: ${IMAGE_NAME}:${DEMO_VERSION}-loadgenerator
container_name: load-generator
build:
context: ./
Expand Down Expand Up @@ -301,7 +301,7 @@ services:

# Payment service
paymentservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-paymentservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-paymentservice
container_name: payment-service
build:
context: ./
Expand All @@ -328,7 +328,7 @@ services:

# Product Catalog service
productcatalogservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
container_name: product-catalog-service
build:
context: ./
Expand All @@ -355,7 +355,7 @@ services:

# Quote service
quoteservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-quoteservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-quoteservice
container_name: quote-service
build:
context: ./
Expand Down Expand Up @@ -383,7 +383,7 @@ services:

# Recommendation service
recommendationservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-recommendationservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendationservice
container_name: recommendation-service
build:
context: ./
Expand Down Expand Up @@ -415,7 +415,7 @@ services:

# Shipping service
shippingservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-shippingservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-shippingservice
container_name: shipping-service
build:
context: ./
Expand Down
42 changes: 21 additions & 21 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
# ******************
# Accounting service
accountingservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-accountingservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-accountingservice
container_name: accounting-service
build:
context: ./
Expand All @@ -46,7 +46,7 @@ services:

# AdService
adservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-adservice
container_name: ad-service
build:
context: ./
Expand Down Expand Up @@ -75,7 +75,7 @@ services:

# Cart service
cartservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-cartservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-cartservice
container_name: cart-service
build:
context: ./
Expand Down Expand Up @@ -106,7 +106,7 @@ services:

# Checkout service
checkoutservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-checkoutservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-checkoutservice
container_name: checkout-service
build:
context: ./
Expand Down Expand Up @@ -154,7 +154,7 @@ services:

# Currency service
currencyservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
container_name: currency-service
build:
context: ./src/currencyservice
Expand All @@ -179,7 +179,7 @@ services:

# Email service
emailservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-emailservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-emailservice
container_name: email-service
build:
context: ./src/emailservice
Expand All @@ -205,7 +205,7 @@ services:

# Feature Flag service
featureflagservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-featureflagservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-featureflagservice
container_name: feature-flag-service
build:
context: ./
Expand Down Expand Up @@ -236,7 +236,7 @@ services:

# Fraud Detection service
frauddetectionservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frauddetectionservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-frauddetectionservice
container_name: frauddetection-service
build:
context: ./
Expand All @@ -263,7 +263,7 @@ services:

# Frontend
frontend:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend
container_name: frontend
build:
context: ./
Expand Down Expand Up @@ -318,7 +318,7 @@ services:

# Frontend Proxy (Envoy)
frontendproxy:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontendproxy
container_name: frontend-proxy
build:
context: ./
Expand Down Expand Up @@ -360,7 +360,7 @@ services:

# Load Generator
loadgenerator:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator
image: ${IMAGE_NAME}:${DEMO_VERSION}-loadgenerator
container_name: load-generator
build:
context: ./
Expand Down Expand Up @@ -393,7 +393,7 @@ services:

# Payment service
paymentservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-paymentservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-paymentservice
container_name: payment-service
build:
context: ./
Expand All @@ -420,7 +420,7 @@ services:

# Product Catalog service
productcatalogservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
container_name: product-catalog-service
build:
context: ./
Expand Down Expand Up @@ -448,7 +448,7 @@ services:

# Quote service
quoteservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-quoteservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-quoteservice
container_name: quote-service
build:
context: ./
Expand Down Expand Up @@ -476,7 +476,7 @@ services:

# Recommendation service
recommendationservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-recommendationservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendationservice
container_name: recommendation-service
build:
context: ./
Expand Down Expand Up @@ -511,7 +511,7 @@ services:

# Shipping service
shippingservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-shippingservice
image: ${IMAGE_NAME}:${DEMO_VERSION}-shippingservice
container_name: shipping-service
build:
context: ./
Expand Down Expand Up @@ -541,7 +541,7 @@ services:
# ******************
# Postgres used by Feature Flag service
ffspostgres:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-ffspostgres
image: ${IMAGE_NAME}:${DEMO_VERSION}-ffspostgres
container_name: ffs-postgres
build:
context: ./
Expand All @@ -568,7 +568,7 @@ services:

# Kafka used by Checkout, Accounting, and Fraud Detection services
kafka:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-kafka
image: ${IMAGE_NAME}:${DEMO_VERSION}-kafka
container_name: kafka
build:
context: ./
Expand Down Expand Up @@ -733,7 +733,7 @@ services:
# *****
# Frontend Tests
frontendTests:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend-tests
image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend-tests
container_name: frontend-tests
build:
context: ./
Expand All @@ -752,7 +752,7 @@ services:

# Integration Tests
integrationTests:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-integrationTests
image: ${IMAGE_NAME}:${DEMO_VERSION}-integrationTests
container_name: integrationTests
profiles:
- tests
Expand Down Expand Up @@ -783,7 +783,7 @@ services:

# Tracebased Tests
traceBasedTests:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-traceBasedTests
image: ${IMAGE_NAME}:${DEMO_VERSION}-traceBasedTests
container_name: traceBasedTests
profiles:
- tests
Expand Down
Loading