From 62bb8dff0849992453b09ac47809078d4a1f21c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Dahlquist?= Date: Wed, 15 Dec 2021 13:03:09 -0300 Subject: [PATCH] Change docker execution to be compatible with m1 chips --- v2/sim/0.1.4/sim-docker.sh | 4 ++-- v2/sim/2.1.0/.gitignore | 1 + v2/sim/2.1.0/sim-docker.sh | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 v2/sim/2.1.0/.gitignore diff --git a/v2/sim/0.1.4/sim-docker.sh b/v2/sim/0.1.4/sim-docker.sh index c7ea4ec..5f9a748 100755 --- a/v2/sim/0.1.4/sim-docker.sh +++ b/v2/sim/0.1.4/sim-docker.sh @@ -32,6 +32,6 @@ fi docker images|grep -q $DOCKNAME && BQUIET=-q -docker build -t $DOCKNAME $BQUIET . +docker build --platform linux/x86_64 -t $DOCKNAME $BQUIET . -docker run -ti --rm -p $PORT:$PORT -v "`pwd`:/hsm2" -w "/hsm2" -u "`id -u`:`id -g`" $DOCKNAME ./sim $@ $SIM_ARGS +docker run --platform linux/x86_64 -ti --rm -p $PORT:$PORT -v "`pwd`:/hsm2" -w "/hsm2" -u "`id -u`:`id -g`" $DOCKNAME ./sim $@ $SIM_ARGS diff --git a/v2/sim/2.1.0/.gitignore b/v2/sim/2.1.0/.gitignore new file mode 100644 index 0000000..76ef273 --- /dev/null +++ b/v2/sim/2.1.0/.gitignore @@ -0,0 +1 @@ +/sim \ No newline at end of file diff --git a/v2/sim/2.1.0/sim-docker.sh b/v2/sim/2.1.0/sim-docker.sh index b38c4f3..bcf40ee 100755 --- a/v2/sim/2.1.0/sim-docker.sh +++ b/v2/sim/2.1.0/sim-docker.sh @@ -32,6 +32,6 @@ fi docker images|grep -q $DOCKNAME && BQUIET=-q -docker build -t $DOCKNAME $BQUIET . +docker build --platform linux/x86_64 -t $DOCKNAME $BQUIET . -docker run -ti --rm -p $PORT:$PORT -v "`pwd`:/hsm2" -w "/hsm2" -u "`id -u`:`id -g`" $DOCKNAME /hsm2bin/sim $@ $SIM_ARGS +docker run --platform linux/x86_64 -ti --rm -p $PORT:$PORT -v "`pwd`:/hsm2" -w "/hsm2" -u "`id -u`:`id -g`" $DOCKNAME /hsm2bin/sim $@ $SIM_ARGS