github actions build/push (#2)

Author: paweljw

.env

@@ -2,45 +2,23 @@
 
 # Demo App version
 IMAGE_VERSION=2.0.2
-IMAGE_NAME=ghcr.io/open-telemetry/demo
+IMAGE_NAME=betterstack/opentelemetry-demo
 DEMO_VERSION=latest
 
 # Build Args
-TRACETEST_IMAGE_VERSION=v1.7.1
-OTEL_JAVA_AGENT_VERSION=2.18.1
 OPENTELEMETRY_CPP_VERSION=1.21.0
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.133.0
 FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.12.8
-GRAFANA_IMAGE=grafana/grafana:12.1.0
-JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.72.0
-# must also update version field in src/grafana/provisioning/datasources/opensearch.yaml
-OPENSEARCH_IMAGE=opensearchproject/opensearch:3.2.0
 POSTGRES_IMAGE=postgres:17.6
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v3.5.0
 VALKEY_IMAGE=valkey/valkey:8.1.3-alpine
-TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
 
 # Demo Platform
 ENV_PLATFORM=local
 
 # OpenTelemetry Collector
 HOST_FILESYSTEM=/
 DOCKER_SOCK=/var/run/docker.sock
-OTEL_COLLECTOR_HOST=otel-collector
-OTEL_COLLECTOR_PORT_GRPC=4317
-OTEL_COLLECTOR_PORT_HTTP=4318
-OTEL_COLLECTOR_CONFIG=./src/otel-collector/otelcol-config.yml
-OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otel-collector/otelcol-config-extras.yml
-OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
-PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces
-
-# OpenTelemetry Resource Definitions
-OTEL_RESOURCE_ATTRIBUTES=service.namespace=opentelemetry-demo,service.version=${IMAGE_VERSION}
-
-# Metrics Temporality
-OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative
 
 # ******************
 # Core Demo Services
@@ -149,19 +127,3 @@ KAFKA_DOCKERFILE=./src/kafka/Dockerfile
 # Valkey
 VALKEY_PORT=6379
 VALKEY_ADDR=valkey-cart:${VALKEY_PORT}
-
-# ********************
-# Telemetry Components
-# ********************
-# Grafana
-GRAFANA_PORT=3000
-GRAFANA_HOST=grafana
-
-# Jaeger
-JAEGER_PORT=16686
-JAEGER_HOST=jaeger
-
-# Prometheus
-PROMETHEUS_PORT=9090
-PROMETHEUS_HOST=prometheus
-PROMETHEUS_ADDR=${PROMETHEUS_HOST}:${PROMETHEUS_PORT}

.github/workflows/build-and-push-images.yml

@@ -0,0 +1,80 @@
+name: Build and Push Docker Images
+
+on:
+  push:
+    branches:
+      - main
+
+env:
+  REGISTRY: docker.io
+  IMAGE_NAME: betterstack/opentelemetry-demo
+  DEMO_VERSION: latest
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        service:
+          - name: accounting
+            dockerfile: ./src/accounting/Dockerfile
+          - name: ad
+            dockerfile: ./src/ad/Dockerfile
+          - name: cart
+            dockerfile: ./src/cart/src/Dockerfile
+          - name: checkout
+            dockerfile: ./src/checkout/Dockerfile
+          - name: currency
+            dockerfile: ./src/currency/Dockerfile
+          - name: email
+            dockerfile: ./src/email/Dockerfile
+          - name: fraud-detection
+            dockerfile: ./src/fraud-detection/Dockerfile
+          - name: frontend
+            dockerfile: ./src/frontend/Dockerfile
+          - name: frontend-proxy
+            dockerfile: ./src/frontend-proxy/Dockerfile
+          - name: image-provider
+            dockerfile: ./src/image-provider/Dockerfile
+          - name: load-generator
+            dockerfile: ./src/load-generator/Dockerfile
+          - name: payment
+            dockerfile: ./src/payment/Dockerfile
+          - name: product-catalog
+            dockerfile: ./src/product-catalog/Dockerfile
+          - name: quote
+            dockerfile: ./src/quote/Dockerfile
+          - name: recommendation
+            dockerfile: ./src/recommendation/Dockerfile
+          - name: shipping
+            dockerfile: ./src/shipping/Dockerfile
+          - name: flagd-ui
+            dockerfile: ./src/flagd-ui/Dockerfile
+          - name: kafka
+            dockerfile: ./src/kafka/Dockerfile
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Depot
+        uses: depot/setup-action@v1
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: depot/build-push-action@v1
+        with:
+          project: ${{ secrets.DEPOT_PROJECT_ID }}
+          token: ${{ secrets.DEPOT_API_TOKEN }}
+          context: .
+          file: ${{ matrix.service.dockerfile }}
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DEMO_VERSION }}-${{ matrix.service.name }}
+          build-args: ${{ matrix.service.build_args }}
+          platforms: linux/amd64,linux/arm64

Makefile

@@ -134,33 +134,6 @@ clean-images:
         false; \
     fi
 
-.PHONY: run-tests
-run-tests:
-	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run frontendTests
-	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run traceBasedTests
-
-.PHONY: run-tracetesting
-run-tracetesting:
-	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run traceBasedTests ${SERVICES_TO_TEST}
-
-.PHONY: generate-protobuf
-generate-protobuf:
-	./ide-gen-proto.sh
-
-.PHONY: generate-kubernetes-manifests
-generate-kubernetes-manifests:
-	helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
-	helm repo update
-	echo "# Copyright The OpenTelemetry Authors" > kubernetes/opentelemetry-demo.yaml
-	echo "# SPDX-License-Identifier: Apache-2.0" >> kubernetes/opentelemetry-demo.yaml
-	echo "# This file is generated by 'make generate-kubernetes-manifests'" >> kubernetes/opentelemetry-demo.yaml
-	echo "---" >> kubernetes/opentelemetry-demo.yaml
-	echo "apiVersion: v1" >> kubernetes/opentelemetry-demo.yaml
-	echo "kind: Namespace" >> kubernetes/opentelemetry-demo.yaml
-	echo "metadata:" >> kubernetes/opentelemetry-demo.yaml
-	echo "  name: otel-demo" >> kubernetes/opentelemetry-demo.yaml
-	helm template opentelemetry-demo open-telemetry/opentelemetry-demo --namespace otel-demo | sed '/helm.sh\/chart\:/d' | sed '/helm.sh\/hook/d' | sed '/managed-by\: Helm/d' >> kubernetes/opentelemetry-demo.yaml
-
 .PHONY: docker-generate-protobuf
 docker-generate-protobuf:
 	./docker-gen-proto.sh
@@ -192,17 +165,6 @@ start:
 	@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
 	@echo "Go to http://localhost:8080/feature/ to change feature flags."
 
-.PHONY: start-minimal
-start-minimal:
-	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose.minimal.yml up --force-recreate --remove-orphans --detach
-	@echo ""
-	@echo "OpenTelemetry Demo in minimal mode is running."
-	@echo "Go to http://localhost:8080 for the demo UI."
-	@echo "Go to http://localhost:8080/jaeger/ui for the Jaeger UI."
-	@echo "Go to http://localhost:8080/grafana/ for the Grafana UI."
-	@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
-	@echo "Go to https://opentelemetry.io/docs/demo/feature-flags/ to learn how to change feature flags."
-
 .PHONY: stop
 stop:
 	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) down --remove-orphans --volumes