Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Add Alpine 3.15, drop EOL 3.11 #1181

Merged
merged 4 commits into from
Nov 30, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
10 changes: 3 additions & 7 deletions .github/actions/smoke-test/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@ export DOCKER_BUILDKIT=1

# Symlink build scripts from main to improve security when testing PRs
if [ -d "$GITHUB_WORKSPACE/__build/build" ]; then
cd "$GITHUB_WORKSPACE/__build"
yarn install
cd "$GITHUB_WORKSPACE"
rm -rf build node_modules
ln -s "$GITHUB_WORKSPACE/__build/build" build
ln -s "$GITHUB_WORKSPACE/__build/node_modules" node_modules
cp -r "$GITHUB_WORKSPACE/__build/build" "$GITHUB_WORKSPACE/"
else
echo "WARNING: Using build/vscdc from $GITHUB_REF instead of main."
yarn install
fi
rm -rf node_modules
yarn install

# Run test build
chmod +x build/vscdc
Expand Down
4 changes: 2 additions & 2 deletions containers/alpine/.devcontainer/base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# [Choice] Alpine version: 3.14, 3.13, 3.12, 3.11
ARG VARIANT=3.13
# [Choice] Alpine version: 3.15, 3.14, 3.13, 3.12, 3.11
ARG VARIANT=3.15
FROM alpine:${VARIANT}

# [Option] Install zsh
Expand Down
4 changes: 2 additions & 2 deletions containers/alpine/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "Alpine",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick an Alpine version: 3.11, 3.12, 3.13, 3.14
"args": { "VARIANT": "3.14" }
// Update 'VARIANT' to pick an Alpine version: 3.12, 3.13, 3.14, 3.15
"args": { "VARIANT": "3.15" }
},

// Set *default* container specific settings.json values on container create.
Expand Down
10 changes: 5 additions & 5 deletions containers/alpine/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
| *Categories* | Core, Other |
| *Definition type* | Dockerfile |
| *Published images* | mcr.microsoft.com/vscode/devcontainers/base:alpine |
| *Available image variants* | 3.14, 3.13, 3.12, 3.11 ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/base/tags/list)) |
| *Available image variants* | 3.15, 3.14, 3.13, 3.12 ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/base/tags/list)) |
| *Published image architecture(s)* | x86-64, aarch64/arm64 |
| *Works in Codespaces* | Yes |
| *Container host OS support* | Linux, macOS, Windows |
Expand All @@ -24,22 +24,22 @@ See **[history](history)** for information on the contents of published images.
While the definition itself works unmodified, you can select the version of Alpine the container uses by updating the `VARIANT` arg in the included `devcontainer.json` (and rebuilding if you've already created the container).

```json
"args": { "VARIANT": "3.13" }
"args": { "VARIANT": "3.14" }
```

You can also directly reference pre-built versions of `.devcontainer/base.Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.

- `mcr.microsoft.com/vscode/devcontainers/base:alpine` (latest)
- `mcr.microsoft.com/vscode/devcontainers/base:alpine-3.11`
- `mcr.microsoft.com/vscode/devcontainers/base:alpine-3.12`
- `mcr.microsoft.com/vscode/devcontainers/base:alpine-3.13`
- `mcr.microsoft.com/vscode/devcontainers/base:alpine-3.14`
- `mcr.microsoft.com/vscode/devcontainers/base:alpine-3.15`

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

- `mcr.microsoft.com/vscode/devcontainers/base:0-alpine`
- `mcr.microsoft.com/vscode/devcontainers/base:0.201-alpine`
- `mcr.microsoft.com/vscode/devcontainers/base:0.201.5-alpine`
- `mcr.microsoft.com/vscode/devcontainers/base:0.204-alpine`
- `mcr.microsoft.com/vscode/devcontainers/base:0.204.0-alpine`

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/vscode/devcontainers/base/tags/list).

Expand Down
6 changes: 3 additions & 3 deletions containers/alpine/definition-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"variants": ["3.14", "3.13", "3.12", "3.11"],
"definitionVersion": "0.203.1",
"variants": ["3.15", "3.14", "3.13", "3.12"],
"definitionVersion": "0.204.0",
"build": {
"latest": false,
"rootDistro": "alpine",
Expand All @@ -10,7 +10,7 @@
"base:${VERSION}-alpine${VARIANT}"
],
"variantTags": {
"3.14": [
"3.15": [
"base:${VERSION}-alpine"
]
}
Expand Down