Skip to content

Commit 6ee6d04

Browse files
committed
Try Jammy
1 parent 829706d commit 6ee6d04

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ e.g.
159159
# fetch keyring over https connection and unpack it using gpg's --dearmor option
160160
curl -fsSL https://apt.my-secure.org/my-unofficial-repo.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/my-unofficial-repo.gpg.key
161161
# and then add them to a apt key sources list.
162-
echo "deb [signed-by=/usr/share/keyrings/my-unofficial-repo.gpg.key] http://apt.my-secure.org/focal/ \
162+
echo "deb [signed-by=/usr/share/keyrings/my-unofficial-repo.gpg.key] http://apt.my-secure.org/jammy/ \
163163
my-unofficial-repo-toolchain main" | sudo tee /etc/apt/sources.list.d/my-unofficial-repo.list > /dev/null
164164
```
165165

base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM buildpack-deps:focal
1+
FROM buildpack-deps:jammy
22

33
COPY install-packages upgrade-packages /usr/bin/
44

base/install-packages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [[ $EUID != 0 ]]; then
2626
fi
2727

2828
# Set a runlevel to avoid invoke-rc.d warnings
29-
# http://manpages.ubuntu.com/manpages/focal/man8/runlevel.8.html#environment
29+
# http://manpages.ubuntu.com/manpages/jammy/man8/runlevel.8.html#environment
3030
# shellcheck disable=SC2034
3131
RUNLEVEL=1
3232

chunks/dep-cacert-update/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ FROM ${base}
44
USER gitpod
55

66
# Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
7-
ENV TRIGGER_REBUILD=1
7+
ENV TRIGGER_REBUILD=2
88

99
RUN sudo apt-get install -y --only-upgrade ca-certificates

chunks/lang-c/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ USER root
77
ENV TRIGGER_REBUILD=1
88

99
RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg \
10-
&& echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/focal/ \
11-
llvm-toolchain-focal-15 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \
10+
&& echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ \
11+
llvm-toolchain-jammy-15 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \
1212
&& apt update \
1313
&& install-packages \
1414
clang \

chunks/lang-elixir/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ USER root
77
ENV TRIGGER_REBUILD=1
88

99
RUN cd /tmp \
10-
&& wget https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb \
11-
&& dpkg -i erlang-solutions_2.0_all.deb \
1210
&& install-packages elixir
1311

1412
USER gitpod

chunks/tool-tailscale/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ USER root
66
# Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
77
ENV TRIGGER_REBUILD=2
88

9-
RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.gpg | sudo apt-key add - \
10-
&& curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.list | sudo tee /etc/apt/sources.list.d/tailscale.list \
9+
RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.gpg | sudo apt-key add - \
10+
&& curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.list | sudo tee /etc/apt/sources.list.d/tailscale.list \
1111
&& apt-get update \
1212
&& apt-get install -y tailscale \
1313
&& rm /etc/apt/sources.list.d/tailscale.list \

0 commit comments

Comments
 (0)