diff --git a/base/Dockerfile b/base/Dockerfile index 17ccabca5..34e369c84 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:focal +FROM buildpack-deps:jammy COPY install-packages upgrade-packages /usr/bin/ diff --git a/base/install-packages b/base/install-packages index e538baad2..2f651961b 100755 --- a/base/install-packages +++ b/base/install-packages @@ -26,7 +26,7 @@ if [[ $EUID != 0 ]]; then fi # Set a runlevel to avoid invoke-rc.d warnings -# http://manpages.ubuntu.com/manpages/focal/man8/runlevel.8.html#environment +# http://manpages.ubuntu.com/manpages/jammy/man8/runlevel.8.html#environment # shellcheck disable=SC2034 RUNLEVEL=1 diff --git a/chunks/lang-c/Dockerfile b/chunks/lang-c/Dockerfile index 1f0215042..37b85b31b 100644 --- a/chunks/lang-c/Dockerfile +++ b/chunks/lang-c/Dockerfile @@ -7,8 +7,8 @@ USER root ENV TRIGGER_REBUILD=1 RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg \ - && echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/focal/ \ - llvm-toolchain-focal-15 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ \ + llvm-toolchain-jammy-15 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \ && apt update \ && install-packages \ clang \ diff --git a/chunks/lang-elixir/Dockerfile b/chunks/lang-elixir/Dockerfile index 98eaabf52..16271d135 100644 --- a/chunks/lang-elixir/Dockerfile +++ b/chunks/lang-elixir/Dockerfile @@ -6,9 +6,7 @@ USER root # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer. ENV TRIGGER_REBUILD=1 -RUN cd /tmp \ - && wget https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb \ - && dpkg -i erlang-solutions_2.0_all.deb \ - && install-packages elixir +# jammy provides Erlang/OTP 24: https://packages.ubuntu.com/jammy/erlang +RUN install-packages elixir USER gitpod diff --git a/chunks/tool-tailscale/Dockerfile b/chunks/tool-tailscale/Dockerfile index 09df4b407..2482ca708 100644 --- a/chunks/tool-tailscale/Dockerfile +++ b/chunks/tool-tailscale/Dockerfile @@ -6,8 +6,8 @@ USER root # Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer. ENV TRIGGER_REBUILD=1 -RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.gpg | sudo apt-key add - \ - && curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.list | sudo tee /etc/apt/sources.list.d/tailscale.list \ +RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.gpg | sudo apt-key add - \ + && curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.list | sudo tee /etc/apt/sources.list.d/tailscale.list \ && apt-get update \ && apt-get install -y tailscale \ && rm /etc/apt/sources.list.d/tailscale.list