Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change base image to Ubuntu Jammy #1017

Merged
merged 17 commits into from
Mar 6, 2023
Merged

Change base image to Ubuntu Jammy #1017

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
83d9a2c
Update buildkit and dazzle dependencies
kylos101 Jan 30, 2023
23d24b2
Update Dazzle and consolidate source of truths for dazzle and buildkit
kylos101 Mar 2, 2023
cf73555
Update to Jammy
kylos101 Feb 8, 2023
04b1ffc
Use asdf to manage Elxir and Erlang
kylos101 Feb 8, 2023
e353f61
Go 1.18 was failing, replace with 1.20
kylos101 Feb 8, 2023
92554b9
Update Rust
kylos101 Feb 8, 2023
668c240
Bump Ruby
kylos101 Feb 9, 2023
1a6e62c
Deprecate Ruby 2.7 and update 3.0 to 3.0.5
kylos101 Mar 1, 2023
0ea1c8d
Fix Java tests
kylos101 Mar 2, 2023
4f7c926
Install OpenSSL conditionally for Ruby 3.0
kylos101 Mar 2, 2023
91e2566
Add cmake to tool-brew chunk
kylos101 Mar 2, 2023
1910af6
Support Mongo on Jammy
kylos101 Mar 2, 2023
7ea2cff
Node changes
kylos101 Mar 2, 2023
0aac4e1
Fix postgresql 12 on Jammy
kylos101 Mar 2, 2023
c629f3d
Patch nvm version
kylos101 Mar 2, 2023
cfc61ef
Bump Python and Ruby in gitpod/workspace-full
kylos101 Mar 3, 2023
f2acc9e
Fix yugabytedb on Jammy, combo not compatible with Python chunk tests
kylos101 Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to Jammy
  • Loading branch information
@kylos101
kylos101 committed Mar 4, 2023
commit cf73555375d80fb9ac5cc140d58177fbf233fa2f
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ e.g.
# fetch keyring over https connection and unpack it using gpg's --dearmor option
curl -fsSL https://apt.my-secure.org/my-unofficial-repo.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/my-unofficial-repo.gpg.key
# and then add them to a apt key sources list.
echo "deb [signed-by=/usr/share/keyrings/my-unofficial-repo.gpg.key] http://apt.my-secure.org/focal/ \
echo "deb [signed-by=/usr/share/keyrings/my-unofficial-repo.gpg.key] http://apt.my-secure.org/jammy/ \
my-unofficial-repo-toolchain main" | sudo tee /etc/apt/sources.list.d/my-unofficial-repo.list > /dev/null
```

Expand Down
2 changes: 1 addition & 1 deletion base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:focal
FROM buildpack-deps:jammy

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

Expand Down
2 changes: 1 addition & 1 deletion base/install-packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions chunks/lang-c/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions chunks/tool-tailscale/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=3

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 \
Comment on lines +9 to +10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion (non-blocking): How about we do this, this would save us from managing it manually.

Suggested change
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 \
RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/$(lsb_release -cs).gpg | sudo apt-key add - \
&& curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/$(lsb_release -cs).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 \
Expand Down