Skip to content

Commit

Permalink
Merge pull request #2433 from cloudnativedaysjp/renovate/ruby-updates
Browse files Browse the repository at this point in the history
chore(deps): update ruby-updates
  • Loading branch information
takaishi authored Dec 14, 2024
2 parents 0f0d26e + b8aaa5a commit ff88edd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.5
3.3.6
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# syntax = docker/dockerfile:1.10
# syntax = docker/dockerfile:1.12

FROM node:18.20.4-slim AS node
FROM node:18.20.5-slim AS node
WORKDIR /app
COPY --link package.json yarn.lock ./
RUN --mount=type=cache,uid=1000,target=/app/.cache/node_modules \
yarn install --modules-folder .cache/node_modules && \
cp -ar .cache/node_modules node_modules

FROM public.ecr.aws/docker/library/ruby:3.3.5 AS fetch-lib
FROM public.ecr.aws/docker/library/ruby:3.3.6 AS fetch-lib
WORKDIR /app
COPY --link Gemfile* ./
RUN apt-get update && apt-get install -y shared-mime-info libmariadb3
RUN bundle install

FROM public.ecr.aws/docker/library/ruby:3.3.5 AS asset-compile
ENV YARN_VERSION=1.22.19
FROM public.ecr.aws/docker/library/ruby:3.3.6 AS asset-compile
ENV YARN_VERSION=1.22.22
COPY --link --from=node /opt/yarn-v$YARN_VERSION /opt/yarn
COPY --link --from=node /usr/local/bin/node /usr/local/bin/
RUN ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
Expand All @@ -35,9 +35,9 @@ ENV AWS_ACCESS_KEY_ID=''
ARG RAILS_ENV='production'
RUN --mount=type=cache,uid=1000,target=/app/tmp/cache SECRET_KEY_BASE=hoge RAILS_ENV=${RAILS_ENV} DB_ADAPTER=nulldb bin/rails assets:precompile

FROM public.ecr.aws/docker/library/ruby:3.3.5-slim
FROM public.ecr.aws/docker/library/ruby:3.3.6-slim

ENV YARN_VERSION=1.22.19
ENV YARN_VERSION=1.22.22
COPY --link --from=node /opt/yarn-v$YARN_VERSION /opt/yarn
COPY --link --from=node /usr/local/bin/node /usr/local/bin/
RUN ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/docker/library/ruby:3.3.5-slim
FROM public.ecr.aws/docker/library/ruby:3.3.6-slim
WORKDIR /app
RUN apt-get update && apt-get -y install libmariadb3 libvips42 shared-mime-info git vim curl wget
ENV RUBY_YJIT_ENABLE=1
2 changes: 1 addition & 1 deletion app/jobs/generate_entrysheet_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class GenerateEntrysheetJob < ApplicationJob
def perform(conference_id, profile_id, speaker_id = nil, printer_id = nil)
puts("printer_id: #{printer_id}")
conference = Conference.find(conference_id)
obj = { profile_id:, speaker_id:}.to_json
obj = { profile_id:, speaker_id: }.to_json

encrypted = ActiveSupport::MessageEncryptor.new(Rails.application.secret_key_base.byteslice(0..31)).encrypt_and_sign(obj)

Expand Down
2 changes: 1 addition & 1 deletion schemas/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM swaggerapi/swagger-codegen-cli-v3:3.0.63 as builder
FROM swaggerapi/swagger-codegen-cli-v3:3.0.64 as builder
WORKDIR /mock-seed
COPY ./swagger.yml ./
WORKDIR /mock-server
Expand Down

0 comments on commit ff88edd

Please sign in to comment.