Skip to content

Commit

Permalink
Update container base image from ruby:3.1-slim to docker.io/library/r…
Browse files Browse the repository at this point in the history
…uby:3.3-slim, minor adjustments in Taskfile
  • Loading branch information
white-gecko committed Jun 12, 2024
1 parent 7afaea7 commit ef0b96d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
-

### Changed
-
- Update container base image from ruby:3.1-slim to docker.io/library/ruby:3.3-slim
- Adjust description and alias in Taskfile

### Fixed
-
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1-slim AS builder
FROM docker.io/library/ruby:3.3-slim AS builder

RUN apt-get update && apt-get -y install build-essential && rm -rf /var/lib/apt/lists/*
WORKDIR jekyll-rdf
Expand All @@ -8,14 +8,14 @@ ARG VERSION
RUN gem build jekyll-rdf.gemspec && \
gem install jekyll-rdf-*.gem mustache

FROM ruby:3.1-slim AS slim
FROM docker.io/library/ruby:3.3-slim AS slim
COPY --from=builder /usr/local/bundle/ /usr/local/bundle/

WORKDIR /data

CMD /usr/local/bundle/bin/jekyll build

FROM ruby:3.1-slim
FROM docker.io/library/ruby:3.3-slim
COPY --from=builder /jekyll-rdf/docker-resources/ /docker-resources
COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
RUN apt-get update && apt-get -y install build-essential git && rm -rf /var/lib/apt/lists/*
Expand Down
5 changes: 3 additions & 2 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ tasks:
cmds:
- gem push {{.GEM_NAME}}-{{.GEM_VERSION}}.gem

docker:build:
desc: The list of all defined tasks
image:build:
desc: Build the docker image for the current version
aliases: [podman:build, docker:build]
cmds:
- docker build --no-cache --build-arg VERSION={{.GEM_VERSION}} -t {{.DOCKER_IMAGE}}:{{.GEM_VERSION}} .

Expand Down

0 comments on commit ef0b96d

Please sign in to comment.