diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 37071658..d787c40b 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -92,10 +92,9 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ ENV GOLANG_VERSION 1.22 RUN apt -y update && apt -y upgrade && apt -y install \ - python3.10 \ - python3.10-venv \ - ca-certificates \ - python3.10-pip && \ + python3 \ + python3-venv \ + ca-certificates && \ apt -y install -t unstable \ golang-$GOLANG_VERSION \ openjdk-21-jre && \ @@ -105,6 +104,10 @@ RUN apt -y update && apt -y upgrade && apt -y install \ ln -sf /usr/bin/python3 /usr/bin/python && \ # Symlink go binary to bin directory which is in path ln -s /usr/lib/go-$GOLANG_VERSION/bin/go /usr/bin/go +RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3 +RUN python3 -m pip install --upgrade pip + +RUN rm /usr/lib/python3.11/EXTERNALLY-MANAGED RUN dotnet --version diff --git a/internal/cmd/fingerprint/fingerprint.go b/internal/cmd/fingerprint/fingerprint.go index 205a50a6..32dcbb4f 100644 --- a/internal/cmd/fingerprint/fingerprint.go +++ b/internal/cmd/fingerprint/fingerprint.go @@ -94,8 +94,10 @@ func RunE(f fingerprint.IFingerprint) func(_ *cobra.Command, args []string) erro "To generate a new fingerprint file either remove/rename old file or ", "change flag '--regenerate' to 'true'", ) + return nil } + return err } diff --git a/internal/fingerprint/fingerprint_test.go b/internal/fingerprint/fingerprint_test.go index 08c17c5e..a208b2c6 100644 --- a/internal/fingerprint/fingerprint_test.go +++ b/internal/fingerprint/fingerprint_test.go @@ -184,9 +184,9 @@ func TestFingerprintFiles(t *testing.T) { } func TestFingerprintFilesAlreadyExists(t *testing.T) { - temp, err := os.CreateTemp("testdata/fingerprinter", "temp-fingerprint-*.txt") + temp, _ := os.CreateTemp("testdata/fingerprinter", "temp-fingerprint-*.txt") fingerprinter := NewFingerprinter() - _, err = fingerprinter.FingerprintFiles( + _, err := fingerprinter.FingerprintFiles( DebrickedOptions{ OutputPath: temp.Name(), Path: "testdata/fingerprinter",