From 98cb0684410434c96ba1df8c9bbc500f827ca17f Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Thu, 31 Aug 2023 10:16:23 -0400 Subject: [PATCH 1/9] prep for 1.5 release --- .env | 2 +- .github/workflows/build-images.yml | 6 +++--- CHANGELOG.md | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.env b/.env index df62f995fe..669f9c975e 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ # Images -IMAGE_VERSION=1.4.0 +IMAGE_VERSION=1.5.0 IMAGE_NAME=ghcr.io/open-telemetry/demo # Demo Platform diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 06ff7d35ec..59f6d886ab 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -51,9 +51,9 @@ jobs: tag_suffix: emailservice context: ./src/emailservice # TODO: https://github.com/open-telemetry/opentelemetry-demo/issues/956 - # - file: ./src/featureflagservice/Dockerfile - # tag_suffix: featureflagservice - # context: ./ + - file: ./src/featureflagservice/Dockerfile + tag_suffix: featureflagservice + context: ./ - file: ./src/frontend/Dockerfile tag_suffix: frontend context: ./ diff --git a/CHANGELOG.md b/CHANGELOG.md index e4ef121e7c..72301a70ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ release. ## Unreleased +## 1.5.0 + * update trace-based tests to test stream events ([#1072](https://github.com/open-telemetry/opentelemetry-demo/pull/1072)) * Add cartServiceFailure feature flag triggering Cart Service errors From c13ae4ec26e94edda9208c7d1705d0f61f3d4890 Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Thu, 31 Aug 2023 11:26:13 -0400 Subject: [PATCH 2/9] update dashboards --- .../dashboards/general/demo-dashboard.json | 22 ++++++------ .../general/spanmetrics-dashboard.json | 36 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/grafana/provisioning/dashboards/general/demo-dashboard.json b/src/grafana/provisioning/dashboards/general/demo-dashboard.json index ace199bc84..53e6a7a815 100644 --- a/src/grafana/provisioning/dashboards/general/demo-dashboard.json +++ b/src/grafana/provisioning/dashboards/general/demo-dashboard.json @@ -124,7 +124,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(runtime_cpython_cpu_time{type=~\"system\"}[$__interval])*100", + "expr": "rate(process_runtime_cpython_cpu_time{type=~\"system\"}[$__interval])*100", "legendFormat": "__auto", "range": true, "refId": "A" @@ -135,7 +135,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(runtime_cpython_cpu_time{type=~\"user\"}[$__interval])*100", + "expr": "rate(process_runtime_cpython_cpu_time{type=~\"user\"}[$__interval])*100", "hide": false, "legendFormat": "__auto", "range": true, @@ -229,7 +229,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(runtime_cpython_memory{type=~\"rss|vms\"}[$__interval])/1024/1024", + "expr": "rate(process_runtime_cpython_memory{type=~\"rss|vms\"}[$__interval])/1024/1024", "legendFormat": "__auto", "range": true, "refId": "A" @@ -413,7 +413,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", + "expr": "rate(calls{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])", "legendFormat": "{{ span_name }}", "range": true, "refId": "A" @@ -507,7 +507,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.50, sum(rate(duration_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "legendFormat": "quantile50", "range": true, "refId": "A" @@ -519,7 +519,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.95, sum(rate(duration_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, "legendFormat": "quantile95", "range": true, @@ -532,7 +532,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, "legendFormat": "quantile99", "range": true, @@ -545,7 +545,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", + "expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))", "hide": false, "legendFormat": "quantile999", "range": true, @@ -639,7 +639,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])", + "expr": "rate(duration_count{service_name=\"${service}\"}[$__rate_interval])", "legendFormat": "{{ span_name }}", "range": true, "refId": "A" @@ -759,14 +759,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "duration_milliseconds_bucket", + "definition": "duration_bucket", "hide": 0, "includeAll": false, "multi": false, "name": "service", "options": [], "query": { - "query": "duration_milliseconds_bucket", + "query": "duration_bucket", "refId": "StandardVariableQuery" }, "refresh": 1, diff --git a/src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json b/src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json index be3b329b21..0a82318232 100644 --- a/src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json +++ b/src/grafana/provisioning/dashboards/general/spanmetrics-dashboard.json @@ -113,7 +113,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", "format": "time_series", "hide": true, "instant": false, @@ -129,7 +129,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))", "hide": false, "instant": true, "interval": "", @@ -144,7 +144,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", "hide": true, "interval": "", "legendFormat": "quantile99", @@ -158,7 +158,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", "hide": true, "interval": "", "legendFormat": "quantile999", @@ -238,7 +238,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,sum by (service_name) (rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))", + "expr": "topk(7,sum by (service_name) (rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))", "format": "time_series", "instant": true, "interval": "", @@ -316,7 +316,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))", + "expr": "topk(7,sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))", "instant": true, "interval": "", "legendFormat": "{{service_name}}", @@ -489,7 +489,7 @@ "uid": "webstore-metrics" }, "exemplar": false, - "expr": "topk(7, sum(rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ", + "expr": "topk(7, sum(rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ", "format": "table", "instant": true, "interval": "", @@ -502,7 +502,7 @@ "uid": "webstore-metrics" }, "exemplar": false, - "expr": "topk(7, sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))", + "expr": "topk(7, sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))", "format": "table", "hide": false, "instant": true, @@ -696,7 +696,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", "format": "time_series", "hide": true, "instant": false, @@ -712,7 +712,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))", + "expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))", "hide": false, "instant": true, "interval": "", @@ -727,7 +727,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", "hide": true, "interval": "", "legendFormat": "quantile99", @@ -741,7 +741,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", "hide": true, "interval": "", "legendFormat": "quantile999", @@ -812,7 +812,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7, sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_milliseconds_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))", + "expr": "topk(7, sum by (span_name,service_name)(increase(duration_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))", "instant": true, "interval": "", "legendFormat": "{{span_name}} [{{service_name}}]", @@ -916,7 +916,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "topk(7,sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_milliseconds_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))", + "expr": "topk(7,sum by (span_name,service_name)(increase(duration_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))", "instant": false, "interval": "", "legendFormat": "[{{service_name}}] {{span_name}}", @@ -945,14 +945,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))", + "definition": "query_result(count by (service_name)(count_over_time(calls[$__range])))", "hide": 0, "includeAll": true, "multi": true, "name": "service", "options": [], "query": { - "query": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))", + "query": "query_result(count by (service_name)(count_over_time(calls[$__range])))", "refId": "StandardVariableQuery" }, "refresh": 2, @@ -972,14 +972,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"}) by (span_name))", + "definition": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"}) by (span_name))", "hide": 0, "includeAll": true, "multi": true, "name": "span_name", "options": [], "query": { - "query": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"}) by (span_name))", + "query": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"}) by (span_name))", "refId": "StandardVariableQuery" }, "refresh": 2, From aa12cc8caf7030b1b7783bfc8ba395b2b6fb2d0b Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Thu, 31 Aug 2023 11:29:22 -0400 Subject: [PATCH 3/9] force build to test --- src/featureflagservice/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/featureflagservice/Dockerfile b/src/featureflagservice/Dockerfile index 2b61b585ef..b6f413e2c4 100644 --- a/src/featureflagservice/Dockerfile +++ b/src/featureflagservice/Dockerfile @@ -15,7 +15,8 @@ # - https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye-20210902-slim - for the release image # - https://pkgs.org/ - resource for finding needed packages # - Ex: hexpm/elixir:1.14.3-erlang-25.2.3-debian-buster-20230202-slim -# + +# test ARG ELIXIR_VERSION=1.15.4 ARG OTP_VERSION=26.0.2 ARG DEBIAN_VERSION=buster-20230612-slim From 4a7de8b73e30cc26445c6093260b9593ec8059c8 Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Thu, 31 Aug 2023 11:44:43 -0400 Subject: [PATCH 4/9] fix gha --- .github/workflows/build-images.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 59f6d886ab..9411969524 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -106,14 +106,14 @@ jobs: FILES_CHANGED=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} -- $DOCKERFILE_DIR) if [ -z "$FILES_CHANGED" ]; then echo "No changes in ${{ matrix.file_tag.context }}, skipping build." - echo "skip=true >> $GITHUB_OUTPUT" + echo "skip=true" >> "$GITHUB_OUTPUT" else echo "Changes detected in ${{ matrix.file_tag.context }}, proceeding with build." - echo "skip=false >> $GITHUB_OUTPUT" + echo "skip=false" >> "$GITHUB_OUTPUT" fi - name: Override skip for push if: ${{ inputs.push }} - run: echo "skip=false >> $GITHUB_OUTPUT" + run: echo "skip=false" >> "$GITHUB_OUTPUT" id: override_skip - name: Log in to the Container registry uses: docker/login-action@v2 From aa50d2d4f95aadf4465f4565ee2f1ae674881095 Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Thu, 31 Aug 2023 11:46:41 -0400 Subject: [PATCH 5/9] revert ff comment --- src/featureflagservice/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/featureflagservice/Dockerfile b/src/featureflagservice/Dockerfile index b6f413e2c4..666ee897de 100644 --- a/src/featureflagservice/Dockerfile +++ b/src/featureflagservice/Dockerfile @@ -15,8 +15,6 @@ # - https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye-20210902-slim - for the release image # - https://pkgs.org/ - resource for finding needed packages # - Ex: hexpm/elixir:1.14.3-erlang-25.2.3-debian-buster-20230202-slim - -# test ARG ELIXIR_VERSION=1.15.4 ARG OTP_VERSION=26.0.2 ARG DEBIAN_VERSION=buster-20230612-slim From ee30e6c7f169ef2e6197aca16cc7dce9561c5ac4 Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Thu, 31 Aug 2023 12:06:25 -0400 Subject: [PATCH 6/9] roll back OTP version --- src/featureflagservice/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/featureflagservice/Dockerfile b/src/featureflagservice/Dockerfile index 666ee897de..3f63487a80 100644 --- a/src/featureflagservice/Dockerfile +++ b/src/featureflagservice/Dockerfile @@ -15,8 +15,9 @@ # - https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye-20210902-slim - for the release image # - https://pkgs.org/ - resource for finding needed packages # - Ex: hexpm/elixir:1.14.3-erlang-25.2.3-debian-buster-20230202-slim -ARG ELIXIR_VERSION=1.15.4 -ARG OTP_VERSION=26.0.2 +# DO NOT CHANGE ELIXIR OR OTP VERSION OR IT WILL BREAK GHA BUILD +ARG ELIXIR_VERSION=1.14.3 +ARG OTP_VERSION=23.3.4.9 ARG DEBIAN_VERSION=buster-20230612-slim ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}" From 5065bb28ad53f9d950d6be87e84f327bcdbfa99b Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Thu, 31 Aug 2023 12:10:59 -0400 Subject: [PATCH 7/9] fix ff --- src/featureflagservice/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/featureflagservice/Dockerfile b/src/featureflagservice/Dockerfile index 3f63487a80..2150da573d 100644 --- a/src/featureflagservice/Dockerfile +++ b/src/featureflagservice/Dockerfile @@ -15,10 +15,10 @@ # - https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye-20210902-slim - for the release image # - https://pkgs.org/ - resource for finding needed packages # - Ex: hexpm/elixir:1.14.3-erlang-25.2.3-debian-buster-20230202-slim -# DO NOT CHANGE ELIXIR OR OTP VERSION OR IT WILL BREAK GHA BUILD +# DO NOT CHANGE ELIXIR OR OTP OR DEBIAN VERSION OR IT WILL BREAK GHA BUILD ARG ELIXIR_VERSION=1.14.3 -ARG OTP_VERSION=23.3.4.9 -ARG DEBIAN_VERSION=buster-20230612-slim +ARG OTP_VERSION=23.3.4.14 +ARG DEBIAN_VERSION=buster-20210902-slim ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}" ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}" From c4cd441bdc729a826feb9b3c5de5e97cf59347a2 Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Thu, 31 Aug 2023 12:36:01 -0400 Subject: [PATCH 8/9] fix build --- src/featureflagservice/Dockerfile | 2 +- src/featureflagservice/mix.exs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/featureflagservice/Dockerfile b/src/featureflagservice/Dockerfile index 2150da573d..ac399ff85f 100644 --- a/src/featureflagservice/Dockerfile +++ b/src/featureflagservice/Dockerfile @@ -35,7 +35,7 @@ WORKDIR /app # install hex + rebar RUN mix local.hex --force --verbose RUN mix local.rebar --force --verbose -RUN wget https://s3.amazonaws.com/rebar3/rebar3 && chmod +x rebar3 && mv rebar3 ~/.mix +RUN wget https://github.com/erlang/rebar3/releases/download/3.20.0/rebar3 && chmod +x rebar3 && mv rebar3 ~/.mix RUN wget https://github.com/rebar/rebar/wiki/rebar && chmod +x rebar && mv rebar ~/.mix RUN mix archive.install github hexpm/hex branch latest --force diff --git a/src/featureflagservice/mix.exs b/src/featureflagservice/mix.exs index b1a86d235a..8865ec09de 100644 --- a/src/featureflagservice/mix.exs +++ b/src/featureflagservice/mix.exs @@ -9,7 +9,7 @@ defmodule Featureflagservice.MixProject do [ app: :featureflagservice, version: "1.4.0", - elixir: "~> 1.15", + elixir: "~> 1.14", elixirc_paths: elixirc_paths(Mix.env()), compilers: [] ++ Mix.compilers(), start_permanent: Mix.env() == :prod, From 48c0b39bef8112dfebe362be7aa3a4995ea93baa Mon Sep 17 00:00:00 2001 From: Austin Parker Date: Wed, 13 Sep 2023 10:39:46 -0400 Subject: [PATCH 9/9] clarify arm runner status --- .github/workflows/build-images.yml | 5 ++++- src/featureflagservice/Dockerfile | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 9411969524..841557dd6c 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -50,7 +50,10 @@ jobs: - file: ./src/emailservice/Dockerfile tag_suffix: emailservice context: ./src/emailservice - # TODO: https://github.com/open-telemetry/opentelemetry-demo/issues/956 + # NOTE: + # https://github.com/open-telemetry/opentelemetry-demo/issues/956 + # Until dedicated ARM runners are available for GHA we cannot upgrade + # OTP/Elixir versions. Please do not change the OTP/Elixir versions. - file: ./src/featureflagservice/Dockerfile tag_suffix: featureflagservice context: ./ diff --git a/src/featureflagservice/Dockerfile b/src/featureflagservice/Dockerfile index ac399ff85f..f2c369c58a 100644 --- a/src/featureflagservice/Dockerfile +++ b/src/featureflagservice/Dockerfile @@ -16,6 +16,8 @@ # - https://pkgs.org/ - resource for finding needed packages # - Ex: hexpm/elixir:1.14.3-erlang-25.2.3-debian-buster-20230202-slim # DO NOT CHANGE ELIXIR OR OTP OR DEBIAN VERSION OR IT WILL BREAK GHA BUILD +# Once there are ARM runners for GHA we can upgrade this. +# Not until then. ARG ELIXIR_VERSION=1.14.3 ARG OTP_VERSION=23.3.4.14 ARG DEBIAN_VERSION=buster-20210902-slim