Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/jekyll/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VARIANT=3.3-bookworm
ARG VARIANT=3.4-bookworm
FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT}

USER root
Expand Down
6 changes: 3 additions & 3 deletions src/jekyll/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
- `mcr.microsoft.com/devcontainers/jekyll:buster`

You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
- `mcr.microsoft.com/devcontainers/jekyll:3` (or `3-bookworm`, `3-bullseye` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/jekyll:3.0` (or `3.0-bookworm`, `3.0-bullseye` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/jekyll:3.0.0` (or `3.0.0-bookworm`, `3.0.0-bullseye` to pin to an OS version)

- `mcr.microsoft.com/devcontainers/jekyll:2` (or `2-bookworm`, `2-bullseye` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/jekyll:2.1` (or `2.1-bookworm`, `2.1-bullseye` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/jekyll:2.1.20` (or `2.1.20-bookworm`, `2.1.20-bullseye` to pin to an OS version)

However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `2-bullseye`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.

Expand Down
13 changes: 11 additions & 2 deletions src/jekyll/manifest.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
{
"version": "2.1.21",
"version": "2.2.0",
"variants": [
"3.4-bookworm",
"3.3-bookworm",
"3.3-bullseye"
],
"build": {
"latest": "3.3-bookworm",
"latest": "3.4-bookworm",
"parent": "ruby",
"rootDistro": "debian",
"architectures": {
"3.4-bookworm": [
"linux/amd64",
"linux/arm64"
],
"3.3-bookworm": [
"linux/amd64",
"linux/arm64"
Expand All @@ -22,6 +27,10 @@
"jekyll:${VERSION}-${VARIANT}"
],
"variantTags": {
"3.4-bookworm": [
"jekyll:${VERSION}",
"jekyll:${VERSION}-bookworm"
],
"3.3-bookworm": [
"jekyll:${VERSION}",
"jekyll:${VERSION}-bookworm"
Expand Down