Skip to content

Commit

Permalink
[nc] iterating on ubuntu build and gha-tools-action bugs
Browse files Browse the repository at this point in the history
Signed-off-by: Nic Cheneweth <[email protected]>
  • Loading branch information
ncheneweth committed Oct 17, 2024
1 parent 85bec29 commit 3d0d84a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes && \
gnupg=2.4.4-2ubuntu18 \
gnupg-agent=2.4.4-2ubuntu18 \
ca-certificates=20240203 && \
mkdir -m 0755 -d /etc/apt/keyrings && \
mkdir -p -m 755 /etc/apt/keyrings && \
wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null && \
chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
Expand All @@ -66,7 +66,7 @@ RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes && \
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo noble) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
apt-get update && \
apt-get install --no-install-recommends -y \
gh=2.58.0 \
gh=2.59.0 \
docker-ce=${DOCKER_VERSION} \
docker-ce-cli=${DOCKER_VERSION} \
containerd.io=1.7.21-1 \
Expand Down
2 changes: 1 addition & 1 deletion test/gha-container-base-image-ubuntu.bats
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@

@test "gh version" {
run bash -c "docker exec gha-container-base-image gh --version"
[[ "${output}" =~ "2.58" ]]
[[ "${output}" =~ "2.59" ]]
}

0 comments on commit 3d0d84a

Please sign in to comment.