Skip to content

Commit

Permalink
Merge branch 'bump-base-image-and-bundler-versions' into 'main'
Browse files Browse the repository at this point in the history
⬆️ Updates base image to 3.2.5-alpine3.20 and Bundler to v2.5.20

See merge request pipeline-components/rubocop!175
  • Loading branch information
Robbert Müller committed Oct 18, 2024
2 parents 1697dae + 1ddba4e commit 9bcf702
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM ruby:3.2.2-alpine3.17 as build
FROM ruby:3.2.5-alpine3.20 AS build

# Ignore dependecies, they are for support only
# hadolint ignore=DL3018
RUN apk add --no-cache make build-base && \
gem install bundler:2.0.2 && \
gem install bundler:2.5.20 && \
bundle config --global frozen 1

WORKDIR /app/
Expand All @@ -13,16 +13,16 @@ RUN bundle install --frozen --deployment --binstubs=/app/bin/ --no-cache --stand
rm -vrf vendor/bundle/ruby/*/cache

# app image
FROM pipelinecomponents/base-entrypoint:0.5.0 as entrypoint
FROM pipelinecomponents/base-entrypoint:0.5.0 AS entrypoint

FROM ruby:3.2.2-alpine3.17
FROM ruby:3.2.5-alpine3.20
COPY --from=entrypoint /entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
ENV DEFAULTCMD rubocop
ENV DEFAULTCMD=rubocop

WORKDIR /app/
COPY --from=build /app/ /app/
ENV PATH "${PATH}:/app/bin/"
ENV PATH="${PATH}:/app/bin/"

WORKDIR /code/
# Build arguments
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
## Usage

The image is for running rubocop, rubocop is installed in /app/ in case you need to customize the install before usage.
The image is based on ruby:2.5.3-alpine3.8
The image is based on ruby:3.2.5-alpine3.20

## Examples

Expand Down

0 comments on commit 9bcf702

Please sign in to comment.