Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Save keys to /etc/apt/keyrings instead of using apt-key #988

Merged
merged 1 commit into from
Sep 6, 2024
Merged
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,15 @@ RUN set -Eeux && \
\
apt-get update && \
apt-get install -y apt-transport-https apt-utils software-properties-common ca-certificates curl gnupg-agent && \
$CURL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \
$CURL https://cli.github.com/packages/githubcli-archive-keyring.gpg | apt-key add - && \
add-apt-repository 'deb [arch=amd64] https://cli.github.com/packages stable main' && \
mkdir -p -m 755 /etc/apt/keyrings && \
$CURL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc && \
chmod a+r /etc/apt/keyrings/docker.asc && \
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list && \
$CURL https://cli.github.com/packages/githubcli-archive-keyring.gpg -o /etc/apt/keyrings/githubcli.gpg && \
chmod a+r /etc/apt/keyrings/githubcli.gpg && \
echo 'deb [arch=amd64 signed-by=/etc/apt/keyrings/githubcli.gpg] https://cli.github.com/packages stable main' | tee /etc/apt/sources.list.d/githubcli.list && \
\
apt-get update && \
apt-get install -y busybox gettext-base git iputils-ping jq make parallel ripgrep python3 python3-distutils ssh sudo zstd docker-ce-cli docker-compose-plugin gh && \
busybox --install && \
latest_version() { \
Expand Down