Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
white-gecko committed Jun 12, 2024
2 parents ef503ba + 1fdc045 commit 37d87cc
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: ci

on:
pull_request:
push:
branches:
- 'main'
- 'develop'
tags:
- '*'
Expand Down Expand Up @@ -34,6 +34,7 @@ jobs:
uses: coverallsapp/github-action@v2

release:
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
needs: test
env:
Expand All @@ -53,6 +54,7 @@ jobs:
run: task gem:build gem:push

docker:
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
needs: test
steps:
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
-

## [4.2.0] - 2024-06-12

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

### Fixed
- Fixe the `jekyll-sass-converter` dependency requirement (which is a dependency of `jekyll`) by updating to ruby 3.3

## [4.1.2] - 2023-11-14

### 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 37d87cc

Please sign in to comment.