Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix dockerfile for ubuntu:24.04 #265

Merged
merged 5 commits into from
Sep 27, 2024
Merged

fix: fix dockerfile for ubuntu:24.04 #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10144fe
fix: fix dockerfile for ubuntu:24.04
slimm609 Sep 27, 2024
c7b053f
update workflow name
slimm609 Sep 27, 2024
82f1913
fix docker test file
slimm609 Sep 27, 2024
c735fcc
add verbose output
slimm609 Sep 27, 2024
533c0bc
remove pip upgrade
slimm609 Sep 27, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: docker-compose-test
name: docker image test
on: pull_request
jobs:
test:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ RUN apt-get update && apt-get -y -q upgrade && DEBIAN_FRONTEND=noninteractive ap
libncurses-dev libssl-dev u-boot-tools wget \
xz-utils vim xfce4 libxml2-utils python3 python3-pip jq \
gcc clang && apt-get clean \
pip3 install --upgrade pip && pip3 install setuptools && \
pip3 install demjson3 && \
pip3 install --upgrade pip && pip3 install setuptools --break-system-packages && \
pip3 install demjson3 --break-system-packages && \
chmod +x /bin/checksec
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/slimm609/checksec

go 1.21.4
go 1.23.1

require (
github.com/fatih/color v1.17.0
Expand Down
4 changes: 2 additions & 2 deletions tests/docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# if condition becomes more difficult.

set -eou pipefail
set -x

apt-get update
apt-get -y -q upgrade
Expand All @@ -20,5 +21,4 @@ fi

apt-get clean

pip3 install --upgrade pip
pip3 install setuptools demjson3
pip3 install setuptools demjson3 --break-system-packages
Loading