From 6f9ecdf553f709fb3671b9da63af55d8abe433df Mon Sep 17 00:00:00 2001 From: Vesa Siivola Date: Wed, 1 Feb 2023 16:20:28 +0200 Subject: [PATCH] update Dockerfile to use Ubuntu Jammy Jellyfish --- Dockerfile | 4 ++-- docker_notes.md | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17268c8..8e1a600 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:groovy +FROM ubuntu:jammy ARG DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Berlin RUN apt-get update -y && \ @@ -8,7 +8,7 @@ RUN apt-get install -y --no-install-recommends\ build-essential \ libboost-all-dev \ swig \ - python-dev \ + python3-dev \ cmake && \ apt-get autoclean && \ apt-get autoremove && \ diff --git a/docker_notes.md b/docker_notes.md index 0c9deb1..6253fa6 100644 --- a/docker_notes.md +++ b/docker_notes.md @@ -1,5 +1,7 @@ # Rudimentary notes on Docker +## Linux and intel processor Macs + ```sh # Set up docker env (only needed if you use command line docker-machine) docker-machine start @@ -8,7 +10,7 @@ eval $(docker-machine env default) # Create container docker build -t varikn_test_container . # Log in container -docker container run --interactive --tty varikn_test_container +docker container run --interactive --tty varikn_test_container # Inside container mkdir build; (cd build; cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=1 && make && ctest --verbose) @@ -27,3 +29,18 @@ brew cask install virtualbox # Create VM docker-machine create default ``` + +## Apple processor Macs (M1, M2) + +On Apple silicon processor based mac (M1, M2), you can install +[Finch](https://github.com/runfinch) and run the following: + +```sh +# Create container +finch build -t varikn_test_container . +# Log in container +finch container run --interactive --tty varikn_test_container +# Inside container +mkdir build; (cd build; cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=1 + && make && ctest --verbose) +``` \ No newline at end of file