use container engine agnostic file names as it works with Docker and Podman

Author: Trim

Docker.md Container.mdDocker.md renamed to Container.md

@@ -1,11 +1,24 @@
-LinuxFr on Docker
------------------
+LinuxFr with Containers
+-----------------------
 
 To simplify set up of a developement environment, LinuxFr.org can be
-run on Docker with `docker-compose up`.
+run with a container engine like Docker or Podman with the [`compose.yml`](./compose.yaml)
+file which describe how to build all needed services.
 
-Note: you need to enable the Docker BuildKit builder. Either you have a Docker
-version which uses it by default, or you set the environment variable `export DOCKER_BUILDKIT=1`.
+If you use the Docker engine, you can use the `docker compose up` command to start the system (you
+need to install the [Docker compose plugin](https://docs.docker.com/compose/)).
+
+> Note: with the Docker engine, you need to enable the Docker BuildKit builder.
+> Either you have a Docker version which uses it by default, or you set the
+> environment variable `export DOCKER_BUILDKIT=1`.
+
+If you use Podman, you can either use the same Docker compose plugin or the
+[podman-compose](https://github.com/containers/podman-compose/)
+utility. The podman cli itself provide a wrapper of one of these two tools through the
+[`podman compose` command](https://docs.podman.io/en/latest/markdown/podman-compose.1.html).
+
+At this point, the documentation will give you `docker compose` commands, but you should be able
+to use `podman compose` without any issue.
 
 To init the SQL database schema, you need to wait upto the `database`
 container to be ready to listen MySQL connections.
@@ -19,7 +32,7 @@ For example, you should see in the logs:
 Then, open a second terminal and run:
 
 ```
-docker-compose run linuxfr.org bin/rails db:setup
+docker compose run linuxfr.org bin/rails db:setup
 ```
 
 Finally, the environment is ready and you can open [http://dlfp.lo](http://dlfp.lo)
@@ -57,7 +70,7 @@ service.
 
 If you want to change the application port and/or other configurations, you can
 [override](https://docs.docker.com/compose/extends/)
-the docker-compose configuration (in particular the `nginx` service for
+the docker compose configuration (in particular the `nginx` service for
 the port).
 
 Notice, that if LinuxFr.org doesn't run on port 80, the image cache
@@ -66,8 +79,8 @@ service won't work well and so you won't be able to see images in the news.
 Test modifications
 ==================
 
-The docker-compose is currently configured to share `./app`, `./db` and
-`./public` directories with the docker container.
+The compose file currently shares `./app`, `./db` and
+`./public` directories with the container.
 
 So you can update files with your prefered IDE on your machine. Rails
 will directly detect changes and apply them on next page reload.
@@ -76,7 +89,7 @@ Furthermore, if you need to access the Rails console, you need a second
 terminal and run:
 
 ```
-docker-compose run linuxfr.org bin/rails console
+docker compose run linuxfr.org bin/rails console
 ```
 
 Note: currently, we didn't configure rails to show directly the
@@ -93,10 +106,10 @@ To get help about writing tests, see the
 [Ruby on Rails documentation](https://guides.rubyonrails.org/testing.html#the-rails-test-runner)
 .
 
-To run tests with Docker environment, you need to use this command:
+To run tests with containers, you need to use this command:
 
 ```
-docker-compose run linuxfr.org bin/rails test -v
+docker compose run linuxfr.org bin/rails test -v
 ```
 
 Inspect database schema
@@ -106,7 +119,7 @@ In case you need to inspect the database, you need a second terminal
 and run:
 
 ```
-docker-compose run database mysql -hdatabase -ulinuxfr_rails -p linuxfr_rails
+docker compose run database mysql -hdatabase -ulinuxfr_rails -p linuxfr_rails
 ```
 
 By default, the requested password is the same as the username.
@@ -118,20 +131,20 @@ In case you need to apply new database migrations, you need a second
 terminal and run:
 
 ```
-docker-compose run linuxfr.org bin/rails db:migrate
+docker compose run linuxfr.org bin/rails db:migrate
 ```
 
 If you had issue and want to reset all data in your database system,
 use:
 
 ```
-docker-compose run linuxfr.org bin/rails db:reset
+docker compose run linuxfr.org bin/rails db:reset
 ```
 
-Services provided by the docker-compose
+Services provided by the compose file
 =======================================
 
-Currently, these services are directly enabled by docker-compose:
+Currently, these services are directly enabled by compose:
 
 1. The [LinuxFr.org](https://github.com/linuxfrorg/linuxfr.org)
 ruby on rails application itself
@@ -148,7 +161,7 @@ For now, these services aren't available:
 because it requires to run 
 LinuxFr.org with a TLS certificate. When the service will accept to
 fetch articles with simple `http://`, we'll be able to provide it
-directly with docker-compose.
+directly with docker compose.
 2. The [svgtex service](https://github.com/linuxfrorg/svgtex), because LinuxFr
 has hard-coded the `localhost`
 hostname in it's [HTML Pipeline tool](https://github.com/linuxfrorg/html-pipeline-linuxfr/blob/linuxfr/lib/html/pipeline/linuxfr.rb#L8)

README.md

@@ -12,9 +12,9 @@ Install
 
 See [INSTALL.md](INSTALL.md) to set up LinuxFr.org on a Debian environment.
 
-Alternatively, you can read [Docker.md](Docker.md) to setup easily
-LinuxFr.org development environment with the Docker engine and
-[docker-compose](https://docs.docker.com/compose/).
+Alternatively, you can read [Container.md](Container.md) to setup easily
+LinuxFr.org development environment with a container engine like Docker or
+Podman and use the [container composer](https://docs.docker.com/compose/).
 
 See also
 --------

docker-compose.yaml compose.yamldocker-compose.yaml renamed to compose.yaml

@@ -4,7 +4,7 @@ services:
   linuxfr.org:
     build:
       context: .
-      dockerfile: deployment/linuxfr.org/Dockerfile
+      dockerfile: deployment/linuxfr.org/Containerfile
     env_file:
       - deployment/default.env
     volumes: