Merge pull request #390 from Trim/container-compose

Container compose

Author: Trim

Docker.md

@@ -2,7 +2,7 @@ LinuxFr on Docker
 -----------------
 
 To simplify set up of a developement environment, LinuxFr.org can be
-run on Docker with `docker-compose up`.
+run on Docker with `docker compose up`.
 
 To init the SQL database schema, you need to wait upto the `database`
 container to be ready to listen MySQL connections.
@@ -18,7 +18,7 @@ Or you can check the `database` container status to be "healthy".
 Then, open a second terminal and run:
 
 ```
-docker-compose exec linuxfr.org bin/rails db:setup
+docker compose exec linuxfr.org bin/rails db:setup
 ```
 
 Finally, the environment is ready and you can open [http://dlfp.lo](http://dlfp.lo)
@@ -45,7 +45,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
@@ -54,7 +54,7 @@ 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
+The docker compose is currently configured to share `./app`, `./db` and
 `./public` directories with the docker container.
 
 So you can update files with your prefered IDE on your machine. Rails
@@ -64,7 +64,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 exec linuxfr.org bin/rails console
 ```
 
 Note: currently, we didn't configure rails to show directly the
@@ -84,7 +84,7 @@ To get help about writing tests, see the
 To run tests with Docker environment, you need to use this command:
 
 ```
-docker-compose run linuxfr.org bin/rails test -v
+docker compose exec linuxfr.org bin/rails test -v
 ```
 
 Inspect the database schema
@@ -104,20 +104,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 exec 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 exec linuxfr.org bin/rails db:reset
 ```
 
-Services provided by the docker-compose
+Services provided by the docker compose
 =======================================
 
-Currently, these services are directly enabled by docker-compose:
+Currently, these services are directly enabled by docker compose:
 
 1. The [LinuxFr.org](https://github.com/linuxfrorg/linuxfr.org)
 ruby on rails application itself
@@ -134,7 +134,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)

docker-compose.yaml

@@ -18,7 +18,9 @@ services:
     tmpfs:
       - /linuxfr.org/public/tmp:size=100M
     healthcheck:
-      test: curl --fail http://localhost:3000
+      test: ["CMD", "curl", "--silent", "--fail", "--head", "http://localhost:3000"]
+      interval: 10s
+      start_period: 5s
     depends_on:
       database:
         condition: service_healthy
@@ -33,7 +35,9 @@ services:
     env_file:
       - deployment/default.env
     healthcheck:
-      test: curl --fail -I http://localhost:9000
+      test: ["CMD", "curl", "--silent", "--fail", "--head", "http://localhost:9000"]
+      interval: 10s
+      start_period: 5s
     depends_on:
       redis:
         condition: service_healthy
@@ -45,7 +49,9 @@ services:
     env_file:
       - deployment/default.env
     healthcheck:
-      test: curl --fail http://localhost:8000/status
+      test: ["CMD", "curl", "--silent", "--fail", "--head", "http://localhost:8000/status"]
+      interval: 10s
+      start_period: 5s
     depends_on:
       redis:
         condition: service_healthy
@@ -66,8 +72,16 @@ services:
         published: 127.0.0.1:80
         protocol: tcp
     healthcheck:
-      test: curl --fail http://$$DOMAIN && curl --fail http://$$DOMAIN/img && curl --fail -I http://$$DOMAIN/b
+      test: ["CMD", "curl", "--silent", "--fail", "--fail-early", "--head", "http://$$DOMAIN", "http://$$DOMAIN/img", "http://$$DOMAIN/b", "http://$$IMAGE_DOMAIN/status"]
+      interval: 10s
+      start_period: 5s
     depends_on:
+      database:
+        condition: service_healthy
+        restart: true
+      redis:
+        condition: service_healthy
+        restart: true
       linuxfr.org:
         condition: service_healthy
         restart: true
@@ -77,6 +91,11 @@ services:
       linuxfr-img:
         condition: service_healthy
         restart: true
+    networks:
+      default:
+        aliases:
+          - ${DOMAIN}
+          - ${IMAGE_DOMAIN}
 
   database:
     build:
@@ -88,14 +107,18 @@ services:
         published: 127.0.0.1:3306
         protocol: tcp
     healthcheck:
-      test: mysql -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD --execute "SHOW DATABASES;"
+      test: ["CMD", "mysql", "-h", "127.0.0.1", "-u", "$$MYSQL_USER", "--password=$$MYSQL_PASSWORD", "--execute", "\"SHOW DATABASES;\""]
+      interval: 10s
+      start_period: 5s
     volumes:
       - data-database:/var/lib/mysql
 
   redis:
     image: docker.io/redis:5
     healthcheck:
-      test: redis-cli --raw incr ping
+      test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
+      interval: 10s
+      start_period: 5s
     volumes:
       - data-redis:/data