From cde4e963478c860993dd3d459fc4e3d808434dff Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Mon, 20 May 2024 22:02:39 +0200 Subject: [PATCH 1/4] Add docker files and build instructions --- .dockerignore | 2 ++ .gitignore | 1 + Dockerfile | 10 ++++++++++ Dockerfile-ubuntu2204 | 10 ++++++++++ README.md | 12 ++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 Dockerfile-ubuntu2204 diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..fe06a51 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +build +build-* diff --git a/.gitignore b/.gitignore index bddc66e..32f0f1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea *build* +slowmoFlowBuilder diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..47278b1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM ubuntu:20.04 + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y freeglut3-dev libopencv-dev libglew-dev cmake build-essential + +RUN apt-get install -y cmake build-essential + +WORKDIR /_build + +CMD [ "/bin/sh", "./build.sh" ] diff --git a/Dockerfile-ubuntu2204 b/Dockerfile-ubuntu2204 new file mode 100644 index 0000000..220b1ac --- /dev/null +++ b/Dockerfile-ubuntu2204 @@ -0,0 +1,10 @@ +FROM ubuntu:22.04 + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y freeglut3-dev libopencv-dev libglew-dev cmake build-essential + +RUN apt-get install -y cmake build-essential + +WORKDIR /_build + +CMD [ "/bin/sh", "./build.sh" ] diff --git a/README.md b/README.md index 8608ded..03a4648 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ It can be used by slowmoVideo. ## Building +### Ubuntu 20.04 + On Ubuntu 20.04, install the requirements `freeglut3-dev libopencv-dev libglew-dev ` ```bash @@ -20,3 +22,13 @@ make # or install: sudo make install ``` + +### Docker + +```bash +# Build the docker image which will build v3d-flow-builder +docker build . -name v3d-builder + +# Build v3d-flow-builder inside the docker image +docker run -it --rm -v $(pwd):/_build -u $(id -u) v3d-builder +``` From 0a03f5559de5239a064ec4f33529e853063d1f18 Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Tue, 21 May 2024 10:08:18 +0200 Subject: [PATCH 2/4] Rename Dockerfile and extend Docker build instructions --- Dockerfile => Dockerfile-ubuntu2004 | 0 README.md | 11 ++++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) rename Dockerfile => Dockerfile-ubuntu2004 (100%) diff --git a/Dockerfile b/Dockerfile-ubuntu2004 similarity index 100% rename from Dockerfile rename to Dockerfile-ubuntu2004 diff --git a/README.md b/README.md index 03a4648..de5a542 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,15 @@ sudo make install ### Docker +You can build slowmoFlowBuilder with Docker for different target systems. +Currently, Ubuntu 20.04 and Ubuntu 22.04 are supported. + ```bash -# Build the docker image which will build v3d-flow-builder -docker build . -name v3d-builder +# Build the docker image which will build slowmoFlowBuilder +# For Ubuntu 20.04: use Dockerfile-ubuntu2004 instead +docker build . -name v3d-builder -f Dockerfile-ubuntu2204 -# Build v3d-flow-builder inside the docker image +# Build v3d-flow-builder inside the docker image. +# The executable will be copied to the working directory. docker run -it --rm -v $(pwd):/_build -u $(id -u) v3d-builder ``` From abb8034cbdf5db7960a0281c15a12522b938d2c9 Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Thu, 23 May 2024 12:32:43 +0200 Subject: [PATCH 3/4] Fix docker command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de5a542..d499345 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Currently, Ubuntu 20.04 and Ubuntu 22.04 are supported. ```bash # Build the docker image which will build slowmoFlowBuilder # For Ubuntu 20.04: use Dockerfile-ubuntu2004 instead -docker build . -name v3d-builder -f Dockerfile-ubuntu2204 +docker build . -t v3d-builder -f Dockerfile-ubuntu2204 # Build v3d-flow-builder inside the docker image. # The executable will be copied to the working directory. From 08edcb66dbf4c5689095059f85370fcc2534af00 Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Sun, 26 May 2024 09:26:17 +0200 Subject: [PATCH 4/4] Add missing build.sh --- .gitignore | 3 ++- README.md | 11 ++++++++++- build.sh | 7 +++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100755 build.sh diff --git a/.gitignore b/.gitignore index 32f0f1c..1c499f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea -*build* +build-* +build slowmoFlowBuilder diff --git a/README.md b/README.md index d499345..c4295ea 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,21 @@ It can be used by slowmoVideo. ## Building +Before building, get the latest version with the following command: + +```bash +# Get the latest commit of this branch +git pull --rebase + +# Update the libSvFlow submodule to the correct commit +git submodule update --init +``` + ### Ubuntu 20.04 On Ubuntu 20.04, install the requirements `freeglut3-dev libopencv-dev libglew-dev ` ```bash -git submodule update --init mkdir build cd build cmake .. diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..b38ece8 --- /dev/null +++ b/build.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +mkdir -p build-docker +cd build-docker +cmake .. +make +cp src/slowmoFlowBuilder ..