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.

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

[emailservice] Update Ruby version and bump dependencies #863

Closed
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ release.
([#848](https://github.com/open-telemetry/opentelemetry-demo/pull/848))
* [collector] update collector version to 0.76.1 and remove connectors feature gate.
([#857](https://github.com/open-telemetry/opentelemetry-demo/pull/857))
* [emailservice] Update Ruby version and bump dependencies
([#863](https://github.com/open-telemetry/opentelemetry-demo/pull/863))
* [shippingservice] update rust version and dependencies
([#865](https://github.com/open-telemetry/opentelemetry-demo/pull/865))
* [load generator] Bump loagen dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/emailservice/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.2.2
18 changes: 5 additions & 13 deletions src/emailservice/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0


FROM ruby:3.1.2-alpine as base
FROM --platform=${BUILDPLATFORM} ruby:3.2.2-alpine as base

FROM base as builder

WORKDIR /tmp
COPY Gemfile .
RUN apk update && \
apk add make gcc musl-dev && \
bundle install

COPY Gemfile Gemfile.lock .

RUN apk update && apk add make gcc musl-dev && bundle install

FROM base as release

WORKDIR /email_server

COPY . .

RUN chmod 666 ./Gemfile.lock

COPY --from=builder /usr/local/bundle/ /usr/local/bundle/


EXPOSE ${EMAIL_SERVICE_PORT}
ENTRYPOINT ["bundle", "exec", "ruby", "email_server.rb"]
19 changes: 9 additions & 10 deletions src/emailservice/Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# frozen_string_literal: true

source 'https://rubygems.org'

source "https://rubygems.org"

gem "net-smtp", "~> 0.3"
gem "pony", "~> 1.13"
gem "puma", "~> 5.6"
gem "sinatra", "~> 2.2"

gem "opentelemetry-sdk", "~> 1.1"
gem "opentelemetry-exporter-otlp", "~> 0.21"
gem "opentelemetry-instrumentation-sinatra", "~> 0.19"
gem 'net-smtp', '~> 0.3'
gem 'opentelemetry-exporter-otlp', '~> 0.24'
gem 'opentelemetry-instrumentation-sinatra', '~> 0.22'
gem 'opentelemetry-sdk', '~> 1.2'
gem 'pony', '~> 1.13'
gem 'puma', '~> 6.2'
gem 'sinatra', '~> 3.0'
75 changes: 0 additions & 75 deletions src/emailservice/Gemfile.lock

This file was deleted.