From 0c8fa77637156e9fb2a1903de9cb02045857862b Mon Sep 17 00:00:00 2001
From: Austin Parker <austin@ap2.io>
Date: Wed, 13 Sep 2023 12:50:37 -0400
Subject: [PATCH] prep for 1.5 release (#1089)

* prep for 1.5 release

* update dashboards

* force build to test

* fix gha

* revert ff comment

* roll back OTP version

* fix ff

* fix build

* clarify arm runner status

---------

Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
---
 .env                               |  2 +-
 .github/workflows/build-images.yml | 17 ++++++++++-------
 CHANGELOG.md                       |  2 ++
 src/featureflagservice/Dockerfile  | 12 +++++++-----
 src/featureflagservice/mix.exs     |  2 +-
 5 files changed, 21 insertions(+), 14 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..841557dd6c 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -50,10 +50,13 @@ jobs:
           - file: ./src/emailservice/Dockerfile
             tag_suffix: emailservice
             context: ./src/emailservice
-          # TODO: https://github.com/open-telemetry/opentelemetry-demo/issues/956
-          # - file: ./src/featureflagservice/Dockerfile
-          #   tag_suffix: featureflagservice
-          #   context: ./
+          # 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: ./
           - file: ./src/frontend/Dockerfile
             tag_suffix: frontend
             context: ./
@@ -106,14 +109,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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c75897a9ec..b5e3a8d11f 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
diff --git a/src/featureflagservice/Dockerfile b/src/featureflagservice/Dockerfile
index 2b61b585ef..f2c369c58a 100644
--- a/src/featureflagservice/Dockerfile
+++ b/src/featureflagservice/Dockerfile
@@ -15,10 +15,12 @@
 #   - 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
-ARG DEBIAN_VERSION=buster-20230612-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
 
 ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
 ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}"
@@ -35,7 +37,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,