Skip to content

Commit c5dc00e

Browse files
Kaniska244Kaniska244
authored
Updated fix for vulnerability issue CVE-2024-46901 (devcontainers#1518)
* Updated fix for vulnerability issue CVE-2024-46901 * version bump and readme files updates and housekeeping
1 parent d3dedd8 commit c5dc00e

File tree

21 files changed

+122
-24
lines changed

21 files changed

+122
-24
lines changed

‎src/go/.devcontainer/scripts/install-subversion.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
#!/bin/bash
22
set -eux
33

4+
REQUIRED="1.14.5"
5+
6+
# Determine current svn version if present
7+
current=""
8+
if command -v svn >/dev/null 2>&1; then
9+
current="$(svn --version --quiet 2>/dev/null || true)"
10+
fi
11+
12+
# If current version is >= REQUIRED, skip building
13+
if [ -n "${current}" ] && dpkg --compare-versions "${current}" ge "${REQUIRED}"; then
14+
echo "Subversion ${current} is >= ${REQUIRED}; skipping build."
15+
exit 0
16+
fi
17+
418
URL="https://archive.apache.org/dist/subversion/subversion-1.14.5.tar.gz"
519
TMP="/tmp"
620
TARBALL="subversion-1.14.5.tar.gz"

‎src/go/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
3131

3232
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3333

34-
- `mcr.microsoft.com/devcontainers/go:1-1.25` (or `1-1.25-trixie`, `1-1.25-bookworm`)
35-
- `mcr.microsoft.com/devcontainers/go:1.4-1.25` (or `1.4-1.25-bookworm`, `1.4-1.25-bullseye`)
36-
- `mcr.microsoft.com/devcontainers/go:1.4.0-1.25` (or `1.4.0-1.25-bookworm`, `1.4.0-1.25-bullseye`)
34+
- `mcr.microsoft.com/devcontainers/go:2-1.25` (or `2-1.25-trixie`, `2-1.25-bookworm`)
35+
- `mcr.microsoft.com/devcontainers/go:2.0-1.25` (or `2.0-1.25-trixie`, `2.0-1.25-bookworm`)
36+
- `mcr.microsoft.com/devcontainers/go:2.0.1-1.25` (or `2.0.1-1.25-trixie`, `2.0.1-1.25-bookworm`)
3737

38-
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. `1-1.25`). 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.
38+
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-1.25`). 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.
3939

4040
See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/go/tags/list).
4141

‎src/go/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.0",
2+
"version": "2.0.1",
33
"variants": [
44
"1.25-trixie",
55
"1.24-trixie",

‎src/javascript-node/.devcontainer/scripts/install-subversion.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
#!/bin/bash
22
set -eux
33

4+
REQUIRED="1.14.5"
5+
6+
# Determine current svn version if present
7+
current=""
8+
if command -v svn >/dev/null 2>&1; then
9+
current="$(svn --version --quiet 2>/dev/null || true)"
10+
fi
11+
12+
# If current version is >= REQUIRED, skip building
13+
if [ -n "${current}" ] && dpkg --compare-versions "${current}" ge "${REQUIRED}"; then
14+
echo "Subversion ${current} is >= ${REQUIRED}; skipping build."
15+
exit 0
16+
fi
17+
418
URL="https://archive.apache.org/dist/subversion/subversion-1.14.5.tar.gz"
519
TMP="/tmp"
620
TARBALL="subversion-1.14.5.tar.gz"

‎src/javascript-node/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
3030

3131
- `mcr.microsoft.com/devcontainers/javascript-node:4-24` (or `4-24-trixie`, `4-24-bookworm`, `4-24-bullseye`)
3232
- `mcr.microsoft.com/devcontainers/javascript-node:4.0-24` (or `4.0-24-trixie`, `4.0-24-bookworm`, `3.0-24-bullseye`)
33-
- `mcr.microsoft.com/devcontainers/javascript-node:4.0.0-24` (or `4.0.0-24-trixie`, `4.0.0-24-bookworm`, `4.0.0-24-bullseye`)
33+
- `mcr.microsoft.com/devcontainers/javascript-node:4.0.1-24` (or `4.0.1-24-trixie`, `4.0.1-24-bookworm`, `4.0.1-24-bullseye`)
3434

3535
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. `4-24`). 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.
3636

‎src/javascript-node/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "4.0.0",
2+
"version": "4.0.1",
33
"variants": [
44
"24-trixie",
55
"22-trixie",

‎src/jekyll/.devcontainer/scripts/install-subversion.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
#!/bin/bash
22
set -eux
33

4+
REQUIRED="1.14.5"
5+
6+
# Determine current svn version if present
7+
current=""
8+
if command -v svn >/dev/null 2>&1; then
9+
current="$(svn --version --quiet 2>/dev/null || true)"
10+
fi
11+
12+
# If current version is >= REQUIRED, skip building
13+
if [ -n "${current}" ] && dpkg --compare-versions "${current}" ge "${REQUIRED}"; then
14+
echo "Subversion ${current} is >= ${REQUIRED}; skipping build."
15+
exit 0
16+
fi
17+
418
URL="https://archive.apache.org/dist/subversion/subversion-1.14.5.tar.gz"
519
TMP="/tmp"
620
TARBALL="subversion-1.14.5.tar.gz"

‎src/jekyll/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
3636

3737
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3838

39-
- `mcr.microsoft.com/devcontainers/jekyll:2` (or `2-bookworm`, `2-bullseye`, `2-buster` to pin to an OS version)
40-
- `mcr.microsoft.com/devcontainers/jekyll:2.0` (or `2.0-bookworm`, `2.0-bullseye`, `2.0-buster` to pin to an OS version)
41-
- `mcr.microsoft.com/devcontainers/jekyll:2.0.0` (or `2.0.0-bookworm`, `2.0.0-bullseye`, `2.0.0-buster` to pin to an OS version)
39+
- `mcr.microsoft.com/devcontainers/jekyll:2` (or `2-bookworm`, `2-bullseye` to pin to an OS version)
40+
- `mcr.microsoft.com/devcontainers/jekyll:2.1` (or `2.1-bookworm`, `2.1-bullseye` to pin to an OS version)
41+
- `mcr.microsoft.com/devcontainers/jekyll:2.1.20` (or `2.1.20-bookworm`, `2.1.20-bullseye` to pin to an OS version)
4242

4343
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.
4444

‎src/jekyll/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.1.19",
2+
"version": "2.1.20",
33
"variants": [
44
"3.3-bookworm",
55
"3.3-bullseye"

‎src/python/.devcontainer/scripts/install-subversion.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
#!/bin/bash
22
set -eux
33

4+
REQUIRED="1.14.5"
5+
6+
# Determine current svn version if present
7+
current=""
8+
if command -v svn >/dev/null 2>&1; then
9+
current="$(svn --version --quiet 2>/dev/null || true)"
10+
fi
11+
12+
# If current version is >= REQUIRED, skip building
13+
if [ -n "${current}" ] && dpkg --compare-versions "${current}" ge "${REQUIRED}"; then
14+
echo "Subversion ${current} is >= ${REQUIRED}; skipping build."
15+
exit 0
16+
fi
17+
418
URL="https://archive.apache.org/dist/subversion/subversion-1.14.5.tar.gz"
519
TMP="/tmp"
620
TARBALL="subversion-1.14.5.tar.gz"

0 commit comments

Comments
 (0)