From 03102cd681693604731339a8884aa74313c2187c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 28 Sep 2024 22:30:09 -0400 Subject: [PATCH] tests: ensure pack binary is installed correctly when running tests in a devcontainer --- .devcontainer/Dockerfile | 2 +- tests/unit/test_helper.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4e40f79ef..209e713df 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,7 +2,7 @@ FROM dokku/dokku:latest RUN apt-get update RUN apt-get install --no-install-recommends -y build-essential file nano && \ - apt-get install --no-install-recommends -y help2man shellcheck uuid-runtime wget xmlstarlet && \ + apt-get install --no-install-recommends -y software-properties-common help2man shellcheck uuid-runtime wget xmlstarlet && \ apt-get clean autoclean && \ apt-get autoremove --yes && \ rm -rf /var/lib/apt/lists/* diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index cb5af752b..188b4ab69 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -637,7 +637,7 @@ convert_to_dockerfile() { } install_pack() { - if ! command -v "pack" &>/dev/null; then + if [[ ! -x /usr/bin/pack ]]; then add-apt-repository --yes ppa:cncf-buildpacks/pack-cli apt-get update apt-get --yes install pack-cli