From b6f73802c1536088e7a3780724649637b1480ea6 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Fri, 22 Apr 2022 08:57:14 +0000 Subject: [PATCH 1/2] Update Ubuntu from focal (20.04) to jammy (22.04) Signed-off-by: Takuya Noguchi --- base/Dockerfile | 2 +- base/install-packages | 2 +- chunks/lang-c/Dockerfile | 4 ++-- chunks/tool-tailscale/Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 5c7851f85..3255345e5 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 b2edcb081..6d26f7b13 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 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 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \ && apt update \ && install-packages \ clang \ diff --git a/chunks/tool-tailscale/Dockerfile b/chunks/tool-tailscale/Dockerfile index b6cf6b0e6..fc182eb68 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 From c08dd7b838e2c8eb549ece4dc91be0ea2d0a899f Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Fri, 22 Apr 2022 21:31:00 +0000 Subject: [PATCH 2/2] Usse Ubuntu official package for elixir Signed-off-by: Takuya Noguchi --- chunks/lang-elixir/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/chunks/lang-elixir/Dockerfile b/chunks/lang-elixir/Dockerfile index 05e0e8854..16271d135 100644 --- a/chunks/lang-elixir/Dockerfile +++ b/chunks/lang-elixir/Dockerfile @@ -6,10 +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 curl -fsSL https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | sudo gpg --dearmor -o /usr/share/keyrings/erlang_solutions.gpg.key \ - && echo "deb [signed-by=/usr/share/keyrings/erlang_solutions.gpg.key] https://packages.erlang-solutions.com/ubuntu focal contrib" | sudo tee /etc/apt/sources.list.d/erlang.list > /dev/null \ - && apt update \ - && install-packages \ - elixir +# jammy provides Erlang/OTP 24: https://packages.ubuntu.com/jammy/erlang +RUN install-packages elixir USER gitpod