Skip to content

Commit a1628eb

Browse files
jakochjakoch
committed
bump versions, switched to normal package install for fonts_powerline package
1 parent 702dd63 commit a1628eb

4 files changed

Lines changed: 21 additions & 52 deletions

File tree

‎.devcontainer/debian/12-bookworm/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ARG DEBIAN_VERSION=12
3939
ARG DEBIAN_VERSION_NAME=bookworm
4040
ARG GCC_VERSION=13.4.0
4141
ARG LLVM_VERSION=20
42-
ARG VULKAN_VERSION=1.4.321.1
42+
ARG VULKAN_VERSION=1.4.335.0
4343
ARG MESA_VERSION=22.3.6
4444

4545
# +-----------------------------+
@@ -545,8 +545,7 @@ ENV TERM=xterm-256color \
545545
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
546546
RUN echo "ZSH" && \
547547
apt-get update && apt-get install --no-install-recommends --assume-yes \
548-
# Install fonts-powerline
549-
fontconfig fonts-powerline && \
548+
zsh fontconfig fonts-powerline && \
550549
# Install Oh My Zsh
551550
curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh && \
552551
# Add Zsh plugins

‎.devcontainer/debian/13-trixie/Dockerfile‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ ARG DEBIAN_VERSION=13
5454
ARG DEBIAN_VERSION_NAME=trixie
5555
ARG GCC_VERSION=14.2.0
5656
ARG LLVM_VERSION=21
57-
ARG VULKAN_VERSION=1.4.321.1
58-
ARG MESA_VERSION=25.0.7
57+
ARG VULKAN_VERSION=1.4.335.0
58+
ARG MESA_VERSION=25.3.3
5959

6060
# +-----------------------------+
6161
# | Downloader |
@@ -558,17 +558,7 @@ ENV TERM=xterm-256color \
558558
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
559559
RUN echo "ZSH" && \
560560
apt-get update && apt-get install --no-install-recommends --assume-yes \
561-
zsh fontconfig && \
562-
# Download and install fonts-powerline
563-
# An installation via apt-get is not possible for trixie,
564-
# because the package is only available in unstable(sid).
565-
# https://packages.debian.org/sid/fonts-powerline
566-
# https://api.ftp-master.debian.org/madison?package=fonts-powerline&table=debian
567-
FONTS_POWERLINE_VERSION=$(curl -s 'https://api.ftp-master.debian.org/madison?package=fonts-powerline&table=debian&s=unstable&f=json' | jq -r '.[0]["fonts-powerline"].unstable | keys[0]'); echo "Latest Version: \"$FONTS_POWERLINE_VERSION\"" && \
568-
FONTS_POWERLINE_URL="http://ftp.de.debian.org/debian/pool/main/p/powerline/fonts-powerline_${FONTS_POWERLINE_VERSION}_all.deb" && \
569-
curl -o fonts-powerline.deb -L ${FONTS_POWERLINE_URL} && \
570-
dpkg -i fonts-powerline.deb && \
571-
rm fonts-powerline.deb && \
561+
zsh fontconfig fonts-powerline && \
572562
# Install Oh My Zsh
573563
curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh && \
574564
# Add Zsh plugins

‎.devcontainer/debian/14-forky/Dockerfile‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
# | |
2222
# | Package Versions (os upstream) |
2323
# | |
24-
# | LLVM: https://packages.debian.org/forky/llvm 19.0 |
24+
# | LLVM: https://packages.debian.org/forky/llvm 21.1 |
2525
# | GCC: https://packages.debian.org/forky/gcc 15.2.0 |
26-
# | Vulkan: https://packages.debian.org/forky/libvulkan-dev 1.4.321.0 |
27-
# | MESA: https://packages.debian.org/forky/mesa-vulkan-drivers 25.2.4 |
26+
# | Vulkan: https://packages.debian.org/forky/libvulkan-dev 1.4.335.0 |
27+
# | MESA: https://packages.debian.org/forky/mesa-vulkan-drivers 25.3.3 |
2828
# | |
2929
# |---------------------------------------------------------------------------|
3030
# | |
@@ -54,8 +54,8 @@ ARG DEBIAN_VERSION=14
5454
ARG DEBIAN_VERSION_NAME=forky
5555
ARG GCC_VERSION=15.2.0
5656
ARG LLVM_VERSION=21
57-
ARG VULKAN_VERSION=1.4.321.1
58-
ARG MESA_VERSION=25.2.4
57+
ARG VULKAN_VERSION=1.4.335.0
58+
ARG MESA_VERSION=25.3.3
5959

6060
# +-----------------------------+
6161
# | Downloader |
@@ -560,21 +560,11 @@ ENV CC=/usr/bin/clang \
560560
ENV TERM=xterm-256color \
561561
ZSH_THEME=agnoster
562562

