Skip to content

Commit

Permalink
Update Rust and Debian
Browse files Browse the repository at this point in the history
  • Loading branch information
windsource committed Oct 3, 2023
1 parent 6ee3b4f commit 46fc8e1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/rust/.devcontainer/base.Dockerfile

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

RUN dpkg --add-architecture arm64 && \
apt-get update && export DEBIAN_FRONTEND=noninteractive \
Expand Down
15 changes: 1 addition & 14 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/rust
{
"name": "Rust",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Use the VARIANT arg to pick a Debian OS version: buster, bullseye
// Use bullseye when on local on arm64/Apple Silicon.
"VARIANT": "bullseye"
}
},
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined",
"--env-file", ".devcontainer/devcontainer.env"
],

Expand Down Expand Up @@ -50,8 +40,5 @@
// "postCreateCommand": "rustc --version",

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"features": {
"docker-from-docker": "20.10"
}
"remoteUser": "vscode"
}
2 changes: 1 addition & 1 deletion .woodpecker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
- &rust 'rust:1.66.0-bullseye'
- &rust 'rust:1.72.0-bookworm'
- &buildx_plugin 'woodpeckerci/plugin-docker-buildx:2.1.0'

pipeline:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.distroless.multiarch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/distroless/cc-debian11:nonroot
FROM gcr.io/distroless/cc-debian12:nonroot

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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.multiarch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:11.5-slim
FROM debian:12.1-slim

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

Expand Down

0 comments on commit 46fc8e1

Please sign in to comment.