Draft: Prochaine version de LinuxFr avec Rails7

.dockerignore

@@ -23,3 +23,4 @@
 /uploads
 /vendor/ruby
 /vendor/bundle
+/coverage

.gitignore

@@ -20,3 +20,6 @@
 /vendor/bundle
 /.env
 /docker-compose.*.yaml
+.rubocop.yml
+Guardfile
+coverage

Docker.md → Container.md

@@ -1,36 +1,57 @@
-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`.
+To simplify set up of a development environment, LinuxFr.org can be
+run with a container engine like Docker or Podman with the [`compose.yml`](./compose.yaml)
+file which describes how to build all needed services.
 
-To init the SQL database schema, you need to wait upto the `database`
-container to be ready to listen MySQL connections.
+By default, the LinuxFr.org services will be provided under the domain names
+`dlfp.lo` and `image.dlfp.lo`. So you'll need to add the
+following line into the `/etc/hosts` file of your machine:
+
+  ```
+  127.0.0.1 dlfp.lo image.dlfp.lo
+  ```
+
+Then, 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/) first).
+
+> 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 the Podman engine, you can either use the same Docker compose plugin
+or the [podman-compose](https://github.com/containers/podman-compose/)
+tool. The podman cli itself provides a wrapper of one of these two tools
+through the
+[`podman compose` command](https://docs.podman.io/en/latest/markdown/podman-compose.1.html).
+Thus you need to use the `podman compose up` command to start the system.
+
+At this point, this documentation will give you `docker compose` commands,
+but you should be able to use `podman compose` without any issue.
+
+To setup the SQL database schema, you need to wait until the `database`
+container becomes ready to listen MySQL connections.
 
 For example, you should see in the logs:
 
-> database_1       | 2020-09-21 16:03:12 139820938893312 [Note] mysqld: ready for connections.
+> database_1       | 2020-09-21 16:03:12 139820938893312 [Note] *mysqld: ready for connections.*
 >
 > database_1       | Version: '10.1.46-MariaDB-1\~bionic'  socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution
 
-Or you can check the `database` container status to be "healthy".
+Or you can check the `database` container status to be *healthy* with the
+`docker compose ps` command.
 
 Then, open a second terminal and run:
 
 ```
 docker compose exec linuxfr.org bin/rails db:setup
 ```
 
-Finally, the environment is ready and you can open [http://dlfp.lo](http://dlfp.lo)
+Finally, the environment is ready and you can open [http://dlfp.lo:9000](http://dlfp.lo:9000)
 in your favorite browser.
 
-Note: to be able to access this URL, you'll need to add the following line
-into the `/etc/hosts` file of your machine:
-
-```
-127.0.0.1 dlfp.lo image.dlfp.lo
-```
-
 Personalize configuration
 =========================
 
@@ -40,24 +61,22 @@ If you want, you can change the domain names used by the LinuxFr.org
 web application. To do this, you can setup `DOMAIN` and `IMAGE_DOMAIN`
 variables in the `deployment/default.env` file.
 
-You can also configure your own Redis service and your own MySQL
-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 port).
+Within the same file, you can update the HTTP listening ports by updating the
+`DOMAIN_HTTP_PORT` and `IMAGE_DOMAIN_HTTP_PORT` variables (both are set to 
+`9000` by default). If you modify them, don't forget to add the new values as
+published ports for the `nginx` service in the `compose.yaml` file (they have
+to target the `8080` container port).
 
-Notice, that if LinuxFr.org doesn't run on port 80, the image cache
-service won't work well and so you won't be able to see images in the news.
+You can also configure your own Redis service and your own MySQL
+service by updating environment variables in the same file.
 
 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
+So you can update files with your preferred IDE on your machine. Rails
 will directly detect changes and apply them on next page reload.
 
 Furthermore, if you need to access the Rails console, you need a second
@@ -75,13 +94,13 @@ Run application tests
 =====================
 
 To help maintainers, we are in the process of adding tests to check the
-application has still the expected behaviour.
+application has still the expected behavior.
 
 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 exec linuxfr.org bin/rails test -v
@@ -114,10 +133,10 @@ use:
 docker compose exec 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

Gemfile

@@ -1,49 +1,47 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
 end
 
-gem "rails",                   "~>5.2"
-gem "nio4r",                   "2.5.2" # 2.5.3 is not compatible with ruby 2.3
+gem "rails",                   "~>7.1"
 
-gem "actionpack-page_caching", github: "linuxfrorg/actionpack-page_caching"
+gem "actionpack-page_caching"
+gem "acts_as_list",            "~>1.1"
 gem "ansi",                    "~>1.4", require: false
-gem "acts_as_list",            "~>0.4"
 gem "bitfields",               "~>0.4"
 gem "bootsnap",                "~>1.3", require: false
 gem "canable",                 "~>0.1"
-gem "carrierwave",             "~>1.1"
+gem "carrierwave",             "~>3.0"
 gem "devise",                  "~>4.3"
 gem "diff_match_patch",        github: "nono/diff_match_patch-ruby", require: "diff_match_patch"
-gem "doorkeeper",              "~>4.2"
+gem "doorkeeper"
 gem "ffi-hunspell",            github: "postmodern/ffi-hunspell"
-gem "french_rails",            "~>0.4"
+gem "french_rails",            "~>0.5", github: "linuxfrorg/french-rails"
 gem "friendly_id",             "~>5.1"
-gem "haml",                    "~>5.0"
-gem "html-pipeline-linuxfr",   "~>0.15"
+gem "haml",                    "~>6.3"
+gem "htmlentities",            "~>4.3"
+gem "html-pipeline-linuxfr",   "~>0.17", github: "linuxfrorg/html-pipeline-linuxfr"
 gem "html_spellchecker",       "~>0.1"
 gem "html_truncator",          "~>0.4"
-gem "htmlentities",            "~>4.3"
 gem "inherited_resources",     "~>1.8"
 gem "kaminari",                "~>1.2"
 gem "mini_magick",             "~>4.9"
 gem "mysql2",                  "~>0.5.0"
 gem "nokogiri",                "~>1.10"
+gem "redis",                   "~>5.0"
 gem "rinku",                   "~>2.0"
-gem "redis",                   "~>4.0"
-gem "sitemap_generator",       "~>2.1"
-gem "state_machine",           "~>1.2"
+gem "sitemap_generator"
+gem "state_machines-activerecord"
 
 # Gems used for assets
 assets = !%w(production alpha).include?(ENV['RAILS_ENV'])
 assets = true if ENV['RAILS_GROUPS'] == "assets"
-gem "jquery-rails",          "~>4.0", require: assets
-gem "coffee-rails",          "~>4.1", require: assets
-gem "sass-rails",            "~>5.0", require: assets
-gem "rails-sass-images",              require: assets
-gem "uglifier",                       require: assets
+gem "jquery-rails",            "~>4.0", require: assets
+gem "normalize-rails",         "~>8.0", require: assets
+gem "sassc-rails",                      require: assets
+gem "terser", "~> 1.2",                 require: assets
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -54,25 +52,17 @@ group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
-  gem "capistrano",            "~>2.15", github: 'capistrano', branch: 'legacy-v2'
-  gem "capistrano-maintenance"
   gem "letter_opener"
   gem "listen",                github: "guard/listen"
-  gem "mo"
-  gem "pry-rails"
+  gem "puma"
   gem "spring"
-  gem "sushi"
-  gem "thin"
   gem "web-console"
 end
 
 group :test do
-  # Adds support for Capybara system testing and selenium driver
-  gem "capybara", ">= 2.15"
-  gem "selenium-webdriver"
+  gem "simplecov"
 end
 
 group :production, :alpha do
-  gem "unicorn",               "~>5.1"
-  gem "gctools",               "~>0.2"
+  gem "unicorn",						   "~>6.1"
 end