From d1a7c3313dbbe2dbbb43029ed68586a711e6932b Mon Sep 17 00:00:00 2001 From: Brian Davis Date: Sun, 25 Aug 2024 19:40:46 -0400 Subject: [PATCH] fix: remove docker-compose - remove docker-compose and replace with docker directly --- .github/workflows/pull_request.yml | 7 +++---- compare_list.txt | 4 ---- docker-compose.yml | 13 ------------- 3 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 compare_list.txt delete mode 100644 docker-compose.yml diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7246fd3..fc956e9 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -18,8 +18,7 @@ jobs: echo "source file differs, checksec needs build" exit 1 fi - - name: ubuntu checksec + - name: Checksec tests run: | - curl -L "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose - chmod +x /usr/local/bin/docker-compose - docker-compose run checksec-ubuntu + docker build -t checksec:test -f Dockerfile.ubuntu . + docker run -t checksec:test tests/test-checksec.sh diff --git a/compare_list.txt b/compare_list.txt deleted file mode 100644 index 299cd1c..0000000 --- a/compare_list.txt +++ /dev/null @@ -1,4 +0,0 @@ -compare list - -/usr/bin/aarch64-linux-gnu-gcov-11 -/usr/bin/systemd-notify diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index d4a8ebb..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,13 +0,0 @@ -services: - checksec-ubuntu: - build: - context: ./ - dockerfile: Dockerfile.ubuntu - image: checksec-ubuntu - command: bash -c "./tests/test-checksec.sh" - - shellcheck: - volumes: - - .:/mnt - image: koalaman/shellcheck - command: "checksec"