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

Upgrade Ubuntu container to 22.04 #302

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade Ubuntu container to 22.04 #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions docker/linux/common_fun.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ install_build () {
setup_tcpdump () {
# Setup tcpdump for non-root.
groupadd -r pcap
chgrp pcap /usr/sbin/tcpdump
chmod 750 /usr/sbin/tcpdump
setcap cap_net_raw,cap_net_admin=eip /usr/sbin/tcpdump
chgrp pcap /usr/bin/tcpdump
chmod 750 /usr/bin/tcpdump
setcap cap_net_raw,cap_net_admin=eip /usr/bin/tcpdump
}

## PPCLE64 FUN
Expand Down
6 changes: 3 additions & 3 deletions docker/linux/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal@sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba as env
FROM ubuntu:jammy@sha256:c9cf959fd83770dfdefd8fb42cfef0761432af36a764c077aed54bbc5bb25368 as env
ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip \
APT_KEY_TOOLCHAIN=60C317803A41BA51845E371A1E9377A2BA9EF27F \
APT_KEY_AZUL=0xB1998361219BD9C9 \
Expand Down Expand Up @@ -79,8 +79,8 @@ COPY \
FROM full as cmake
RUN --mount=type=tmpfs,target=/var/cache/apt \
--mount=type=tmpfs,target=/var/lib/apt/lists \
curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
&& echo "deb https://apt.kitware.com/ubuntu/ focal main" >> /etc/apt/sources.list \
curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc -o /etc/apt/trusted.gpg.d/kitware.asc \
&& echo "deb https://apt.kitware.com/ubuntu/ jammy main" >> /etc/apt/sources.list \
&& apt-get -qq update -y \
&& apt-get -qq install --no-install-recommends cmake ninja-build

Expand Down
6 changes: 3 additions & 3 deletions docker/linux/ubuntu/fun.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ add_ubuntu_keys () {

add_apt_key () {
apt-get update -y
wget -q -O - "$1" | apt-key add -
wget -q -O - "$1" > /etc/apt/trusted.gpg.d/"$2"
}

add_apt_k8s_key () {
Expand Down Expand Up @@ -174,7 +174,7 @@ install () {
if [[ "$ARCH" == "ppc64le" ]]; then
install_ppc64le_bazel
fi
add_apt_key "${APT_KEY_DOCKER}"
add_apt_key "${APT_KEY_DOCKER}" "docker.asc"
add_apt_k8s_key "${APT_KEY_K8S}"
add_apt_repos "${APT_REPOS[@]}"
apt-get -qq update
Expand All @@ -195,7 +195,7 @@ install_ci () {
}

install_llvm () {
add_apt_key "${APT_KEY_KITWARE}"
add_apt_key "${APT_KEY_KITWARE}" "kitware.asc"
add_apt_repos "${APT_REPOS_LLVM[@]}"
apt-get -qq update -y
apt-get -qq install -y --no-install-recommends "${LLVM_PACKAGES[@]}"
Expand Down