Skip to content

Add --platform to docker run call in Zeek shell script #38

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

Open
william-stearns wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add --platform to docker run call in Zeek shell script #38

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7c2073
NOT SURE IF NEEDED: force platform
william-stearns Feb 21, 2022
60e94d5
Use docker_arch variable instead of uname -m.
william-stearns Feb 24, 2022
f4e042a
docker_arch: support armv7
william-stearns Feb 24, 2022
4556542
docker_arch: script typo
william-stearns Feb 24, 2022
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
20 changes: 19 additions & 1 deletion zeek
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ if [ ! -w "/var/run/docker.sock" ]; then
SUDO="sudo --preserve-env "
fi

case "`uname -m`" in
x86_64)
docker_arch='linux/amd64'
;;
aarch64)
docker_arch='linux/arm64'
;;
armv7l)
docker_arch='linux/arm/v7'
;;
*)
echo "Unknown architecture `uname -m` , exiting." >&2
exit 1
;;
esac

#The user can set the top level directory that holds all zeek content by setting it in "zeek_top_dir" (default "/opt/zeek")
HOST_ZEEK=${zeek_top_dir:-/opt/zeek}
#Note, we force the 3.0 release for stability, though the user can override it by setting the "zeek_release" environment variable
Expand Down Expand Up @@ -133,6 +149,7 @@ main() {
$SUDO docker volume create zeek-zkg-state >/dev/null

docker_cmd=("docker" "run" "--detach") # start container in the background
docker_cmd+=("--platform" "$docker_arch") # force the right architecture
docker_cmd+=("--name" "$container") # provide a predictable name
docker_cmd+=("--restart" "$restart")
docker_cmd+=("--cap-add" "net_raw") # allow Zeek to listen to raw packets
Expand Down Expand Up @@ -234,7 +251,8 @@ main() {

pull|update)
#Command needed to pull down a new version of Zeek if there's a new docker image
$SUDO docker pull "$IMAGE_NAME"
#The "--platform linux/$docker_arch" makes sure we pull down the right CPU type (linux/amd64 for x86_64 aka intel or linux/arm64 for aarch64 aka arm)
$SUDO docker pull --platform "$docker_arch" "$IMAGE_NAME"

$0 stop
$0 start
Expand Down