From 1c5ee00d73b58c852cfbc3a504eeef8e5f6cbe36 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Wed, 1 Dec 2021 14:49:52 +0100
Subject: [PATCH] [Dev] update README.md for Frama-C Docker images
---
devel_tools/docker/README.md | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/devel_tools/docker/README.md b/devel_tools/docker/README.md
index e56c8d81b42..71afa6d50e7 100644
--- a/devel_tools/docker/README.md
+++ b/devel_tools/docker/README.md
@@ -14,8 +14,8 @@ Frama-C versions. For each version, there are three images: one
for the command-line version `frama-c`; a stripped-down version of the former,
for a slimmer image, but which does not allow recompilation of Frama-C
or of any external plugin; and a third image including the graphical
-interface (`frama-c-gui`), to be used with Singularity or other tools enabling
-graphical interfaces from within a Docker image.
+interface (`frama-c-gui`), to be used with Singularity, x11docker, or any other
+tool which enables running a graphical application from a Docker image.
Run `make` to get a list of targets.
@@ -29,6 +29,14 @@ Some commands in this section are those used by the above Makefile;
others allow creating different images (e.g. with the Frama-C sources)
which are not directly available as Makefile targets.
+Note: a Dockerfile is needed for the commands below.
+ For most versions, running `make Dockerfile.dev` and then using it
+ (adding `-f Dockerfile.dev` to the commands below) is enough.
+ However, if specific build commands or dependencies are needed,
+ you can copy the generated Dockerfile
+ (e.g. `cp Dockerfile.dev Dockerfile`) and adapt it as needed,
+ before running one of the commands below.
+
- Build slim development image (from public Git master branch):
docker build . -t framac/frama-c:dev --target frama-c-slim
--
GitLab