From e2c30136766169744fcacd78480afa1ef78ac33e Mon Sep 17 00:00:00 2001 From: Gerard Braad Date: Sun, 11 Jun 2023 02:28:41 +0000 Subject: [PATCH] Update to bookworm --- .codesandbox/Dockerfile | 2 +- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- README.md | 4 ++-- containers/Dockerfile-base | 6 +++--- containers/Dockerfile-dotfiles | 2 +- containers/Dockerfile-systemd | 2 +- containers/Dockerfile-toolbox | 2 +- gitpod/Dockerfile | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.codesandbox/Dockerfile b/.codesandbox/Dockerfile index 4369402..cc91541 100644 --- a/.codesandbox/Dockerfile +++ b/.codesandbox/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ghcr.io/gbraad-devenv/debian/base:bullseye +FROM --platform=linux/amd64 ghcr.io/gbraad-devenv/debian/base:bookworm USER gbraad diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2982e82..048ae41 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1 +1 @@ -FROM --platform=linux/amd64 ghcr.io/gbraad-devenv/debian/base:bullseye +FROM --platform=linux/amd64 ghcr.io/gbraad-devenv/debian/base:bookworm diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 290ef92..08f0d1e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ { "name": "Debian developer environment", //"dockerFile": "Dockerfile", - "image": "ghcr.io/gbraad-devenv/debian/base:bullseye", + "image": "ghcr.io/gbraad-devenv/debian/base:bookworm", "context": "..", "runArgs": [ "--cap-add=NET_ADMIN", "--cap-add=NET_RAW", "--device=/dev/net/tun" ], "postStartCommand": "github/install.sh", diff --git a/README.md b/README.md index cdade5c..9f46bfb 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ Usage ### Podman ```bash -$ podman run -it ghcr.io/gbraad-devenv/debian/dotfiles:bullseye /bin/zsh +$ podman run -it ghcr.io/gbraad-devenv/debian/dotfiles:bookworm /bin/zsh ``` or with [Tailscale](https://tailscale.com) enabled: ```bash -$ podman run -it --cap-add=NET_ADMIN --cap-add=NET_RAW --device=/dev/net/tun ghcr.io/gbraad-devenv/debian/dotfiles:bullseye /bin/zsh +$ podman run -it --cap-add=NET_ADMIN --cap-add=NET_RAW --device=/dev/net/tun ghcr.io/gbraad-devenv/debian/dotfiles:bookworm /bin/zsh ``` Authors diff --git a/containers/Dockerfile-base b/containers/Dockerfile-base index 1a3789e..c76d023 100644 --- a/containers/Dockerfile-base +++ b/containers/Dockerfile-base @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:bookworm USER root @@ -19,8 +19,8 @@ RUN apt-get update \ RUN curl -sSL https://raw.githubusercontent.com/gbraad/dotfiles/master/install.sh | sh -RUN curl -fsSL https://pkgs.tailscale.com/stable/debian/bullseye.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null \ - && curl -fsSL https://pkgs.tailscale.com/stable/debian/bullseye.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list \ +RUN curl -fsSL https://pkgs.tailscale.com/stable/debian/bookworm.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null \ + && curl -fsSL https://pkgs.tailscale.com/stable/debian/bookworm.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list \ && sudo apt-get update \ && sudo apt-get install -y \ tailscale \ diff --git a/containers/Dockerfile-dotfiles b/containers/Dockerfile-dotfiles index ef60d72..327c580 100644 --- a/containers/Dockerfile-dotfiles +++ b/containers/Dockerfile-dotfiles @@ -1,4 +1,4 @@ -FROM ghcr.io/gbraad-devenv/debian/base:bullseye +FROM ghcr.io/gbraad-devenv/debian/base:bookworm RUN git clone https://github.com/gbraad/dotfiles ~/.dotfiles \ && ~/.dotfiles/install.sh diff --git a/containers/Dockerfile-systemd b/containers/Dockerfile-systemd index ade6d82..ee0349b 100644 --- a/containers/Dockerfile-systemd +++ b/containers/Dockerfile-systemd @@ -1,4 +1,4 @@ -FROM ghcr.io/gbraad-devenv/debian/dotfiles:bullseye +FROM ghcr.io/gbraad-devenv/debian/dotfiles:bookworm USER root diff --git a/containers/Dockerfile-toolbox b/containers/Dockerfile-toolbox index 0956e34..84ad071 100644 --- a/containers/Dockerfile-toolbox +++ b/containers/Dockerfile-toolbox @@ -1,4 +1,4 @@ -FROM ghcr.io/gbraad-devenv/debian/base:bullseye +FROM ghcr.io/gbraad-devenv/debian/base:bookworm USER root diff --git a/gitpod/Dockerfile b/gitpod/Dockerfile index 56b3cf9..3ed4bef 100644 --- a/gitpod/Dockerfile +++ b/gitpod/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ghcr.io/gbraad-devenv/debian/base:bullseye +FROM --platform=linux/amd64 ghcr.io/gbraad-devenv/debian/base:bookworm USER root