diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 12f5a2b..767c8d0 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -1,3 +1,3 @@ -FROM golang:1.19-bullseye +FROM golang:1.26-trixie RUN apt-get update && apt-get install -y upx && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.development b/docker/Dockerfile.development index bfc7744..80a6249 100644 --- a/docker/Dockerfile.development +++ b/docker/Dockerfile.development @@ -1,4 +1,4 @@ -FROM golang:1.19-bullseye +FROM golang:1.26-trixie RUN apt-get update && apt-get -y install cron python3 sudo procps diff --git a/docker/Dockerfile.example b/docker/Dockerfile.example index 508ec22..cb3c8a4 100644 --- a/docker/Dockerfile.example +++ b/docker/Dockerfile.example @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:bookworm RUN apt-get update && apt-get -y install cron python3 sudo procps diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing index 9064633..4919df8 100644 --- a/docker/Dockerfile.testing +++ b/docker/Dockerfile.testing @@ -1,4 +1,4 @@ -FROM golang:1.19-bullseye +FROM golang:1.26-trixie RUN apt-get update && apt-get -y install cron python3 sudo procps diff --git a/docker/entrypoint-development.sh b/docker/entrypoint-development.sh index 08bf82f..ecf79ab 100644 --- a/docker/entrypoint-development.sh +++ b/docker/entrypoint-development.sh @@ -4,7 +4,7 @@ set -e sudo cron -f & sleep 1 -sudo ps | grep cron 1>/dev/null +ps -auxf | grep cron 1>/dev/null echo "[+] cron started" echo "[+] Running as user `id`" diff --git a/docker/entrypoint-example.sh b/docker/entrypoint-example.sh index 349bddb..6941369 100644 --- a/docker/entrypoint-example.sh +++ b/docker/entrypoint-example.sh @@ -4,7 +4,7 @@ set -e sudo cron -f & sleep 1 -sudo ps | grep cron 1>/dev/null +ps -auxf | grep cron 1>/dev/null echo "[+] cron started" echo "[+] Running as user `id`" diff --git a/docker/entrypoint-testing.sh b/docker/entrypoint-testing.sh index 29ba89c..4720c02 100644 --- a/docker/entrypoint-testing.sh +++ b/docker/entrypoint-testing.sh @@ -35,7 +35,7 @@ fi sudo cron -f & sleep 1 -sudo ps | grep cron 1>/dev/null +ps -auxf | grep cron 1>/dev/null echo "[+] cron started" echo "[+] Running as user `id`" diff --git a/go.mod b/go.mod index dd7c550..161ab36 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/dominicbreuker/pspy -go 1.18 +go 1.26 require ( github.com/spf13/cobra v1.4.0