563-
# Setup zsh for the root user
563+
# Setup zsh
564564
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
565565
RUN echo "ZSH" && \
566566
apt-get update && apt-get install --no-install-recommends --assume-yes \
567-
zsh fontconfig && \
568-
# Download and install fonts-powerline
569-
# An installation via apt-get is not possible for forky,
570-
# because the package is only available in unstable(sid).
571-
# https://packages.debian.org/sid/fonts-powerline
572-
# https://api.ftp-master.debian.org/madison?package=fonts-powerline&table=debian
573-
FONTS_POWERLINE_VERSION=$(curl -s 'https://api.ftp-master.debian.org/madison?package=fonts-powerline&table=debian&s=unstable&f=json' | jq -r '.[0]["fonts-powerline"].unstable | keys[0]'); echo "Latest Version: \"$FONTS_POWERLINE_VERSION\"" && \
574-
FONTS_POWERLINE_URL="http://ftp.de.debian.org/debian/pool/main/p/powerline/fonts-powerline_${FONTS_POWERLINE_VERSION}_all.deb" && \
575-
curl -o fonts-powerline.deb -L ${FONTS_POWERLINE_URL} && \
576-
dpkg -i fonts-powerline.deb && \
577-
rm fonts-powerline.deb && \
567+
zsh fontconfig fonts-powerline && \
578568
# Install Oh My Zsh
579569
curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh && \
580570
# Add Zsh plugins

‎.devcontainer/debian/sid-unstable/Dockerfile‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
# | |
2222
# | Package Versions (os upstream) |
2323
# | |
24-
# | LLVM: https://packages.debian.org/sid/llvm 19.0 |
25-
# | GCC: https://packages.debian.org/sid/gcc 14.2.0 |
24+
# | LLVM: https://packages.debian.org/sid/llvm 21.1 |
25+
# | GCC: https://packages.debian.org/sid/gcc 15.2.0 |
2626
# | Vulkan: https://packages.debian.org/sid/libvulkan-dev 1.4.309.0 |
27-
# | MESA: https://packages.debian.org/sid/mesa-vulkan-drivers 25.0.7 |
27+
# | MESA: https://packages.debian.org/sid/mesa-vulkan-drivers 25.3.3 |
2828
# | |
2929
# |---------------------------------------------------------------------------|
3030
# | |
@@ -40,8 +40,8 @@
4040
# +-----------------------------+
4141
# | Versions Notes |
4242
# +-----------------------------+
43-
# GCC: Because Debian SID ships GCC 14.2.0 by default, our GCC compilation is disabled.
44-
# We install GCC 14 from the distribution provided packages.
43+
# GCC: Because Debian SID ships GCC 15.2.0 by default, our GCC compilation is disabled.
44+
# We install GCC 15 from the distribution provided packages.
4545

4646
# +-----------------------------+
4747
# | GLOBAL ARGS |
@@ -52,10 +52,10 @@
5252

5353
ARG DEBIAN_VERSION=sid
5454
ARG DEBIAN_VERSION_NAME=unstable
55-
ARG GCC_VERSION=14.2.0
55+
ARG GCC_VERSION=15.2.0
5656
ARG LLVM_VERSION=21
57-
ARG VULKAN_VERSION=1.4.321.1
58-
ARG MESA_VERSION=25.0.7
57+
ARG VULKAN_VERSION=1.4.335.0
58+
ARG MESA_VERSION=25.3.3
5959

6060
# +-----------------------------+
6161
# | Downloader |
@@ -559,17 +559,7 @@ ENV TERM=xterm-256color \
559559
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
560560
RUN echo "ZSH" && \
561561
apt-get update && apt-get install --no-install-recommends --assume-yes \
562-
zsh fontconfig && \
563-
# Download and install fonts-powerline
564-
# An installation via apt-get is not possible for forky,
565-
# because the package is only available in unstable(sid).
566-
# https://packages.debian.org/sid/fonts-powerline
567-
# https://api.ftp-master.debian.org/madison?package=fonts-powerline&table=debian
568-
FONTS_POWERLINE_VERSION=$(curl -s 'https://api.ftp-master.debian.org/madison?package=fonts-powerline&table=debian&s=unstable&f=json' | jq -r '.[0]["fonts-powerline"].unstable | keys[0]'); echo "Latest Version: \"$FONTS_POWERLINE_VERSION\"" && \
569-
FONTS_POWERLINE_URL="http://ftp.de.debian.org/debian/pool/main/p/powerline/fonts-powerline_${FONTS_POWERLINE_VERSION}_all.deb" && \
570-
curl -o fonts-powerline.deb -L ${FONTS_POWERLINE_URL} && \
571-
dpkg -i fonts-powerline.deb && \
572-
rm fonts-powerline.deb && \
562+
zsh fontconfig fonts-powerline && \
573563
# Install Oh My Zsh
574564
curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh && \
575565
# Add Zsh plugins

0 commit comments

Comments
 (0)