More fixes

Author: songy23

src/cartservice/src/Dockerfile

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
-FROM registry.ddbuild.io/images/mirror/dotnet:sdk-8.0.100-1 AS builder
+FROM --platform=$BUILDPLATFORM registry.ddbuild.io/images/mirror/dotnet:sdk-8.0.100-1 AS builder
 ARG TARGETARCH
 
 WORKDIR /usr/src/app/

src/currencyservice/Dockerfile

@@ -38,7 +38,7 @@ RUN cd /currencyservice \
     && make -j$(nproc || sysctl -n hw.ncpu || echo 1) install
 
 
-FROM registry.ddbuild.io/images/mirror/alpine:3.18 as release
+FROM registry.ddbuild.io/images/mirror/alpine:3.18 AS release
 
 RUN apk update && apk add grpc-dev protobuf-dev
 COPY --from=builder /usr/local /usr/local

src/currencyservice/src/tracer_common.h

@@ -98,4 +98,4 @@ opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(std::s
   return provider->GetTracer(tracer_name);
 }
 
-} // namespace
+} // namespace

src/emailservice/Dockerfile

@@ -8,10 +8,10 @@ FROM base as builder
 
 WORKDIR /tmp
 
-COPY Gemfile Gemfile.lock ./
-
-RUN apk update && apk add make gcc musl-dev && bundle install
+COPY Gemfile Gemfile.lock .
 
+#RUN apk update && apk add make gcc musl-dev gcompat && bundle install
+RUN apt-get update && apt-get install build-essential -y && bundle install
 FROM base as release
 
 WORKDIR /email_server

src/emailservice/Gemfile

@@ -4,9 +4,9 @@ source "https://rubygems.org"
 
 gem "net-smtp", "~> 0.3"
 gem "pony",     "~> 1.13"
-gem "puma",     "~> 5.6"
-gem "sinatra",  "~> 2.2"
+gem "puma",     "~> 6.3"
+gem "sinatra",  "~> 3.0"
 
-gem "opentelemetry-sdk",                     "~> 1.1"
-gem "opentelemetry-exporter-otlp",           "~> 0.21"
-gem "opentelemetry-instrumentation-sinatra", "~> 0.19"
+gem "opentelemetry-sdk", "~> 1.2"
+gem "opentelemetry-exporter-otlp", "~> 0.24"
+gem "opentelemetry-instrumentation-all", "~> 0.39"

src/emailservice/Gemfile.lock

@@ -9,10 +9,18 @@ GEM
       google-protobuf (~> 3.18)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     mini_mime (1.1.2)
-    mustermann (1.1.1)
+    mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    net-protocol (0.1.3)
+    net-imap (0.3.6)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.4.0)
       net-protocol
@@ -87,7 +95,6 @@ GEM
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-base (0.22.2)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.19.3)
       opentelemetry-registry (~> 0.1)
     opentelemetry-instrumentation-bunny (0.21.1)
       opentelemetry-api (~> 1.0)
@@ -210,7 +217,7 @@ GEM
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.8.0)
+    opentelemetry-semantic_conventions (1.10.0)
       opentelemetry-api (~> 1.0)
     pony (1.13.1)
       mail (>= 2.0)
@@ -229,18 +236,19 @@ GEM
     timeout (0.4.0)
 
 PLATFORMS
+  aarch64-linux
   arm64-darwin-21
   arm64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
   net-smtp (~> 0.3)
-  opentelemetry-exporter-otlp (~> 0.21)
-  opentelemetry-instrumentation-sinatra (~> 0.19)
-  opentelemetry-sdk (~> 1.1)
+  opentelemetry-exporter-otlp (~> 0.24)
+  opentelemetry-instrumentation-all (~> 0.39)
+  opentelemetry-sdk (~> 1.2)
   pony (~> 1.13)
-  puma (~> 5.6)
-  sinatra (~> 2.2)
+  puma (~> 6.3)
+  sinatra (~> 3.0)
 
 BUNDLED WITH
    2.3.7

src/featureflagservice/Dockerfile

@@ -23,7 +23,7 @@ ARG OTP_VERSION=23.3.4.14
 ARG DEBIAN_VERSION=buster-20210902-slim
 
 ARG BUILDER_IMAGE="registry.ddbuild.io/images/mirror/hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
-ARG RUNNER_IMAGE="registry.ddbuild.io/images/mirror/debian:bullseye-slim"
+ARG RUNNER_IMAGE="registry.ddbuild.io/images/mirror/debian:${DEBIAN_VERSION}"
 
 FROM ${BUILDER_IMAGE} as builder
 

src/featureflagservice/mix.exs

@@ -11,7 +11,7 @@ defmodule Featureflagservice.MixProject do
       version: "1.4.0",
       elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
-      compilers: [:gettext] ++ Mix.compilers(),
+      compilers: [] ++ Mix.compilers(),
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
       deps: deps(),
@@ -45,7 +45,7 @@ defmodule Featureflagservice.MixProject do
       {:phoenix, "~> 1.7.0"},
       {:phoenix_ecto, "~> 4.4"},
       {:ecto_sql, "~> 3.10"},
-      {:postgrex, ">= 0.0.0"},
+      {:postgrex, "~> 0.17.2"},
       {:phoenix_html, "~> 3.0"},
       {:phoenix_live_reload, "~> 1.2", only: :dev},
       {:phoenix_live_view, "~> 0.20.0"},
@@ -58,12 +58,12 @@ defmodule Featureflagservice.MixProject do
       {:jason, "~> 1.4"},
       {:plug_cowboy, "~> 2.6"},
 
-      {:grpcbox, "~> 0.15.0", override: true},
-      {:opentelemetry_exporter, "~> 1.4.0"},
-      {:opentelemetry_grpcbox, "~> 0.1"},
+      {:grpcbox, "~> 0.16.0", override: true},
+      {:opentelemetry_exporter, "~> 1.6.0"},
+      {:opentelemetry_grpcbox, "~> 0.2"},
       {:opentelemetry_api, "~> 1.2.1"},
-      {:opentelemetry, "~> 1.2.1"},
-      {:opentelemetry_phoenix, "~> 1.0.0"},
+      {:opentelemetry, "~> 1.3.0"},
+      {:opentelemetry_phoenix, "~> 1.1.1"},
       {:opentelemetry_ecto, "~> 1.1.1"}
     ]
   end