From 3d0d84aaedb2db6351df16604c4b9df0011a5b90 Mon Sep 17 00:00:00 2001 From: Nic Cheneweth Date: Wed, 16 Oct 2024 20:47:30 -0500 Subject: [PATCH] [nc] iterating on ubuntu build and gha-tools-action bugs Signed-off-by: Nic Cheneweth --- Dockerfile.ubuntu | 4 ++-- test/gha-container-base-image-ubuntu.bats | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 36595f1..476a02b 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -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 && \ @@ -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 \ diff --git a/test/gha-container-base-image-ubuntu.bats b/test/gha-container-base-image-ubuntu.bats index 11b63b9..4ba5f77 100644 --- a/test/gha-container-base-image-ubuntu.bats +++ b/test/gha-container-base-image-ubuntu.bats @@ -67,5 +67,5 @@ @test "gh version" { run bash -c "docker exec gha-container-base-image gh --version" - [[ "${output}" =~ "2.58" ]] + [[ "${output}" =~ "2.59" ]] }