Skip to content

Commit 46fc8e1

Browse files
committed
Update Rust and Debian
1 parent 6ee3b4f commit 46fc8e1

File tree

5 files changed

+5
-20
lines changed

5 files changed

+5
-20
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/rust/.devcontainer/base.Dockerfile
22

3-
# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye
4-
ARG VARIANT="buster"
5-
FROM mcr.microsoft.com/vscode/devcontainers/rust:0-${VARIANT}
3+
FROM mcr.microsoft.com/vscode/devcontainers/rust:1-1-bookworm
64

75
RUN dpkg --add-architecture arm64 && \
86
apt-get update && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/devcontainer.json

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/rust
31
{
42
"name": "Rust",
53
"build": {
64
"dockerfile": "Dockerfile",
7-
"args": {
8-
// Use the VARIANT arg to pick a Debian OS version: buster, bullseye
9-
// Use bullseye when on local on arm64/Apple Silicon.
10-
"VARIANT": "bullseye"
11-
}
125
},
136
"runArgs": [
14-
"--cap-add=SYS_PTRACE",
15-
"--security-opt",
16-
"seccomp=unconfined",
177
"--env-file", ".devcontainer/devcontainer.env"
188
],
199

@@ -50,8 +40,5 @@
5040
// "postCreateCommand": "rustc --version",
5141

5242
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
53-
"remoteUser": "vscode",
54-
"features": {
55-
"docker-from-docker": "20.10"
56-
}
43+
"remoteUser": "vscode"
5744
}

.woodpecker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
- &rust 'rust:1.66.0-bullseye'
2+
- &rust 'rust:1.72.0-bookworm'
33
- &buildx_plugin 'woodpeckerci/plugin-docker-buildx:2.1.0'
44

55
pipeline:

Dockerfile.distroless.multiarch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gcr.io/distroless/cc-debian11:nonroot
1+
FROM gcr.io/distroless/cc-debian12:nonroot
22

33
LABEL org.opencontainers.image.source https://github.com/windsource/picus
44

Dockerfile.multiarch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:11.5-slim
1+
FROM debian:12.1-slim
22

33
LABEL org.opencontainers.image.source https://github.com/windsource/picus
44

0 commit comments

Comments
 (0)